优化

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-06-10T01:13:16.309557300Z">
+        <DropdownSelection timestamp="2026-07-03T09:58:25.938181100Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=D122222104A9" />
+              <DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=a12bc17f" />
             </handle>
           </Target>
         </DropdownSelection>

app/src/main/java/com/ckkj/water/espBle/EspProvisionManager.java

@@ -306,7 +306,7 @@ public class EspProvisionManager {
         mainHandler.postDelayed(provisionTimeoutTask, ProvisionConfig.PROVISION_TIMEOUT);
         notifyProvisioning(0);
         startProvisionProgressTask();
-
+        //wifi    密码   回调
         espDevice.provision(ssid, password == null ? "" : password, new ProvisionListener() {
             @Override
             public void createSessionFailed(Exception e) {

app/src/main/java/com/ckkj/water/login/LoginActivity.java

@@ -309,10 +309,10 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
                     }
                 }
 
-                if (!mYinsiConfirm) {
+//                if (!mYinsiConfirm) {
-                    ToastUtil.showShort(mContext, getString(R.string.login_error_agreement));
+//                    ToastUtil.showShort(mContext, getString(R.string.login_error_agreement));
-                    return;
+//                    return;
-                }
+//                }
 
                 showLoadingDialog();
                 mPresenter.loginBySmsCode(loginType,

app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java

@@ -75,7 +75,7 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutC
             timeDataList.add(timeData);
             bean.setTimeData(timeDataList);
             bean.setWeekday(i + 1);
-            bean.setStatus("1");
+            bean.setStatus("0");
             bean.setWeekName(ZYTimeUtils.getWeekName(i,mContext));
             bean.setTriggerType("0");
             list.add(bean);
@@ -92,6 +92,7 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutC
         List<WaterPlanWeekEntity.TimeDataBean> timeList = weekList.get(0).getTimeData();
         mTimeAdapter = new WaterPlanTimeDataAdapter(mContext,R.layout.include_plan_time_item_layout,timeList);
         viewBinding.rvTimes.setAdapter(mTimeAdapter);
+        viewBinding.switchButton.setChecked(weekList.get(0).getStatus().equals("1"));
         initListener();
 
     }
@@ -264,9 +265,13 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutC
         // 更新周配置列表的显示，使用 mConfigEntity.getDetails() 保证数据一致
         if (mLocalEntity.getDetails() != null) {
             weekList = mLocalEntity.getDetails();
+            if(!weekList.isEmpty()){
+                viewBinding.switchButton.setChecked(weekList.get(0).getStatus().equals("1"));
                 mWeekAdapter.setNewData(mLocalEntity.getDetails());
                 mTimeAdapter.setNewData(weekList.get(mWeekAdapter.getmPos()).getTimeData());
             }
+
+        }
     }
 
     /**

app/src/main/res/layout/dialog_app_update_water.xml

@@ -59,7 +59,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/sp_14"
-                    android:textColor="@color/color_2E2E2E"
+                    android:textColor="@color/textPrimaryColor"
                     android:lineSpacingExtra="@dimen/dp_4"
                     android:text="1.优化布局\n2.修复已知bug，优化用户体验\n3.测试内容测试内容测试内容测试内容测试内容"/>
             </LinearLayout>

app/src/main/res/layout/login_layout.xml

@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_F9F9F9"
+    android:background="@color/color_F9F9F9">
+    <LinearLayout
+        android:id="@+id/ll_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:src="@mipmap/icon_launch_icon"
-        android:layout_marginTop="160dp"/>
+            android:layout_marginTop="80dp"/>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -20,13 +24,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="133"
-            android:visibility="gone"/>
+                android:visibility="visible"/>
             <Button
                 android:id="@+id/btn_151"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="151"
-            android:visibility="gone"/>
+                android:visibility="visible"/>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -162,13 +166,21 @@
                     android:src="@mipmap/icon_psd"/>
                 <EditText
                     android:id="@+id/et_input_psd"
-                android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="8"
                     android:layout_marginLeft="5dp"
                     android:background="@null"
                     android:textSize="14sp"
                     android:textColor="@color/color_222222"
-                android:hint="@string/hint_input_psd"/>
+                    android:hint="@string/hint_input_psd"
+                    android:inputType="textPassword"/>
+                <ImageView
+                    android:id="@+id/img_psd_show_hide"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_weight="0.5"
+                    android:src="@mipmap/icon_psd_show"/>
             </LinearLayout>
             <TextView
                 android:id="@+id/tv_login"
@@ -217,16 +229,18 @@
             </RelativeLayout>
 
         </LinearLayout>
+    </LinearLayout>
+
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_100">
+        android:layout_height="@dimen/dp_100"
+        android:layout_alignParentBottom="true">
         <RelativeLayout
             android:id="@+id/realtive_read_finish"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
             android:layout_marginHorizontal="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_30">
             <RadioButton
@@ -251,4 +265,4 @@
                 android:textSize="11sp" />
         </RelativeLayout>
     </RelativeLayout>
-</LinearLayout>
+</RelativeLayout>

app/src/main/res/layout/water_config_fragment_layout_copy.xml

@@ -109,7 +109,7 @@
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
                 app:kswThumbColor="@android:color/white"
-                android:checked="true"
+                android:checked="false"
                 app:kswBackDrawable="@drawable/switch_bg"
                 app:kswFadeBack="true"/>
         </LinearLayout>