From 49c135d23c6038a8c456cf1fcf450e5fb649047a Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 25 十一月 2022 17:44:06 +0800
Subject: [PATCH] 合并代码

---
 AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
index 294041b..390e74e 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
@@ -41,7 +41,7 @@
     private RelativeLayout rlDeviceDetail;
     private RelativeLayout rlDetailVersion;
     private RelativeLayout rlDeployment;
-//    private RelativeLayout rlDetele;
+    private RelativeLayout rlDetele;
     private TextView tvDeviceName;
     private ImageView ivDevicePic;
     private TextView tvDeviceVersion;
@@ -55,6 +55,7 @@
     private IGetDeviceInfoCallBack.IModifyDeviceName modifyNameListener;
     private String fromWhere;
     private TextView tvDeploymentTip;
+    private TextView tvFormat_sd;
 
     public static DeviceDetailMainFragment newInstance() {
         DeviceDetailMainFragment fragment = new DeviceDetailMainFragment();
@@ -86,17 +87,19 @@
         rlDetailVersion = view.findViewById(R.id.rl_detail_version);
         rlDeployment = view.findViewById(R.id.rl_deployment);
         tvDeploymentTip = view.findViewById(R.id.tv_deployment_tip);
-//        rlDetele = view.findViewById(R.id.rl_detele);
+        rlDetele = view.findViewById(R.id.rl_detele);
         tvDeviceName = view.findViewById(R.id.tv_device_name);
         ivDevicePic = view.findViewById(R.id.iv_device_pic);
         tvDeviceVersion = view.findViewById(R.id.tv_device_version);
         tvCurrentWifi = view.findViewById(R.id.tv_current_wifi);
         rlCurWifi = view.findViewById(R.id.rl_cur_wifi);
+        tvFormat_sd =view.findViewById(R.id.tvFormat_sd);
 
         rlDeployment.setOnClickListener(this);
-//        rlDetele.setOnClickListener(this);
+        rlDetele.setOnClickListener(this);
         rlDeviceDetail.setOnClickListener(this);
         rlCurWifi.setOnClickListener(this);
+        tvFormat_sd.setOnClickListener(this);
         DeviceDetailActivity deviceDetailActivity = (DeviceDetailActivity) getActivity();
         deviceDetailActivity.tvTitle.setText(getResources().getString(R.string.lc_demo_device_detail_title));
         if (arguments == null) {
@@ -126,7 +129,7 @@
                 getDeviceLocalCache();
                 rlDetailVersion.setVisibility(View.GONE);
                 rlCurWifi.setVisibility(View.GONE);
-//                rlDetele.setVisibility(View.GONE);
+                rlDetele.setVisibility(View.GONE);
             }
         } else if (deviceListBean.channels!=null&&deviceListBean.channels.size() == 1) {
             //鍗曢�氶亾
@@ -134,7 +137,7 @@
             getDeviceLocalCache();
             tvDeviceVersion.setText(deviceListBean.version);
             if (deviceListBean.deviceSource == 2) {
-//                rlDetele.setVisibility(View.GONE);
+                rlDetele.setVisibility(View.GONE);
             }
             rlCurWifi.setVisibility(View.VISIBLE);
             //璁惧鎵嶈兘鑾峰彇WIFI
@@ -226,6 +229,7 @@
     }
 
     public void gotoUpdatePage(FragmentActivity fragmentActivity) {
+        if(true){return;}
         if (fragmentActivity == null || fragmentActivity.getSupportFragmentManager() == null) {
             return;
         }
@@ -262,14 +266,33 @@
             gotoDeploymentPage(getActivity());
         } else if (id == R.id.rl_detail_version) {
             gotoUpdatePage(getActivity());
-//        } else if (id == R.id.rl_detele) {
-//            //瑙ｇ粦璁惧
-//            deviceDetailActivity.rlLoading.setVisibility(View.VISIBLE);
-//            DeviceDetailService deviceDetailService = ClassInstanceManager.newInstance().getDeviceDetailService();
-//         /*   DeviceUnBindData deviceUnBindData = new DeviceUnBindData();
-//            deviceUnBindData.data.deviceId = deviceListBean.deviceId;
-//            deviceDetailService.unBindDevice(deviceUnBindData, this);*/
-//            deviceDetailService.deletePermission(deviceListBean.deviceId,null,this);
+        } else if (id == R.id.rl_detele) {
+            //瑙ｇ粦璁惧
+            deviceDetailActivity.rlLoading.setVisibility(View.VISIBLE);
+            DeviceDetailService deviceDetailService = ClassInstanceManager.newInstance().getDeviceDetailService();
+         /*   DeviceUnBindData deviceUnBindData = new DeviceUnBindData();
+            deviceUnBindData.data.deviceId = deviceListBean.deviceId;
+            deviceDetailService.unBindDevice(deviceUnBindData, this);*/
+            deviceDetailService.deletePermission(deviceListBean.deviceId,null,this);
+        }
+        else if(id==R.id.tvFormat_sd){
+            deviceDetailActivity.rlLoading.setVisibility(View.VISIBLE);
+            DeviceDetailService deviceDetailService = ClassInstanceManager.newInstance().getDeviceDetailService();
+         /*   DeviceUnBindData deviceUnBindData = new DeviceUnBindData();
+            deviceUnBindData.data.deviceId = deviceListBean.deviceId;
+            deviceDetailService.unBindDevice(deviceUnBindData, this);*/
+            deviceDetailService.recoverSDCard(deviceListBean.deviceId, new IGetDeviceInfoCallBack.IRecoverSDCardCallBack() {
+                @Override
+                public void onSuccess(String result) {
+                    deviceDetailActivity.rlLoading.setVisibility(View.GONE);
+                }
+
+                @Override
+                public void onError(Throwable throwable) {
+                    deviceDetailActivity.rlLoading.setVisibility(View.GONE);
+                }
+            });
+
         }
     }
 

--
Gitblit v1.8.0