From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 22 八月 2024 13:43:47 +0800
Subject: [PATCH] 2024年08月22日13:43:45
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index cff9650..6493916 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.ui.newC;
+import android.Manifest;
import android.os.Bundle;
import android.view.View;
@@ -21,9 +22,11 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
-import com.hdl.photovoltaic.ui.device.FastScanActivity;
+import com.hdl.photovoltaic.ui.device.ScanActivity;
import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.LocalManageUtil;
+import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -37,12 +40,12 @@
* C绔數绔欏垪琛ㄧ紪杈�
*/
public class PowerStationsListEdit extends CustomBaseActivity {
- private ActivityPowerStationsListBinding viewBinding;
+ private ActivityPowerStationsListBinding viewBinding;//鏄惁鍦ㄧ紪杈戠姸鎬�
private HouseListAdapter houseListAdapter;
private List<HouseIdBean> houseListBeanIDList;
- private boolean is_edit = false;
+ private boolean is_edit = false;//琛ㄧず鏄惁鍦ㄧ紪杈戠姸鎬�(true=鍦ㄧ紪杈戠姸鎬�)
@Override
public Object getContentView() {
@@ -78,7 +81,9 @@
finish();
return;
}
+
is_edit = false;
+ viewBinding.addPowerStationRl.setVisibility(View.VISIBLE);//娣诲姞鐢电珯缁勪欢
viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE);
initData();//鍒濆鍖栫紦瀛樻暟鎹�
setAllItemEdit(false);
@@ -92,7 +97,9 @@
if (is_edit) {
return;
}
+
is_edit = true;
+ viewBinding.addPowerStationRl.setVisibility(View.GONE);//娣诲姞鐢电珯缁勪欢
viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.GONE);
initData();//鍒濆鍖栫紦瀛樻暟鎹�
setAllItemEdit(true);
@@ -163,9 +170,22 @@
viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {
+ @Override
+ public void Success(int value) {
+ if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
+// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
+ return;
+ }
+
+
+// startActivity(CaptureActivity.class);
+ startActivity(ScanActivity.class);
+ }
+ }, true);
// String path = HDLUniMP.UNI_EVENT_OPEN_DEVICESCAN + "?scanType=addPowerStation";
// HdlUniLogic.getInstance().openUniMP(path, null);
- startActivity(FastScanActivity.class);
+// startActivity(FastScanActivity.class);
}
});
@@ -270,6 +290,7 @@
dialog.setTitle(getString(R.string.loading_title_tip));
dialog.setContent(getString(R.string.switch_power_station).replace("%s", "\"" + houseIdBean.getHomeName() + "\""));
dialog.show();
+ dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -331,7 +352,7 @@
@Override
public void onFailure(HDLException e) {
-
+ HdlThreadLogic.toast(_mActivity, e);
}
});
--
Gitblit v1.8.0