diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7a98818..0807a1c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,12 +83,16 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:exported="false"
android:screenOrientation="portrait" />
-
+
+
{
+
+ @Override
+ protected Class getBindingClass() {
+ return ActivityEnvironmentalMonitoringBinding.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 73e974b..669fe96 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
@@ -47,6 +47,12 @@ public class SmartFarmActivity extends BaseActivity {
IntentUtil.startActivity(mContext, PestsMonitoringActivity.class);
}
});
+ binding.layoutEnvironmentalMonitoring.setOnClickListener(new SingleClickListener() {
+ @Override
+ protected void onSingleClick(View v) {
+ IntentUtil.startActivity(mContext, EnvironmentalMonitoringActivity.class);
+ }
+ });
binding.layoutFertilize.setOnClickListener(new SingleClickListener() {
@Override
protected void onSingleClick(View v) {
@@ -95,6 +101,12 @@ public class SmartFarmActivity extends BaseActivity {
IntentUtil.startActivity(mContext, DrainageCatchmentActivity.class);
}
});
+ binding.layoutWindowDoor.setOnClickListener(new SingleClickListener() {
+ @Override
+ protected void onSingleClick(View v) {
+ IntentUtil.startActivity(mContext, WindowDoorActivity.class);
+ }
+ });
}
}
diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/WindowDoorActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/WindowDoorActivity.java
new file mode 100644
index 0000000..387cee5
--- /dev/null
+++ b/app/src/main/java/com/tairui/industrial_operation/ui/smart_farm/WindowDoorActivity.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.ActivityWindowDoorBinding;
+import com.tairui.industrial_operation.util.SingleClickListener;
+
+import android.view.View;
+
+public class WindowDoorActivity extends BaseActivity {
+
+ @Override
+ protected Class getBindingClass() {
+ return ActivityWindowDoorBinding.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_green_raduis_10.xml b/app/src/main/res/drawable/bg_container_green_raduis_10.xml
new file mode 100644
index 0000000..b75fe4e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_container_green_raduis_10.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_drainage_catchment.xml b/app/src/main/res/layout/activity_drainage_catchment.xml
index 4043c70..1b90532 100644
--- a/app/src/main/res/layout/activity_drainage_catchment.xml
+++ b/app/src/main/res/layout/activity_drainage_catchment.xml
@@ -169,7 +169,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="4dp"
- android:src="@mipmap/ic_drainage_catchment_1" />
+ android:src="@mipmap/ic_warning" />
diff --git a/app/src/main/res/layout/activity_environmental_monitoring.xml b/app/src/main/res/layout/activity_environmental_monitoring.xml
new file mode 100644
index 0000000..4a8b7ae
--- /dev/null
+++ b/app/src/main/res/layout/activity_environmental_monitoring.xml
@@ -0,0 +1,299 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 8e5c59f..b33fae0 100644
--- a/app/src/main/res/layout/activity_smart_farm.xml
+++ b/app/src/main/res/layout/activity_smart_farm.xml
@@ -355,6 +355,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drainage_catchment_1.png b/app/src/main/res/mipmap-xxhdpi/ic_warning.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_drainage_catchment_1.png
rename to app/src/main/res/mipmap-xxhdpi/ic_warning.png
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_environmental_monitoring_1.png b/app/src/main/res/mipmap-xxhdpi/pic_environmental_monitoring_1.png
new file mode 100644
index 0000000..2e29742
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_environmental_monitoring_1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_window_door_1.png b/app/src/main/res/mipmap-xxhdpi/pic_window_door_1.png
new file mode 100644
index 0000000..e3edf53
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_window_door_1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_window_door_2.png b/app/src/main/res/mipmap-xxhdpi/pic_window_door_2.png
new file mode 100644
index 0000000..81b2a0e
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_window_door_2.png differ