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

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);
notifyProvisioning(0);
startProvisionProgressTask();
//wifi 密码 回调
espDevice.provision(ssid, password == null ? "" : password, new ProvisionListener() {
@Override
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) {
ToastUtil.showShort(mContext, getString(R.string.login_error_agreement));
return;
}
// if (!mYinsiConfirm) {
// ToastUtil.showShort(mContext, getString(R.string.login_error_agreement));
// return;
// }
showLoadingDialog();
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);
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,8 +265,12 @@ public class WaterConfigFragment extends BaseFragment<WaterConfigFragmentLayoutC
// 更新周配置列表的显示，使用 mConfigEntity.getDetails() 保证数据一致
if (mLocalEntity.getDetails() != null) {
weekList = mLocalEntity.getDetails();
mWeekAdapter.setNewData(mLocalEntity.getDetails());
mTimeAdapter.setNewData(weekList.get(mWeekAdapter.getmPos()).getTimeData());
if(!weekList.isEmpty()){
viewBinding.switchButton.setChecked(weekList.get(0).getStatus().equals("1"));
mWeekAdapter.setNewData(mLocalEntity.getDetails());
mTimeAdapter.setNewData(weekList.get(mWeekAdapter.getmPos()).getTimeData());
}
}
}