diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cc45e31..923f55c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -99,6 +99,21 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:exported="false" android:screenOrientation="portrait" /> + + + { + + @Override + protected Class getBindingClass() { + return ActivitySeedlingCultivationBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + onBackPressed(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/SmartFarmActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/SmartFarmActivity.java index dc4c8ef..da8fd03 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/SmartFarmActivity.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/SmartFarmActivity.java @@ -59,6 +59,24 @@ public class SmartFarmActivity extends BaseActivity { IntentUtil.startActivity(mContext, IrrigatedActivity.class); } }); + binding.layoutSoakSeedsA.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, SoakSeedsActivity.class); + } + }); + binding.layoutYieldPrediction.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, YieldPredictionActivity.class); + } + }); + binding.layoutSeedlingCultivation.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, SeedlingCultivationActivity.class); + } + }); } } diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/SoakSeedsActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/SoakSeedsActivity.java new file mode 100644 index 0000000..62a9023 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/SoakSeedsActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.smart_farm; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivitySoakSeedsBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class SoakSeedsActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivitySoakSeedsBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + onBackPressed(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/YieldPredictionActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/YieldPredictionActivity.java new file mode 100644 index 0000000..7926489 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/YieldPredictionActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.smart_farm; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityYieldPredictionBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class YieldPredictionActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityYieldPredictionBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + onBackPressed(); + } + }); + } + +} diff --git a/app/src/main/res/drawable/bg_container_f5faf8_raduis_10.xml b/app/src/main/res/drawable/bg_container_f5faf8_raduis_10.xml new file mode 100644 index 0000000..74421bf --- /dev/null +++ b/app/src/main/res/drawable/bg_container_f5faf8_raduis_10.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_gradient_yield_prediction.xml b/app/src/main/res/drawable/bg_gradient_yield_prediction.xml new file mode 100644 index 0000000..f3092f7 --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_yield_prediction.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_irrigated.xml b/app/src/main/res/layout/activity_irrigated.xml index a4118ea..1f42f13 100644 --- a/app/src/main/res/layout/activity_irrigated.xml +++ b/app/src/main/res/layout/activity_irrigated.xml @@ -404,7 +404,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:text="配肥记录" + android:text="灌溉记录" android:textColor="@color/color_txt_black" android:textSize="18sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/activity_seedling_cultivation.xml b/app/src/main/res/layout/activity_seedling_cultivation.xml new file mode 100644 index 0000000..b45e7fb --- /dev/null +++ b/app/src/main/res/layout/activity_seedling_cultivation.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_smart_farm.xml b/app/src/main/res/layout/activity_smart_farm.xml index 76d7080..da2f780 100644 --- a/app/src/main/res/layout/activity_smart_farm.xml +++ b/app/src/main/res/layout/activity_smart_farm.xml @@ -431,6 +431,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_yield_prediction.xml b/app/src/main/res/layout/activity_yield_prediction.xml new file mode 100644 index 0000000..086a7c1 --- /dev/null +++ b/app/src/main/res/layout/activity_yield_prediction.xml @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_1.png b/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_1.png new file mode 100644 index 0000000..3b9931f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_1.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_2.png b/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_2.png new file mode 100644 index 0000000..13c30af Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_2.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_3.png b/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_3.png new file mode 100644 index 0000000..a88e2d5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_yield_prediction_3.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_1.png b/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_1.png new file mode 100644 index 0000000..eddef4f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_1.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_2.png b/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_2.png new file mode 100644 index 0000000..b164255 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_2.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_3.png b/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_3.png new file mode 100644 index 0000000..030cde6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_seedling_cultivation_3.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_soak_seeds_1.webp b/app/src/main/res/mipmap-xxhdpi/pic_soak_seeds_1.webp new file mode 100644 index 0000000..ab16c95 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_soak_seeds_1.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_1.png b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_1.png new file mode 100644 index 0000000..208fb7e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_1.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_2.png b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_2.png new file mode 100644 index 0000000..2c3a26a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_2.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_3.png b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_3.png new file mode 100644 index 0000000..85ded16 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_3.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_4.png b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_4.png new file mode 100644 index 0000000..2b0c98a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_4.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_5.png b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_5.png new file mode 100644 index 0000000..d862819 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_yield_prediction_5.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7b8bfb8..14fa16a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -18,6 +18,9 @@ #F8F8F8 #50000000 #007AFF + @color/color_blue + #FFA423 + #E6E6E6 #4D25BF82