From 2588ab0681d9ef96f98114a1de018b420e3ee1da Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 11:16:14 +0800
Subject: [PATCH] Merge branch 'dev' into library
---
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 db12d50..940bb41 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
@@ -1,5 +1,6 @@
package com.lechange.demo.ui;
+import android.app.Activity;
import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
@@ -25,6 +26,8 @@
import com.common.openapi.entity.DeviceLocalCacheData;
import com.common.openapi.entity.DeviceUnBindData;
import com.lechange.demo.R;
+import com.lechange.demo.dialog.DeviceUpdateDialog;
+import com.lechange.demo.dialog.RecoverSDCardDialog;
import com.lechange.demo.tools.DialogUtils;
import com.lechange.demo.tools.MediaPlayHelper;
import com.mm.android.deviceaddmodule.LCDeviceEngine;
@@ -229,6 +232,7 @@
}
public void gotoUpdatePage(FragmentActivity fragmentActivity) {
+ if(true){return;}
if (fragmentActivity == null || fragmentActivity.getSupportFragmentManager() == null) {
return;
}
@@ -275,23 +279,31 @@
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);
- }
+ RecoverSDCardDialog dialog = new RecoverSDCardDialog(getContext());
+ dialog.setOnOkClickLisenter(new DeviceUpdateDialog.OnOkClickLisenter() {
@Override
- public void onError(Throwable throwable) {
- deviceDetailActivity.rlLoading.setVisibility(View.GONE);
+ public void OnOK() {
+ deviceDetailActivity.rlLoading.setVisibility(View.VISIBLE);
+ DeviceDetailService deviceDetailService = ClassInstanceManager.newInstance().getDeviceDetailService();
+ 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);
+ }
+ });
+
}
});
-
+ dialog.show();
}
}
--
Gitblit v1.8.0