Przeglądaj źródła

refactor(启动):
- `ISCSApplication`中移除应用启动时自动连接硬件的逻辑

fix(UI):
- 修复`fragment_reset_password`中“旧密码”和“新密码”标签的布局约束
- 修复`fragment_home`中数据筛选区域的布局约束问题

周文健 1 miesiąc temu
rodzic
commit
89b0215d84

+ 5 - 3
app/src/main/java/com/grkj/iscs/ISCSApplication.kt

@@ -31,6 +31,7 @@ import com.grkj.ui_base.service.CheckKeyInfoTask
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.data.hardware.ble.BleUtil
 import com.grkj.data.hardware.modbus.ModBusController
+import com.grkj.data.utils.event.StartListenerEvent
 import com.kongzue.dialogx.DialogX
 import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.header.ClassicsHeader
@@ -110,9 +111,10 @@ class ISCSApplication : Application() {
             DbReadyGate.await()
             LogicManager.init(this@ISCSApplication)
             initImageLoader()
-            if (MMKVConstants.KEY_HARDWARE_MODE.getMMKVData("").isNotEmpty()){
-                HardwareMode.getCurrentHardwareMode().connectAndAddListener()
-            }
+//            if (MMKVConstants.KEY_HARDWARE_MODE.getMMKVData("").isNotEmpty()){
+//                StartListenerEvent.sendStartListenerEvent()
+//                HardwareMode.getCurrentHardwareMode().connectAndAddListener()
+//            }
         }
     }
 

+ 0 - 1
app/src/main/res/layout-land/fragment_home.xml

@@ -295,7 +295,6 @@
                         android:id="@+id/overview_data_filter_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@+id/overview_data_title"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:padding="@dimen/iscs_space_2">

+ 0 - 1
app/src/main/res/layout/fragment_home.xml

@@ -295,7 +295,6 @@
                         android:id="@+id/overview_data_filter_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@+id/overview_data_title"
                         android:gravity="center_vertical"
                         android:orientation="vertical"
                         android:padding="@dimen/iscs_space_2">

+ 0 - 2
app/src/main/res/layout/fragment_reset_password.xml

@@ -72,7 +72,6 @@
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"old_password"}'
-                app:layout_constraintEnd_toEndOf="@+id/end_line"
                 app:layout_constraintTop_toTopOf="parent"
                 app:markPosition="start"
                 app:required="true" />
@@ -103,7 +102,6 @@
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"new_password"}'
-                app:layout_constraintEnd_toEndOf="@+id/end_line"
                 app:layout_constraintTop_toBottomOf="@+id/old_password_et"
                 app:markPosition="start"
                 app:required="true" />