From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 042097b..ac55b8b 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
@@ -22,13 +22,13 @@
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;
-import com.zxing.qrcode.CaptureActivity;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -83,7 +83,7 @@
}
is_edit = false;
- viewBinding.addPowerStationTv.setVisibility(View.VISIBLE);//娣诲姞鐢电珯缁勪欢
+ viewBinding.addPowerStationRl.setVisibility(View.VISIBLE);//娣诲姞鐢电珯缁勪欢
viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE);
initData();//鍒濆鍖栫紦瀛樻暟鎹�
setAllItemEdit(false);
@@ -99,7 +99,7 @@
}
is_edit = true;
- viewBinding.addPowerStationTv.setVisibility(View.GONE);//娣诲姞鐢电珯缁勪欢
+ viewBinding.addPowerStationRl.setVisibility(View.GONE);//娣诲姞鐢电珯缁勪欢
viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.GONE);
initData();//鍒濆鍖栫紦瀛樻暟鎹�
setAllItemEdit(true);
@@ -177,7 +177,10 @@
// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
return;
}
- startActivity(FastScanActivity.class);
+
+
+// startActivity(CaptureActivity.class);
+ startActivity(ScanActivity.class);
}
}, true);
// String path = HDLUniMP.UNI_EVENT_OPEN_DEVICESCAN + "?scanType=addPowerStation";
@@ -348,7 +351,7 @@
@Override
public void onFailure(HDLException e) {
-
+ HdlThreadLogic.toast(_mActivity, e);
}
});
--
Gitblit v1.8.0