优化

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

@@ -34,6 +34,7 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
     private AnimationDrawable animationDrawable;
     private Handler handler = new Handler(Looper.getMainLooper());
     private static final long ANIMATION_DURATION = 5000L; // 5秒
+    private static final long PROVISION_TIMEOUT_MS = 60_000L;
 
     private String mWifiName;
     private String mWifiPassword;
@@ -42,6 +43,17 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
     private boolean isBleConnecting = false;
     private boolean isBleConnected = false;
     private boolean provisioningStarted = false;
+    private boolean provisionTimeoutHandled;
+    private final Runnable provisionTimeoutRunnable = () -> {
+        if (provisionTimeoutHandled || isFinishing()) return;
+        provisionTimeoutHandled = true;
+        if (espProvisionManager != null) {
+            espProvisionManager.setCallback(null);
+            espProvisionManager.disconnect();
+        }
+        ToastUtil.showShort(mContext, getString(R.string.device_provision_timeout));
+        finish();
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -101,6 +113,9 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
 
 
     private void initEspProvision() {
+        provisionTimeoutHandled = false;
+        handler.removeCallbacks(provisionTimeoutRunnable);
+        handler.postDelayed(provisionTimeoutRunnable, PROVISION_TIMEOUT_MS);
         espProvisionManager = EspProvisionManager.init(mContext).setCallback(new ProvisionCallback() {
             @Override
             public void onConnecting() {
@@ -128,6 +143,7 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
 
             @Override
             public void onSuccess(String deviceName, String deviceType) {
+                handler.removeCallbacks(provisionTimeoutRunnable);
                 Log.i("TEST", "DeviceConnectActivity===== deviceName：" + deviceName + "配网成功");
                 ToastUtil.showShort(mContext, deviceName + "配网成功");
                 handler.postDelayed(new Runnable() {
@@ -145,6 +161,7 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
 
             @Override
             public void onFailed(int errorCode, String message) {
+                handler.removeCallbacks(provisionTimeoutRunnable);
                 isBleConnecting = false;
                 if (errorCode != 0) {
                     isBleConnected = espProvisionManager != null && espProvisionManager.isConnected();
@@ -247,6 +264,7 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
 
     @Override
     protected void onDestroy() {
+        handler.removeCallbacks(provisionTimeoutRunnable);
         super.onDestroy();
         handler.removeCallbacksAndMessages(null);
         if (animationDrawable != null && animationDrawable.isRunning()) {
@@ -313,3 +331,4 @@ public class DeviceConnectActivity extends BaseActivity<DeviceConnectLayoutBindi
 
     }
 }
+

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

@@ -65,6 +65,9 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
             updateWorkProgress();
         }
     };
+    /**
+     * 轮询请求设备详情
+     */
     private final Runnable mDeviceDetailPollRunnable = new Runnable() {
         @Override
         public void run() {
@@ -398,12 +401,29 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
     @Override
     public void getDeviceDetailInfo(WaterDeviceEntity bean) {
         hideDialogLoading();
+        if(!TextUtils.isEmpty(bean.getPowerStatus()) && bean.getPowerStatus().equals("1")){
+            viewBinding.imgBatStatus.setImageResource(R.mipmap.icon_charging);
+        }else{
             viewBinding.imgBatStatus.setImageResource(PowerIconManage.getInstance().
                     getPowerVerIcon(Integer.parseInt(bean.getPowerLevel())));
-        mDeviceEntity = bean;
-        updateDeviceStatus( bean);
         }
 
+        mDeviceEntity = bean;
+        updateDeviceStatus( bean);
+
+    }
+
+
+    @Override
+    public void deviceAccessLost() {
+        stopDeviceDetailPolling();
+        showDialogtextInterBackKey(null, false, false, false,
+                getString(R.string.tip_text), getString(R.string.device_control_access_lost),
+                "", getString(R.string.confirm_text), new BaseFragment.OnDialogClick() {
+            @Override public void onCancelClick() { finish(); }
+            @Override public void onConfirmClick() { finish(); }
+        }, true);
+    }
 
     /**
      * 开关设备成功
@@ -588,3 +608,5 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
 
 
 }
+
+

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

@@ -243,7 +243,8 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
 
     @Override
     public void showError(String message) {
-
+        hideDialogLoading();
+        ToastUtil.showShort(mContext,message);
     }
 
     @Override

app/src/main/java/com/ckkj/water/device/mvp/DeviceContract.java

@@ -41,6 +41,8 @@ public class DeviceContract {
         //添加设备成功g
         void addDeviceSuccess(WaterDeviceEntity bean);
         void getDeviceDetailInfo(WaterDeviceEntity bean);
+        default void deviceAccessLost() {
+        }
         void editDeviceInfoSuccess(BaseBean bean);
         void deleteDeviceSuccess(BaseBean bean);
         default void factoryResetDeviceSuccess(BaseBean bean) {
@@ -52,3 +54,5 @@ public class DeviceContract {
         void queryDeviceWorkTimeSuccess(WaterDeviceEntity bean);
     }
 }
+
+

app/src/main/java/com/ckkj/water/device/mvp/DeviceImpl.java

@@ -35,6 +35,8 @@ public class DeviceImpl implements DeviceContract.DataModel{
                     public void onNext(@NonNull BaseBean<WaterDeviceEntity> bean) {
                         if (bean.getCode() == 200) {
                             callBack.success(bean.getData(),0);
+                        } else {
+                            callBack.fail(bean.getCode() == 501 ? "DEVICE_ACCESS_LOST" : bean.getMessage());
                         }
                     }
 
@@ -268,6 +270,8 @@ public class DeviceImpl implements DeviceContract.DataModel{
                     public void onNext(@NonNull BaseBean<WaterDeviceEntity> bean) {
                         if (bean.getCode() == 200) {
                             callBack.success(bean.getData(),0);
+                        } else {
+                            callBack.fail(bean.getCode() == 501 ? "DEVICE_ACCESS_LOST" : bean.getMessage());
                         }
                     }
 
@@ -282,3 +286,4 @@ public class DeviceImpl implements DeviceContract.DataModel{
                 });
     }
 }
+

app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java

@@ -49,9 +49,13 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
                 @Override
                 public void fail(String msg) {
                     if(DevicePresenter.this.getView() != null){
+                        if ("DEVICE_ACCESS_LOST".equals(msg)) {
+                        DevicePresenter.this.getView().deviceAccessLost();
+                    } else {
                         DevicePresenter.this.getView().showError(msg);
                     }
                     }
+                }
             });
         } catch (JSONException e) {
             throw new RuntimeException(e);
@@ -76,9 +80,13 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
             @Override
             public void fail(String msg) {
                 if(DevicePresenter.this.getView() != null){
+                    if ("DEVICE_ACCESS_LOST".equals(msg)) {
+                        DevicePresenter.this.getView().deviceAccessLost();
+                    } else {
                         DevicePresenter.this.getView().showError(msg);
                     }
                 }
+            }
         });
     }
 
@@ -104,9 +112,13 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
                 @Override
                 public void fail(String msg) {
                     if(DevicePresenter.this.getView() != null){
+                        if ("DEVICE_ACCESS_LOST".equals(msg)) {
+                        DevicePresenter.this.getView().deviceAccessLost();
+                    } else {
                         DevicePresenter.this.getView().showError(msg);
                     }
                     }
+                }
             });
         } catch (JSONException e) {
             throw new RuntimeException(e);
@@ -181,9 +193,13 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
                 @Override
                 public void fail(String msg) {
                     if(DevicePresenter.this.getView() != null){
+                        if ("DEVICE_ACCESS_LOST".equals(msg)) {
+                        DevicePresenter.this.getView().deviceAccessLost();
+                    } else {
                         DevicePresenter.this.getView().showError(msg);
                     }
                     }
+                }
             });
         } catch (JSONException e) {
             throw new RuntimeException(e);
@@ -240,9 +256,14 @@ public class DevicePresenter extends BasePresenter<DeviceContract.DeviceView> {
             @Override
             public void fail(String msg) {
                 if(DevicePresenter.this.getView() != null){
+                    if ("DEVICE_ACCESS_LOST".equals(msg)) {
+                        DevicePresenter.this.getView().deviceAccessLost();
+                    } else {
                         DevicePresenter.this.getView().showError(msg);
                     }
                 }
+            }
         });
     }
 }
+

app/src/main/java/com/ckkj/water/index/IndexFragment.java

@@ -210,6 +210,21 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
         deviceAdapter = new DeviceAdapter(mContext,R.layout.index_device_list_item,devList);
         viewBinding.rvDevices.setAdapter(deviceAdapter);
         deviceAdapter.setOnItemClickListener((adapter, view, position) -> {
+            if(!devList.get(position).getBindingStatus().equals("ACTIVE")){
+                showDialogtext(null, false, false,
+                        getString(R.string.tip_text), getString(R.string.device_no_permission_delete_message),
+                        getString(R.string.cancel_text), getString(R.string.confirm_text), new BaseFragment.OnDialogClick() {
+                            @Override
+                            public void onCancelClick() {
+                            }
+
+                            @Override
+                            public void onConfirmClick() {
+                                mPresenter.removeDeviceEntry(devList.get(position).getDeviceNo());
+                            }
+                        });
+                return;
+            }
             Bundle bundle = new Bundle();
             bundle.putSerializable("device_info",devList.get(position));
             goTo(mContext, DeviceControlActivity.class,bundle);
@@ -253,6 +268,12 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
         }
     }
 
+    @Override
+    public void removeDeviceEntrySuccess(BaseBean bean) {
+        ToastUtil.showShort(mContext, getString(R.string.remove_success));
+        mCurrentPage = 1;
+        mPresenter.getDevicesList(mCurrentPage);
+    }
     /**
      * 查询当前设备绑定状态
      * @param entity
@@ -477,3 +498,5 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
 
 
 }
+
+

app/src/main/java/com/ckkj/water/index/adapter/DeviceAdapter.java

@@ -11,7 +11,6 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.ckkj.water.R;
 import com.ckkj.water.index.entity.WaterDeviceEntity;
 import com.ckkj.water.utils.manager.PowerIconManage;
-import com.esafirm.imagepicker.model.Image;
 
 import java.util.List;
 
@@ -28,10 +27,10 @@ public class DeviceAdapter extends BaseQuickAdapter<WaterDeviceEntity, BaseViewH
         ImageView imgPower = holder.getView(R.id.img_battery);
         View viewStatus = holder.getView(R.id.view_status_dot);
         holder.setText(R.id.tv_device_name,item.getDeviceName());
-        holder.setText(R.id.tv_device_serial,item.getDeviceSn());
+        holder.setText(R.id.tv_device_serial,item.getDeviceNo());
         //设备联网在线
-        if(item.getStatus().equals("1")){
-            switch (item.getWorkStatus()){
+        if ("1".equals(item.getStatus())) {
+            switch (item.getWorkStatus() == null ? "0" : item.getWorkStatus()){
                 case "0"://待机
                     holder.setText(R.id.tv_device_status,mContext.getString(R.string.device_status_not_working));
                     holder.setTextColor(R.id.tv_device_status,mContext.getResources().getColor(R.color.color_999999));
@@ -51,9 +50,26 @@ public class DeviceAdapter extends BaseQuickAdapter<WaterDeviceEntity, BaseViewH
         }
 
 
-        holder.setText(R.id.tv_battery_level,item.getPowerLevel());
-        imgPower.setImageResource(PowerIconManage.getInstance().getPowerIcon(Integer.parseInt(item.getPowerLevel())));
+        String powerLevel = item.getPowerLevel();
+        int power = 0;
+        if (powerLevel != null) {
+            try {
+                power = Integer.parseInt(powerLevel.trim());
+            } catch (NumberFormatException ignored) {
+                power = 0;
+            }
+        }
+        if ("1".equals(item.getPowerStatus())) {
+            holder.setText(R.id.tv_battery_level, "充电中 " + (powerLevel == null ? "0%" : powerLevel + "%"));
+            imgPower.setImageResource(R.mipmap.icon_charging);
+        } else {
+            holder.setText(R.id.tv_battery_level, powerLevel == null ? "0%" : powerLevel + "%");
+            imgPower.setImageResource(PowerIconManage.getInstance().getPowerIcon(power));
+        }
     }
 
 
 }
+
+
+

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

@@ -36,6 +36,7 @@ public class WaterDeviceEntity implements Serializable {
     private String status;
     private String workStatus;
     private String powerLevel;
+    private String powerStatus;
     private String powerLevelUpdatatime;
     private String wifiName;
     private String wifiPassword;
@@ -50,6 +51,7 @@ public class WaterDeviceEntity implements Serializable {
     private WaterDeviceEntity bindDevice;
     private String startTime;
     private String endTime;
+    private String bindingStatus;
 
     @Data
     @NoArgsConstructor
@@ -80,5 +82,8 @@ public class WaterDeviceEntity implements Serializable {
         private String powerLevelUpdatatimeX;
         private Object expirationTimeX;
         private String checkStatus = "0";
+        private String bindingStatus;
     }
 }
+
+

app/src/main/java/com/ckkj/water/index/mvp/IndexContract.java

@@ -2,6 +2,7 @@ package com.ckkj.water.index.mvp;
 
 import com.ckkj.water.base.IView;
 import com.ckkj.water.index.entity.WaterDeviceEntity;
+import com.ckkj.water.network.BaseBean;
 
 import org.json.JSONObject;
 
@@ -25,6 +26,8 @@ public class IndexContract {
         void getDeviceList(Map<String,String> map,CallBack callBack);
         //查询二维码当前设备绑定状态
         void queryDeviceBindStatus(JSONObject json, CallBack callBack);
+        //从设备列表中移除设备
+        void removeDeviceEntry(String deviceNo, CallBack callBack);
 
     }
 
@@ -32,5 +35,8 @@ public class IndexContract {
         void getDeviceListSuccess(List<WaterDeviceEntity> list, int total);
         //查询二维码当前设备绑定状态
         void queryDeviceBindStatusSuccess(WaterDeviceEntity  entity);
+        //从设备列表中移除设备成功
+        void removeDeviceEntrySuccess(BaseBean bean);
     }
 }
+

app/src/main/java/com/ckkj/water/index/mvp/IndexImpl.java

@@ -91,4 +91,35 @@ public class IndexImpl implements IndexContract.DataModel{
         }
     }
 
+
+    @Override
+    public void removeDeviceEntry(String deviceNo, IndexContract.CallBack callBack) {
+        NetWorkManager.getRequest().removeDeviceEntry(NetWorkManager.getToken(), deviceNo)
+                .subscribeOn(Schedulers.io())
+                .unsubscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseBean>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
                     }
+
+                    @Override
+                    public void onNext(@NonNull BaseBean bean) {
+                        if (bean.getCode() == 200) {
+                            callBack.success(bean, 0);
+                        } else {
+                            callBack.fail(bean.getMessage());
+                        }
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                        callBack.fail(e.getMessage());
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
+    }}
+

app/src/main/java/com/ckkj/water/index/mvp/IndexPresenter.java

@@ -71,4 +71,22 @@ public class IndexPresenter extends BasePresenter<IndexContract.IndexView>{
         }
 
     }
+
+    public void removeDeviceEntry(String deviceNo) {
+        mImpl.removeDeviceEntry(deviceNo, new IndexContract.CallBack<BaseBean>() {
+            @Override
+            public void success(BaseBean bean, int total) {
+                if (IndexPresenter.this.getView() != null) {
+                    IndexPresenter.this.getView().removeDeviceEntrySuccess(bean);
                 }
+            }
+
+            @Override
+            public void fail(String msg) {
+                if (IndexPresenter.this.getView() != null) {
+                    IndexPresenter.this.getView().showError(msg);
+                }
+            }
+        });
+    }}
+

app/src/main/java/com/ckkj/water/network/Request.java

@@ -147,6 +147,13 @@ public interface Request {
     @DELETE("app/v1/deleteDevice/{deviceNo}")
     Observable<BaseBean> unBindDevice(@HeaderMap Map<String,String> headMap, @Path("deviceNo") String id);
 
+
+    //设备列表中，移除该设备
+    @DELETE("app/v1/removeDeviceEntry/{deviceNo}")
+    Observable<BaseBean> removeDeviceEntry(@HeaderMap Map<String,String> headMap, @Path("deviceNo") String id);
+
+
+
     //设备恢复出厂设置
     @DELETE("app/v1/factoryReset/{deviceNo}")
     Observable<BaseBean> deviceFactoryReset(@HeaderMap Map<String,String> headMap, @Path("deviceNo") String id);

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

@@ -137,7 +137,8 @@
         <RelativeLayout
             android:id="@+id/rl_reset_device"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_45">
+            android:layout_height="@dimen/dp_45"
+            android:visibility="gone">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

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

@@ -10,7 +10,7 @@
                     android:id="@+id/img_noresult"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@mipmap/icon_no_result"
+                    android:src="@mipmap/img_nodata"
                     android:layout_centerVertical="true"
                     android:layout_centerHorizontal="true"/>
                 <TextView

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

@@ -17,7 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:padding="@dimen/dp_10">
+            android:paddingVertical="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15">
             <!-- 左侧：设备信息 -->
             <LinearLayout
                 android:layout_width="0dp"

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

@@ -109,6 +109,8 @@
     <string name="device_offline_tip">Device is offline</string>
     <string name="restore_factory_settings">Restore Factory Settings</string>
     <string name="restore_factory_settings_warning">This operation will restore the device to factory settings.</string>
+    <string name="device_no_permission_delete_message">This device has been reset or bound to a new user. You no longer have permission to operate this device. Do you want to delete it now?</string>
+    <string name="remove_success">Removed successfully</string>
 
     <!-- Schedule -->
     <string name="input_plan_name">Enter schedule name</string>
@@ -335,4 +337,8 @@
 
 
 
+    <string name="device_control_access_lost">You have lost control of this device</string>
+    <string name="device_provision_timeout">Network configuration timed out. Please try again.</string>
 </resources>
+
+

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

@@ -100,6 +100,8 @@
     <string name="device_binding_conflict_message">该设备已被其他用户绑定，您可以登录该账号尝试解绑，或重置设备进入配网模式</string>
     <string name="restore_factory_settings">恢复出厂设置</string>
     <string name="restore_factory_settings_warning">该操作将会使设备恢复出厂设置</string>
+    <string name="device_no_permission_delete_message">当前设备已被重置或被新用户绑定，您已无权限继续操作该设备，是否立即删除？</string>
+
 
     <!--排程-->
     <string name="input_plan_name">输入排程名称</string>
@@ -133,7 +135,7 @@
     <string name="associated">已关联</string>
     <string name="plan_on">开启</string>
     <string name="plan_off">关闭</string>
-
+    <string name="remove_success">移除成功</string>
 
     <!--历史-->
     <string name="history_title">历史</string>
@@ -613,4 +615,8 @@
             书法艺术体现了中华文化的深厚底蕴，学习书法有助于增强文化自信和民族认同感。
 </string>
 
+    <string name="device_control_access_lost">已失去对该设备的控制权</string>
+    <string name="device_provision_timeout">配网超时，请重试</string>
 </resources>
+
+