fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
fengjignqi
2026-07-04 10:47:05 +08:00
parent 01e4f0aefa
commit d8d546c90a
13 changed files with 220 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@@ -4,10 +4,10 @@
<selectionStates> <selectionStates>
<SelectionState runConfigName="app"> <SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" /> <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"> <Target type="DEFAULT_BOOT">
<handle> <handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=D122222104A9" /> <DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=a12bc17f" />
</handle> </handle>
</Target> </Target>
</DropdownSelection> </DropdownSelection>

2
app/src/main/java/com/ckkj/water/espBle/EspProvisionManager.java
View File

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

8
app/src/main/java/com/ckkj/water/login/LoginActivity.java
View File

@@ -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(); showLoadingDialog();
mPresenter.loginBySmsCode(loginType, mPresenter.loginBySmsCode(loginType,

11
app/src/main/java/com/ckkj/water/plan/WaterConfigFragment.java
View File

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

2
app/src/main/res/layout/dialog_app_update_water.xml
View File

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

392
app/src/main/res/layout/login_layout.xml
View File

@@ -1,232 +1,246 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/color_F9F9F9" android:background="@color/color_F9F9F9">
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"/>
<LinearLayout <LinearLayout
android:id="@+id/ll_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<Button <ImageView
android:id="@+id/btn_133"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="133" android:layout_gravity="center_horizontal"
android:visibility="gone"/> android:src="@mipmap/icon_launch_icon"
<Button android:layout_marginTop="80dp"/>
android:id="@+id/btn_151"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="151"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_30" android:orientation="vertical">
android:orientation="horizontal" <Button
android:layout_marginTop="96dp"> android:id="@+id/btn_133"
<LinearLayout
android:id="@+id/tab_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:text="133"
android:visibility="visible"/>
<TextView <Button
android:id="@+id/tv_login_by_code" android:id="@+id/btn_151"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="151"
android:visibility="visible"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_30"
android:orientation="horizontal"
android:layout_marginTop="96dp">
<LinearLayout
android:id="@+id/tab_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_by_code" android:orientation="vertical">
android:textColor="@color/color_333333"
<TextView
android:id="@+id/tv_login_by_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_by_code"
android:textColor="@color/color_333333"
android:textSize="14sp"
android:textStyle="bold"/>
<View
android:id="@+id/view_line_code"
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="-6dp"
android:background="@color/color_8000CA9D"/>
</LinearLayout>
<LinearLayout
android:id="@+id/tab_psd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="40dp">
<TextView
android:id="@+id/tv_login_by_psd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_by_psd"
android:textColor="@color/color_333333"
android:textSize="14sp"/>
<View
android:id="@+id/view_line_psd"
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="-6dp"
android:background="@color/color_8000CA9D"
android:visibility="invisible"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:layout_marginHorizontal="20dp"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="@dimen/dp_25"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/icon_phone"/>
<EditText
android:id="@+id/et_account"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="@null"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold"/> android:textColor="@color/color_222222"
android:hint="@string/hint_input_account"/>
<View
android:id="@+id/view_line_code"
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="-6dp"
android:background="@color/color_8000CA9D"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/tab_psd" android:id="@+id/linear_verfi_code"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:orientation="vertical" android:orientation="horizontal"
android:layout_marginLeft="40dp"> android:layout_marginHorizontal="20dp"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="20dp"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/icon_phone_code"/>
<EditText
android:id="@+id/ed_code_input"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:layout_marginLeft="5dp"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/color_222222"
android:hint="@string/hint_input_verifi"/>
<TextView <TextView
android:id="@+id/tv_login_by_psd" android:id="@+id/tv_get_verifi_code"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_by_psd" android:layout_weight="1.2"
android:textColor="@color/color_333333" android:background="@drawable/shape_green_50"
android:textSize="14sp"/> android:paddingVertical="8dp"
android:gravity="center"
<View android:textSize="13sp"
android:id="@+id/view_line_psd" android:textColor="@color/white"
android:layout_width="match_parent" android:text="@string/get_verifi_code"/>
android:layout_height="3dp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="-6dp"
android:background="@color/color_8000CA9D"
android:visibility="invisible"/>
</LinearLayout> </LinearLayout>
</LinearLayout> <LinearLayout
android:id="@+id/linear_psd"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal"
android:layout_marginHorizontal="20dp"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="@dimen/dp_25"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/icon_phone"/>
<EditText
android:id="@+id/et_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="50dp"
android:layout_marginLeft="5dp" android:orientation="horizontal"
android:background="@null" android:layout_marginHorizontal="20dp"
android:textSize="14sp" android:background="@drawable/shape_round_corner_100"
android:textColor="@color/color_222222" android:layout_marginTop="20dp"
android:hint="@string/hint_input_account"/> android:gravity="center_vertical"
</LinearLayout> android:paddingHorizontal="@dimen/dp_20"
android:visibility="gone">
<LinearLayout <ImageView
android:id="@+id/linear_verfi_code" android:layout_width="24dp"
android:layout_width="match_parent" android:layout_height="24dp"
android:layout_height="50dp" android:src="@mipmap/icon_psd"/>
android:orientation="horizontal" <EditText
android:layout_marginHorizontal="20dp" android:id="@+id/et_input_psd"
android:background="@drawable/shape_round_corner_100" android:layout_width="0dp"
android:layout_marginTop="20dp" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_weight="8"
android:paddingHorizontal="@dimen/dp_20"> android:layout_marginLeft="5dp"
<ImageView android:background="@null"
android:layout_width="24dp" android:textSize="14sp"
android:layout_height="24dp" android:textColor="@color/color_222222"
android:src="@mipmap/icon_phone_code"/> android:hint="@string/hint_input_psd"
<EditText android:inputType="textPassword"/>
android:id="@+id/ed_code_input" <ImageView
android:layout_width="0dp" android:id="@+id/img_psd_show_hide"
android:layout_height="match_parent" android:layout_width="24dp"
android:layout_weight="2" android:layout_height="24dp"
android:layout_marginLeft="5dp" android:layout_weight="0.5"
android:background="@null" android:src="@mipmap/icon_psd_show"/>
android:textSize="14sp" </LinearLayout>
android:textColor="@color/color_222222"
android:hint="@string/hint_input_verifi"/>
<TextView <TextView
android:id="@+id/tv_get_verifi_code" android:id="@+id/tv_login"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.2" android:textSize="14sp"
android:background="@drawable/shape_green_50"
android:paddingVertical="8dp"
android:gravity="center"
android:textSize="13sp"
android:textColor="@color/white" android:textColor="@color/white"
android:text="@string/get_verifi_code"/> android:text="@string/btn_login"
</LinearLayout> android:background="@drawable/shape_green_button_bg"
android:paddingVertical="10dp"
<LinearLayout android:layout_marginHorizontal="20dp"
android:id="@+id/linear_psd" android:layout_marginTop="40dp"
android:layout_width="match_parent" android:gravity="center"/>
android:layout_height="50dp" <RelativeLayout
android:orientation="horizontal"
android:layout_marginHorizontal="20dp"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="20dp"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20"
android:visibility="gone">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/icon_psd"/>
<EditText
android:id="@+id/et_input_psd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:orientation="horizontal"
android:background="@null" android:layout_marginTop="20dp"
android:textSize="14sp" android:layout_marginHorizontal="20dp">
android:textColor="@color/color_222222" <TextView
android:hint="@string/hint_input_psd"/> android:id="@+id/tv_go_register"
</LinearLayout> android:layout_width="wrap_content"
<TextView android:layout_height="wrap_content"
android:id="@+id/tv_login" android:textSize="14sp"
android:layout_width="match_parent" android:textColor="@color/color_zhu"
android:layout_height="wrap_content" android:text="@string/go_register"/>
android:textSize="14sp" <TextView
android:textColor="@color/white" android:id="@+id/tv_language"
android:text="@string/btn_login" android:layout_width="wrap_content"
android:background="@drawable/shape_green_button_bg" android:layout_height="wrap_content"
android:paddingVertical="10dp" android:layout_centerHorizontal="true"
android:layout_marginHorizontal="20dp" android:layout_centerVertical="true"
android:layout_marginTop="40dp" android:textSize="14sp"
android:gravity="center"/> android:textColor="@color/color_zhu"
<RelativeLayout android:text="@string/change_language"/>
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" android:id="@+id/tv_reset_psd"
android:orientation="horizontal" android:layout_width="wrap_content"
android:layout_marginTop="20dp" android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"> android:layout_alignParentRight="true"
<TextView android:layout_centerVertical="true"
android:id="@+id/tv_go_register" android:textSize="14sp"
android:layout_width="wrap_content" android:textColor="@color/color_zhu"
android:layout_height="wrap_content" android:text="@string/reset_psd"
android:textSize="14sp" android:visibility="invisible"/>
android:textColor="@color/color_zhu" </RelativeLayout>
android:text="@string/go_register"/>
<TextView
android:id="@+id/tv_language"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textSize="14sp"
android:textColor="@color/color_zhu"
android:text="@string/change_language"/>
<TextView
android:id="@+id/tv_reset_psd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textSize="14sp"
android:textColor="@color/color_zhu"
android:text="@string/reset_psd"
android:visibility="invisible"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_100"> android:layout_height="@dimen/dp_100"
android:layout_alignParentBottom="true">
<RelativeLayout <RelativeLayout
android:id="@+id/realtive_read_finish" android:id="@+id/realtive_read_finish"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginHorizontal="@dimen/dp_15" android:layout_marginHorizontal="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_30"> android:layout_marginBottom="@dimen/dp_30">
<RadioButton <RadioButton
@@ -251,4 +265,4 @@
android:textSize="11sp" /> android:textSize="11sp" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </RelativeLayout>

2
app/src/main/res/layout/water_config_fragment_layout_copy.xml
View File

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

BIN
app/src/main/res/mipmap-xhdpi/icon_psd_hide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_psd_show.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_psd_hide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_psd_show.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/icon_psd_hide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/icon_psd_show.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB