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 |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 2 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 91c8d1f..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
@@ -1,6 +1,7 @@
 package com.hdl.photovoltaic.ui.newC;
 
 
+import android.Manifest;
 import android.os.Bundle;
 import android.view.View;
 
@@ -14,15 +15,23 @@
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityPowerStationsListBinding;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.internet.HttpClient;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
 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.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 org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,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() {
@@ -72,7 +81,9 @@
                     finish();
                     return;
                 }
+
                 is_edit = false;
+                viewBinding.addPowerStationRl.setVisibility(View.VISIBLE);//娣诲姞鐢电珯缁勪欢
                 viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE);
                 initData();//鍒濆鍖栫紦瀛樻暟鎹�
                 setAllItemEdit(false);
@@ -86,7 +97,9 @@
                 if (is_edit) {
                     return;
                 }
+
                 is_edit = true;
+                viewBinding.addPowerStationRl.setVisibility(View.GONE);//娣诲姞鐢电珯缁勪欢
                 viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.GONE);
                 initData();//鍒濆鍖栫紦瀛樻暟鎹�
                 setAllItemEdit(true);
@@ -153,6 +166,29 @@
             });
 
         }
+
+        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);
+
+            }
+        });
 
     }
 
@@ -243,6 +279,7 @@
         HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.nullDataIc.getRoot(), viewBinding.nullDataIc.nullDataGifAnimationIv, viewBinding.nullDataIc.nullDataTv, getString(R.string.my_power_station_data_null), list != null && list.size() > 0);
     }
 
+
     /**
      * 浜屾纭鎻愮ず妗�
      *
@@ -292,4 +329,34 @@
             }
         });
     }
+
+
+    /**
+     * 鏀跺埌EventBUs閫氱煡
+     *
+     * @param eventBus 鏁版嵁
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMessage(BaseEventBus eventBus) {
+        super.onEventMessage(eventBus);
+        if (HDLUniMP.UNI_EVENT_REPLY_HOME_ADD.equals(eventBus.getTopic())) {
+            if (HDLUniMP.UNI_EVENT_REPLY_HOME_ADD.equals(eventBus.getType())) {
+//                // 鍙栨秷绮樻�т簨浠�
+//                EventBus.getDefault().removeStickyEvent(eventBus);
+                HttpClient.getInstance().requestHttpGet(eventBus.getData().toString(), new CloudCallBeak<String>() {
+                    @Override
+                    public void onSuccess(String obj) {
+                        downReadData(true);
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        HdlThreadLogic.toast(_mActivity, e);
+                    }
+                });
+
+            }
+        }
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.8.0