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 | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 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 f593375..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; @@ -55,6 +58,7 @@ private IGetDeviceInfoCallBack.IModifyDeviceName modifyNameListener; private String fromWhere; private TextView tvDeploymentTip; + private TextView tvFormat_sd; public static DeviceDetailMainFragment newInstance() { DeviceDetailMainFragment fragment = new DeviceDetailMainFragment(); @@ -92,11 +96,13 @@ 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); 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) { @@ -226,6 +232,7 @@ } public void gotoUpdatePage(FragmentActivity fragmentActivity) { + if(true){return;} if (fragmentActivity == null || fragmentActivity.getSupportFragmentManager() == null) { return; } @@ -271,6 +278,33 @@ deviceDetailService.unBindDevice(deviceUnBindData, this);*/ deviceDetailService.deletePermission(deviceListBean.deviceId,null,this); } + else if(id==R.id.tvFormat_sd){ + /* DeviceUnBindData deviceUnBindData = new DeviceUnBindData(); + deviceUnBindData.data.deviceId = deviceListBean.deviceId; + deviceDetailService.unBindDevice(deviceUnBindData, this);*/ + + RecoverSDCardDialog dialog = new RecoverSDCardDialog(getContext()); + dialog.setOnOkClickLisenter(new DeviceUpdateDialog.OnOkClickLisenter() { + @Override + 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(); + } } @Override -- Gitblit v1.8.0