From da53ba3b968531f4d9af8bc6487d174309281c0f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 16:13:39 +0800
Subject: [PATCH] 2023年12月05日16:13:31

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java         |    7 +++
 app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java  |    1 
 app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java |   63 ++++++++++++++++++++++++++++---
 app/src/main/AndroidManifest.xml                                     |    4 +-
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java     |    7 +--
 5 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 06a4143..056e9d6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -153,10 +153,10 @@
             android:value="812" />
         <meta-data
             android:name="design_width_in_dp"
-            android:value="375" /> <!-- 涓嶅姞杩欎釜浣滅敤鍩熶笂鍘绘墦寮�鐩稿唽鐨勬槸闂�� -->
+            android:value="375" />
         <meta-data
             android:name="ScopedStorage"
-            android:value="true" />
+            android:value="true" /> <!-- 涓嶅姞杩欎釜浣滅敤鍩熶笂鍘绘墦寮�鐩稿唽鐨勬槸闂�� -->
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index 046f812..b6834cd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -103,14 +103,11 @@
      * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
      */
     public GatewayBean getCurrentHomeMainGateway() {
-        List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+        List<GatewayBean> list = this.getCurrentHomeGatewayList();
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
                 GatewayBean gatewayBean = list.get(i);
-                if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
-                    continue;
-                }
-                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)) {
                     //鎵惧埌杩斿洖
                     return gatewayBean;
                 }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index 115bc1a..362be2a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -1,7 +1,6 @@
 package com.hdl.photovoltaic.ui.me;
 
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.text.TextUtils;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index 1574548..817490e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -166,10 +166,15 @@
                 startActivity(AsRegardsActivity.class);
             }
         });
+        final int[] count = {0};
         viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(TestMainActivity.class);
+                count[0] = count[0] + 1;
+                if (count[0] > 3) {
+                    count[0] = 0;
+                    startActivity(TestMainActivity.class);
+                }
             }
         });
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
index 0911e5b..fb0f354 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -9,14 +9,17 @@
 import android.view.View;
 
 import com.google.gson.Gson;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityTestMainBinding;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
 import com.hdl.photovoltaic.other.HdlDeviceLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
 import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog;
@@ -34,6 +37,8 @@
 
     private ActivityTestMainBinding viewBinding;
     private TestTitleAdapter testTitleAdapter;
+
+    private List<OidBean> mOidList;
 
     @Override
     public Object getContentView() {
@@ -114,6 +119,8 @@
         s.add("鑾峰彇閫嗗彉鍣╫id鍒楄〃");
         s.add("璇诲彇閫嗗彉鍣ㄨ鎯�");
         s.add("娓呴櫎閫嗗彉鍣ㄤ綇瀹匢d");
+        s.add("涓婁紶oid鍒楄〃缁欎簯绔�");
+        s.add("鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�");
         return s;
     }
 
@@ -134,7 +141,7 @@
 
                     @Override
                     public void onError(HDLLinkException e) {
-                        setError(e);
+                        setError(e.getMsg(), e.getCode());
                     }
                 });
             }
@@ -144,12 +151,13 @@
                 HdlDeviceLogic.getInstance().getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
                     @Override
                     public void onSuccess(List<OidBean> obj) {
+                        mOidList = obj;
                         gsonConvertJsonStr(obj);
                     }
 
                     @Override
                     public void onError(HDLLinkException e) {
-                        setError(e);
+                        setError(e.getMsg(), e.getCode());
                     }
                 });
             }
@@ -164,7 +172,7 @@
 
                     @Override
                     public void onError(HDLLinkException e) {
-                        setError(e);
+                        setError(e.getMsg(), e.getCode());
                     }
                 });
             }
@@ -181,19 +189,62 @@
 
                             @Override
                             public void onError(HDLLinkException e) {
-                                setError(e);
+                                setError(e.getMsg(), e.getCode());
                             }
                         });
                     }
                 });
             }
             break;
+            case "涓婁紶oid鍒楄〃缁欎簯绔�": {
+                if (this.mOidList == null || this.mOidList.size() == 0) {
+                    hideLoading();
+                    HdlThreadLogic.toast(this, "娌℃湁oid鍒楄〃鏁版嵁锛岃鍏堣幏鍙栭�嗗彉鍣╫id鍒楄〃鏁版嵁锛屽啀閲嶆柊涓婁紶.");
+                    return;
+                }
+                HdlDeviceLogic.getInstance().fullUpdateOid(this.mOidList, new CloudCallBeak<Boolean>() {
+                    @Override
+                    public void onSuccess(Boolean obj) {
+                        gsonConvertJsonStr(obj);
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        setError(e.getMsg(), e.getCode());
+                    }
+                });
+            }
+            break;
+            case "鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�": {
+                HdlDeviceLogic.getInstance().getInverterDeviceChildDeviceList(gatewayBean.getOid(), new CloudCallBeak<List<CloudInverterChildDeviceBean>>() {
+                    @Override
+                    public void onSuccess(List<CloudInverterChildDeviceBean> obj) {
+                        gsonConvertJsonStr(obj);
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        setError(e.getMsg(), e.getCode());
+                    }
+                });
+            }
+            break;
+            default: {
+                HdlThreadLogic.runMainThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        hideLoading();
+                    }
+                }, this, ShowErrorMode.YES);
+                break;
+            }
+
         }
 
     }
 
-    private void setError(HDLLinkException hdlLinkException) {
-        String error = hdlLinkException.getMsg() + "(" + hdlLinkException.getCode() + ")";
+    private void setError(String msg, int code) {
+        String error = msg + "(" + code + ")";
         showText(error);
     }
 

--
Gitblit v1.8.0