From 6e7ec3f7ffcab2fbfdf32778970cd72a6845e987 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 26 四月 2024 10:12:11 +0800
Subject: [PATCH] 2024年04月26日10:12:04

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   91 ++++++++++++++++++++++++---------------------
 1 files changed, 48 insertions(+), 43 deletions(-)

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 bbef2cc..f94c1b4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -371,49 +371,6 @@
                     break;
 
                 }
-            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
-                //鍏跺畠妯″潡
-                switch (type) {
-                    //鑾峰彇娓╁害鍗曚綅
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
-                        uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
-                    }
-                    break;
-                    //鑾峰彇褰撳墠app璇█
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
-                        uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
-                    }
-                    break;
-                    //鑾峰彇浣嶇疆淇℃伅
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
-                        this.uniGetLocationInfo(mode_type, data, callback);
-                    }
-                    break;
-                    //搴旂敤鍐茬獊
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
-                        if (callback != null) {
-                            uniCallbackData(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
-                        }
-                    }
-                    break;
-                    //涓撻棬鏀堕泦uni鏃ュ織
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
-                        String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
-                        HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
-
-                    }
-                    break;
-                    //uni涓婚〉鐐瑰嚮杩斿洖閫氱煡
-                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
-                        //EventBus浜嬩欢鍒嗗彂
-                        BaseEventBus baseEventBus = new BaseEventBus();
-                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL);
-                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
-                        EventBus.getDefault().post(baseEventBus);
-
-                    }
-                    break;
-                }
             } else if (HDLUniMP.UNI_EVENT_REPLY_MINE_MODEL.equals(topic)) {
                 //鎴戠殑妯″潡
                 switch (type) {
@@ -460,6 +417,54 @@
 
 
                 }
+            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
+                //鍏跺畠妯″潡
+                switch (type) {
+                    //鑾峰彇娓╁害鍗曚綅
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
+                        uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
+                    }
+                    break;
+                    //鑾峰彇褰撳墠app璇█
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
+                        uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
+                    }
+                    break;
+                    //鑾峰彇浣嶇疆淇℃伅
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
+                        this.uniGetLocationInfo(mode_type, data, callback);
+                    }
+                    break;
+                    //搴旂敤鍐茬獊
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
+                        if (callback != null) {
+                            uniCallbackData(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
+                        }
+                    }
+                    break;
+                    //涓撻棬鏀堕泦uni鏃ュ織
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
+                        String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
+                        HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
+
+                    }
+                    break;
+                    //uni涓婚〉鐐瑰嚮杩斿洖閫氱煡
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
+                        //EventBus浜嬩欢鍒嗗彂
+                        BaseEventBus baseEventBus = new BaseEventBus();
+                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL);
+                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
+                        EventBus.getDefault().post(baseEventBus);
+
+                    }
+                    break;
+                    //uni閫氱煡鍘熺敓閫�鍑虹櫥褰�
+                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
+                        HDLLinkPMUser.getInstance().logout(0);
+                    }
+                    break;
+                }
             }
 
         } catch (Exception e) {

--
Gitblit v1.8.0