From 90374cac911932ac9cb9f832cf80476166e2e6df Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 14 三月 2024 16:59:08 +0800
Subject: [PATCH] 2024年03月14日16:58:55

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java       |    2 
 app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java             |   17 ++++----
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java                        |    4 +-
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java             |    4 +-
 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java     |    7 +--
 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java        |    7 +++
 app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java           |    4 +-
 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java           |   19 +++++----
 app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java        |    2 +
 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java |    1 
 app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java         |   22 ++++++++++-
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java          |    4 +
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java          |    7 +--
 13 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 2c483d6..3421e37 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -125,7 +125,7 @@
 //        CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true);
         //6.鍒濆鍖朌CUniMPSDK
         initDCUniMPSDK();
-//        this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙�
+        this.initUniMqtt();//濡傛灉鏄儴缃插埌/鎵嬫満涓婃寮忎娇鐢紝娉ㄩ噴鎺夎繖琛屼唬鐮佸氨鍙�
 //        //7.鍒濆鍖栬嚜瀹氫箟IconToast
 //        ToastUtils.getInstance().initIconToast(this);
 //        //8.瀵筬astjson杩涜璁剧疆锛岃В鍐砯astjosn杞崲鎴愬瓧绗︿覆鏃堕瀛楁瘝澶у皬鍐欓棶棰�
@@ -300,7 +300,7 @@
      */
     private void initUniMqtt() {
         try {
-            String ip = NetworkUtils.getIPAddress(this);
+            String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this);
             if (TextUtils.isEmpty(ip)) {
                 return;
             }
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
index 60889ae..b4a5c81 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -14,11 +14,13 @@
     private static final String APP_KEY_ONLINE = "CSZEMDJL";
     private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
     private static final String APP_REGIONURL_ONLINE = "https://nearest.hdlcontrol.com";
+
     /*********娴嬭瘯鐜*********/
     private static final String APP_KEY_TEST = "CTBGMNUV";
     private static final String APP_SECRET_TEST = "CTBGMNVLCTBGMNWB";
     private static final String APP_REGIONURL_TEST = "https://test-gz.hdlcontrol.com";
 
+
     /*********鑾峰彇褰撳墠鏄惁浣跨敤姝ｅ紡鏈嶅姟鍣ㄧ幆澧�*********/
     public static boolean isIsOnlineServer() {
         return isOnlineServer;
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
index 0dff113..93917ee 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -47,7 +47,7 @@
 
     private static volatile HttpClient sHttpClient;
 
-    private static final boolean isAddToMemory=false;
+    private static final boolean isAddToMemory = false;
 
     public static synchronized HttpClient getInstance() {
         if (sHttpClient == null) {
@@ -73,7 +73,7 @@
     private Disposable requestPost(String api, String body, CloudCallBeak<String> callBack) {
         String requestUrl = HDLCloudUserApi.getRequestUrl(api);
         HdlLogLogic.print("http->鍙戦��->" + requestUrl + "\r\n" + body, isAddToMemory);
-        return HxHttp.builder().url(requestUrl).raw(body).build().post().subscribeWith(new HDLResponse<String>() {
+        return HxHttp.builder().headers("x-lbs-version", "hdl-yt").url(requestUrl).raw(body).build().post().subscribeWith(new HDLResponse<String>() {
             @Override
             public void onResponse(String str) {
                 if (callBack != null) {
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 24939e9..d656e12 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -7,7 +7,6 @@
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.hdl.linkpm.sdk.home.type.GatewayType;
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.internet.HttpClient;
@@ -37,7 +36,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.dcloud.common.adapter.util.DeviceInfo;
 
 
 /**
@@ -111,6 +109,7 @@
                     }
                     oidList.addAll(oidBeanList);
                     if (atomicInteger.get() == oidList.size()) {
+                        //鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶
                         fullUpdateOid(homeId, oidList, new CloudCallBeak<Boolean>() {
                             @Override
                             public void onSuccess(Boolean obj) {
@@ -180,10 +179,10 @@
     /**
      * 娣诲姞澶氫釜閫嗗彉鍣ㄥ埌浜戠涓�
      *
-     * @param mac           -
+     * @param list           閫嗗彉鍣ㄥ垪琛�
      * @param cloudCallBeak -
      */
-    public void addAllInverterDeviceToCloud(String homeId, String mac, List<GatewayBean> list, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void addAllInverterDeviceToCloud(String homeId, List<GatewayBean> list, CloudCallBeak<Boolean> cloudCallBeak) {
 
         String requestUrl = HttpApi.POST_Device_Add_All;
         JsonObject json = new JsonObject();
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
index a181146..0311e96 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -48,21 +48,22 @@
      * @param isOpened             true=鐐瑰嚮閫氱煡鏍忓洖璋�,false=鏀跺埌鎺ㄩ�侀�氱煡鍥炶皟;
      */
     public void JpushPushCommonData(Context context, JPushMessageInfoBean jPushMessageInfoBean, boolean isOpened) {
-        //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
-        this.addPushDataToMemoryList(jPushMessageInfoBean);
-        if (isOpened) {
-            if (UserConfigManage.getInstance().isBAccount()) {
+        if (UserConfigManage.getInstance().isBAccount()) {
+            //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
+            this.addPushDataToMemoryList(jPushMessageInfoBean);
+            if (isOpened) {
                 //瀹夎鍟嗚烦杞晫闈�
                 Intent intent = new Intent(context, MyPowerStationActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
                 context.startActivity(intent);
+
+            } else {
+                BaseEventBus bus = new BaseEventBus();
+                bus.setTopic(ConstantManage.message_function_push_post);
+                bus.setType(MessageStateType.untreated);
+                EventBus.getDefault().post(bus);
             }
-        } else {
-            BaseEventBus bus = new BaseEventBus();
-            bus.setTopic(ConstantManage.message_function_push_post);
-            bus.setType(MessageStateType.untreated);
-            EventBus.getDefault().post(bus);
         }
     }
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
index e6a0a88..9ddb078 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
@@ -1,6 +1,7 @@
 package com.hdl.photovoltaic.other;
 
 
+import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.utils.TimeUtils;
 
 /**
@@ -8,11 +9,10 @@
  */
 public class HdlLogLogic {
 
-    //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(true涓嶉渶瑕佹墦鍗�)
-    public static boolean isPrintLogcat = false;
+    //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(false涓嶉渶瑕佹墦鍗�)
+    public static boolean isPrintLogcat = true;
     //榛樿鎵撳嵃鏍囬
-    private static final String title = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�:";
-
+    private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�"+ (UserConfigManage.getInstance().isBAccount() ? "(B):" : "(C):");
 
     /**
      * java鎵撳嵃
@@ -53,15 +53,14 @@
      * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
      */
     private static void printBase(String msg, String code, boolean isAddToMemory) {
-        if (isPrintLogcat) {
-            return;
-        }
         CustomLogObject customLogObject = new CustomLogObject();
         customLogObject.msgOrData = msg;
         customLogObject.code = code;
-        String json = title;
+        String json =logTitle;
         json += customLogObject.getJointMessage();
-        System.out.println(json);
+        if (isPrintLogcat) {
+            System.out.println(json);
+        }
         if (isAddToMemory) {
             writeLog(customLogObject.getJointMessage());
         }
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
index d40026a..c82757a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -74,6 +74,21 @@
         return sortList(newList);
     }
 
+    /**
+     * 娑堟伅鍏ㄩ儴宸茶(鏈湴缂撳瓨)
+     *
+     * @param isRead 鏄惁璇诲彇(true宸茶鍙�)
+     */
+    public void setAllRead(boolean isRead) {
+        for (int i = 0; i < mListMessage.size(); i++) {
+            MessageBean messageBean = mListMessage.get(i);
+            if (messageBean == null) {
+                continue;
+            }
+            messageBean.setRead(isRead);
+        }
+    }
+
 
     /**
      * 鑾峰彇鎭㈠涓紦瀛樺垪琛�
@@ -466,6 +481,7 @@
     /**
      * 鑾峰彇鎸囧畾椤电殑鑾峰彇娑堟伅鍒楄〃(鐢ㄤ簬C绔�)
      *
+     * @param homeId           鐢电珯id
      * @param pageNo           椤电爜
      * @param messageStateType all:鍏ㄩ儴,UNTREATED:鏈鐞�,PROCESSED:宸插鐞�;
      * @param filter_key       绫诲瀷锛堣澶囷紝绛夌骇锛屾椂闂达級
@@ -474,10 +490,12 @@
      *                         timeType锛圱ODAY 锛氫粖澶╋紱LAST_3_DAYS: 杩�3澶╋紱LAST_7_DAYS 锛氳繎7澶╋紱LAST_30_DAYS 锛氳繎30澶╋級锛�
      * @param cloudCallBeak    -
      */
-    public void getPageNoMessageList_C(int pageNo, String messageStateType, String filter_key, String filter_value, CloudCallBeak<MessageListClass> cloudCallBeak) {
+    public void getPageNoMessageList_C(String homeId, int pageNo, String messageStateType, String filter_key, String filter_value, CloudCallBeak<MessageListClass> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Message_List;
         JsonObject json = new JsonObject();
-
+        if (!TextUtils.isEmpty(homeId)) {
+            json.addProperty("homeId", homeId);
+        }
         if (!MessageStateType.all.equals(messageStateType)) {
             json.addProperty("status", messageStateType);
         }
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 471483e..a21d962 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -37,7 +37,7 @@
  */
 public class HdlResidenceLogic {
 
-    public static final int pageSize = 500;
+    public static final int pageSize = 50;
 
     private static volatile HdlResidenceLogic sHdlResidenceLogic;
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index b923df1..9bda4c6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1379,7 +1379,7 @@
                                 atomicInteger.set(atomicInteger.get() + 1);
                                 //鏈�鍚庝竴鏉℃墠鍋氭坊鍔犻�嗗彉鍣ㄩ�昏緫澶勭悊
                                 if (atomicInteger.get() == list.size()) {
-                                    HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, gatewayBean.getDevice_mac(), list, new CloudCallBeak<Boolean>() {
+                                    HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, list, new CloudCallBeak<Boolean>() {
                                         @Override
                                         public void onSuccess(Boolean obj) {
                                             uniCallbackData(type, null, callback);
@@ -1448,7 +1448,7 @@
     private void uniSearchGateway(String type, DCUniMPJSCallback callback) {
 
 
-        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
+        HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
             @Override
             public void onSuccess(List<GatewayBean> gatewayBeanList) {
                 uniCallbackData(type, gatewayBeanList, callback);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 011e036..8c0584d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -245,8 +245,10 @@
                 HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
                     @Override
                     public void onSuccess(HDLUserRegionBean obj) {
+                        String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
                         //鍒濆鍖栨湇鍔″煙鍚�
-                        AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
+//                       AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
+                        AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
                         HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
                         HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
                             @Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index 6b4bfd0..c176594 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -115,7 +115,8 @@
                     @Override
                     public void onSuccess(Boolean obj) {
                         hideLoading();
-                        loadNextPageMessageList(1, true, mFilterKye, mFilterValue);
+                        HdlMessageLogic.getInstance().setAllRead(true);
+                        updateListData();
                     }
 
                     @Override
@@ -320,7 +321,7 @@
         } else {
             messageStateType = MessageStateType.processed;
         }
-        HdlMessageLogic.getInstance().getPageNoMessageList_C(pageNo, messageStateType, filter_key, filter_value, new CloudCallBeak<HdlMessageLogic.MessageListClass>() {
+        HdlMessageLogic.getInstance().getPageNoMessageList_C(UserConfigManage.getInstance().getHomeId(), pageNo, messageStateType, filter_key, filter_value, new CloudCallBeak<HdlMessageLogic.MessageListClass>() {
             @Override
             public void onSuccess(HdlMessageLogic.MessageListClass messageListClass) {
                 if (messageListClass != null) {
@@ -354,8 +355,6 @@
 
 
     }
-
-
 
 
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
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 054dc51..e0ce829 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
@@ -118,6 +118,7 @@
                             //绉诲姩鐢电珯浣嶇疆
                             HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId());
                             initData();//鍒濆鍖栫紦瀛樻暟鎹�
+                            setAllItemEdit(is_edit);
                             houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
                             nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌�
                         }
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index b120252..0cd579e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -98,7 +98,8 @@
     /**
      * 鐩戝惉鐩稿叧鍥炶皟
      */
-    private void registerCallBack() {DCUniMPSDK.getInstance();
+    private void registerCallBack() {
+        DCUniMPSDK.getInstance();
         //1.璁剧疆灏忕▼搴忚鍏抽棴浜嬩欢鐩戝惉
         DCUniMPSDK.getInstance().setUniMPOnCloseCallBack(new IUniMPOnCloseCallBack() {
             @Override
@@ -131,6 +132,8 @@
                 HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡    event=" + event);
                 //鏆傛椂閫氳繃杩欎釜澶勭悊灏忕▼搴忓悓鏃跺鏉＄浉鍚岀殑璇锋眰
                 if (data == null) {
+                    HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,data鏁版嵁涓簄ull銆�", true);
+
                     return;
                 }
 //                String key= MD5Utils.getMd5(event+data.toString());
@@ -151,6 +154,8 @@
                     //闄や簡缁熶竴澶勭悊锛屽墿浣欏叾瀹冪壒瀹氬満鏅殑浜嬩欢閫氱煡
                     if (onOtherUniMPEventCallBack != null) {
                         onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback);
+                    } else {
+                        HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,鍥炶皟浜嬩欢涓簄ull,鏃犳硶鍥炶皟浜嬩欢骞舵墽琛屼笟鍔￠�昏緫    event=" + event + "\r\n" + "data=" + data, true);
                     }
                 }
             }

--
Gitblit v1.8.0