优化

app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java

@@ -156,6 +156,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
             stopWorkProgressUpdate();
             updateProgressView(0);
         }
+        viewBinding.tvDeviceUpdateTime.setText(entity.getPowerLevelUpdatatime());
     }
 
     private void initListener() {
@@ -214,7 +215,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
                         .hasShadowBg(false) // 去掉半透明背景
                         .asCustom(new CustomBubbleAttachPopup(mContext,"设备电量:"+
                                 mDeviceEntity.getPowerLevel() + "%" +
-                                " 更新时间: 05- 11 18:00"))
+                                " 更新时间: " + mDeviceEntity.getPowerLevelUpdatatime()))
                         .show();
                 break;
 

app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java

@@ -113,9 +113,25 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
                 break;
 
             case R.id.rl_dev_wifi_manager:
+                showDialogtext(null, false, false, true,
+                        getString(R.string.tip_text),
+                        getString(R.string.reset_device_provision),
+                        getString(R.string.cancel_text),
+                        getString(R.string.confirm_text),
+                        new BaseFragment.OnDialogClick() {
+                            @Override
+                            public void onCancelClick() {
+                            }
+
+                            @Override
+                            public void onConfirmClick() {
                                 Bundle bundle = new Bundle();
-                bundle.putInt(ConstantUtil.ACTIVITY_NAVIGATE_FLAG,200);
+                                bundle.putInt(ConstantUtil.ACTIVITY_NAVIGATE_FLAG,100);
+                                bundle.putSerializable("ble_device_entity",mDeviceEntity);
                                 goToForResult(mContext, SelectWifiActivity.class,REQUEST_EVENT_CODE_10001,bundle);
+                            }
+                        });
+
                 break;
 
             case R.id.rl_dev_unbind:

app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java

@@ -36,6 +36,7 @@ import com.gyf.immersionbar.ImmersionBar;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -321,7 +322,8 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
         if (isBleConnected || isBleConnecting) {
             return;
         }
-        espProvisionManager.connect(mBleDeviceEntity.getMacAddress(), mBleDeviceEntity.getDeviceName());
+        espProvisionManager.connect(mBleDeviceEntity.getMacAddress().toUpperCase(Locale.ROOT),
+                mBleDeviceEntity.getDeviceName());
     }
 
     private void scanWifi() {

app/src/main/java/com/ckkj/water/guide/LaunchActivity.java

@@ -53,8 +53,13 @@ public class LaunchActivity extends BaseActivity<GuideLayoutBinding, MainPresent
         //首次进入，弹框提示隐私政策
         if (mIsFirstEnterApp) {
             //首次进入
-            showDialogtext("温馨提示", mContext.getResources().getString(R.string.tips_yinsizhengce_dialog),
+            showDialogtext(
-                    "同意", "拒绝", "用户隐私协议", new OnDialogClick() {
+                    getString(R.string.tip_text),
+                    getString(R.string.tips_yinsizhengce_dialog),
+                    getString(R.string.agree),
+                    getString(R.string.reject),
+                    getString(R.string.user_agreement)
+                    , new OnDialogClick() {
 
                         @Override
                         public void onCancelClick() {

app/src/main/java/com/ckkj/water/index/entity/WaterDeviceEntity.java

@@ -36,7 +36,7 @@ public class WaterDeviceEntity implements Serializable {
     private String status;
     private String workStatus;
     private String powerLevel;
-    private Object powerLevelUpdatatime;
+    private String powerLevelUpdatatime;
     private String wifiName;
     private String wifiPassword;
     private String deviceEm;

app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java

@@ -56,6 +56,13 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
         if(bundle != null){
             mUserBean = (MineUserInfoBean) bundle.getSerializable(ConstantUtil.USER_INFO_JSON_CONTENT);
             viewBinding.tvNicknameValue.setText(mUserBean.getUser().getNickName());
+            if(!TextUtils.isEmpty(mUserBean.getUser().getAvatar())){
+                // 刷新头像显示
+                Glide.with(mContext)
+                        .load(mUserBean.getUser().getAvatar())
+                        .error(mContext.getDrawable(R.mipmap.icon_mine_user_head_defaul))
+                        .into(viewBinding.imgAvatar);
+            }
             if(TextUtils.isEmpty(mUserBean.getUser().getEmail())){
                 viewBinding.tvBindPhoneValue.setText(mUserBean.getUser().getPhonenumber());
             }else{

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

@@ -7,5 +7,5 @@
         android:id="@+id/ivRefresh"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:src="@mipmap/ic_launcher" />
+        android:src="@mipmap/icon_water_loading" />
 </RelativeLayout>

app/src/main/res/values-en/strings.xml

@@ -291,6 +291,11 @@
 
     <string name="resend">Resend</string>
 
+    <string name="agree">Agree</string>
+    <string name="reject">Decline</string>
+
+    <string name="tips_yinsizhengce_dialog">Thank you for using WaterX Smart Irrigation!\n\nTo better protect your personal information, we have updated our Privacy Policy and User Agreement. Please read the following:\n1. We may collect the personal information necessary to provide our services.\n2. You can view, correct, delete your personal information or withdraw your authorization at any time.\n3. We will not use your personal information for other purposes without your consent.\n4. We protect minors\' personal information in accordance with applicable laws.\n5. We reserve the right to restrict or terminate services if your account is used in violation of applicable rules.\n\nBy tapping &quot;Agree&quot;, you confirm that you have read and agree to the Privacy Policy and User Agreement.</string>
+
 
     <!-- End -->
 

app/src/main/res/values/strings.xml

@@ -274,6 +274,19 @@
 
     <string name="resend">重新发送</string>
 
+    <string name="agree">同意</string>
+    <string name="reject">拒绝</string>
+
+
+    <string name="tips_yinsizhengce_dialog">感谢您使用渥田氏智能灌溉！
+        \n\n为保障您的个人信息安全，我们更新了《隐私政策》和《用户协议》，请您阅读并了解以下内容：
+        \n1、为实现相关功能，我们可能会收集必要的个人信息。
+        \n2、您可以随时查询、更正、删除个人信息或撤回授权。
+        \n3、未经您的同意，我们不会将您的个人信息用于其他用途。
+        \n4、我们依法保护未成年人个人信息，未经监护人同意不会收集、使用18周岁及以下未成年人的个人信息。
+        \n5、如您发布违法违规内容或滥用账号，我们有权限制或终止相关服务。
+        \n\n点击"同意"即表示您已阅读并同意《隐私政策》和《用户协议》。</string>
+
 
 
     <!--结束-->
@@ -295,8 +308,6 @@
 
 
 
-
-
     <string name="plan_water_entity_json">
        {\"scheduleName\":\"智能洗水排程\",\"enable\":true,\"washCycleList\":[{\"week\":\"周一\",\"time\":\"10:30\",\"duration\":\"10min\"},{\"week\":\"周二\",\"time\":\"11:00\",\"duration\":\"15min\"},{\"week\":\"周三\",\"time\":\"09:30\",\"duration\":\"20min\"},{\"week\":\"周四\",\"time\":\"14:00\",\"duration\":\"10min\"},{\"week\":\"周五\",\"time\":\"16:30\",\"duration\":\"30min\"},{\"week\":\"周六\",\"time\":\"08:00\",\"duration\":\"25min\"},{\"week\":\"周日\",\"time\":\"19:00\",\"duration\":\"15min\"}],\"deviceList\":[{\"deviceName\":\"客厅洗水设备\",\"deviceCode\":\"YA226641000107\",\"bind\":true},{\"deviceName\":\"阳台洗水设备\",\"deviceCode\":\"YA226641000108\",\"bind\":true},{\"deviceName\":\"花园洗水设备\",\"deviceCode\":\"YA226641000109\",\"bind\":false}]}
     </string>
@@ -340,15 +351,7 @@
 
     <string name="tips_network_not_connected">网络未连接</string>
 
-    <string name="tips_yinsizhengce_dialog">感谢您对星语明灯一直以来的信任！\n\n我们依照新的监管条例要求更新了《隐私政策》《用户协议》，
+
-        为采取相应安全保护措施，尽力保护您的个人信息安全可控，特向您说明如下：\n1、您在使用星语明灯各项产品和服务时，将会提供与具体功能相关的个人信息（可能涉及账号、位置、交易信息等）。
-        \n2、您可以随时查询、更正、修改、删除您的个人信息，以及取消或者拒绝授权等。
-        \n3、未经您的同意，我们不会将您的信息用于您未授权的其他用途或目的。
-        \n4、未经监护人同意，我们不会收集使用18周岁以下（含18周岁）未成年人个人信息，且不会利用其信息推送新闻、时政信息、广告等定向推送活动。
-        \n5、如发现您发布不良内容或滥用用户权限我们有权终止您账户的使用。
-        \n6、为了提供稳定的消息推送和优化产品体验，我们需要获取您的设备信息（OAID），该信息由您手机厂商推送SDK/友盟统计SDK收集，仅用于推送和统计分析。
-        \n7、为了确保您能及时接收推送消息，我们的App接入了手机厂商推送SDK，该SDK可能会在后台维持长连接，导致系统检测到自启动或关联启动行为。
-        \n\n点击同意即表示您已阅读并同意全部条款</string>
     <string name="tips_yinsizhengce_click">《星语明灯平台隐私政策》</string>
 
     <string name="common_permission_description">权限说明</string>