From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index dbbb72d..21f5acc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -33,6 +33,7 @@
public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯�
public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
public final static String UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE = "delivery_url_qrcode";//鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+ public final static String UNI_EVENT_REPLY_HOME_DELIVERYURL = "delivery_url";//鐢电珯鐨勪氦浠楿Rl(瀹夎鍟�)
public final static String UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT = "deliver_to_account";//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
public final static String UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM = "update_debug_perm";//鐢电珯鎺堟潈瀹夎鍟�(C绔�)
public final static String UNI_EVENT_REPLY_HOME_ADD = "scan_add_home";//鎵爜娣诲姞鐢电珯(C绔�)
@@ -60,9 +61,9 @@
public final static String UNI_EVENT_REPLY_DEVICE_REMOTEINFO = "set_device_remoteInfo";//璁剧疆璁惧杩滅▼淇℃伅edit_name
public final static String UNI_EVENT_REPLY_DEVICE_EDIT_NAME = "edit_name";//璁惧鍚嶇О淇敼(淇敼鏄簯绔痮id鍚嶇О锛岃澶囦娇鐢╩odbus鍗忚淇敼)
public final static String UNI_EVENT_REPLY_DEVICE_NOT_RUN_DEVICE_LIST = "not_run_device_list";//鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
- public final static String UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_LIST= "open_device_list";//蹇嵎寮�鍚�嗗彉鍣�
- public final static String UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_info= "device_info";//鑾峰彇璁惧璇︽儏
-
+ public final static String UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_LIST = "open_device_list";//蹇嵎寮�鍚�嗗彉鍣�
+ public final static String UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_info = "device_info";//鑾峰彇璁惧锛堜簯绔級璇︽儏
+ public final static String UNI_EVENT_REPLY_DEVICE_OPEN_gateway_info = "gateway_info";//鑾峰彇閫嗗彉鍣紙鐗╃悊锛夎鎯�
/*********OTA妯″潡*********/
@@ -92,6 +93,11 @@
public final static String UNI_EVENT_REPLY_OTHER_BACK = "back";//棣栭〉杩斿洖
public final static String UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT = "application_conflict";//搴旂敤鍐茬獊
public final static String UNI_EVENT_REPLY_OTHER_LOGOUT = "uni_logout";//閫�鍑虹櫥褰�
+ public final static String UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_GET = "get_local_encrypt";//鏈湴瀵嗛挜鑾峰彇
+ public final static String UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_SET = "set_local_encrypt";//鏈湴瀵嗛挜璁剧疆
+ public final static String UNI_EVENT_REPLY_OTHER_PASSWORD_VERIFIY = "password_verifiy";//link杩涜瀵嗙爜楠岃瘉
+ public final static String UNI_EVENT_REPLY_OTHER_GET_LOCAL_JSON = "get_local_json";//鏈湴json璧勬簮鏂囦欢鑾峰彇
+ public final static String UNI_EVENT_REPLY_OTHER_GET_SELECTED_IMAGE = "selected_image";//uni鍥剧墖鏂囦欢鑾峰彇
/*********銆愭垜鐨勩�戞ā鍧�*********/
@@ -129,6 +135,9 @@
public final static String UNI_EVENT_REPLY_DEVICE_ETHERNET_SET = "device_ethernet_set";//閫嗗彉鍣ㄤ互澶綉閰嶇疆
public final static String UNI_EVENT_REPLY_DEVICE_ETHERNET_GET = "device_ethernet_get";//閫嗗彉鍣ㄤ互澶綉鑾峰彇
+ /*********缃戠粶璇锋眰妯″潡*********/
+ public final static String UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD = "uni_send_to_cloud";//uni缃戠粶璇锋眰
+
//endregion
@@ -161,6 +170,8 @@
public final static String UNI_EVENT_OPEN_HOME_Null_C = "pages/powerStationDetail/tabbarPage";//鏃犵數绔欐椂锛堜笉闇�瑕佷紶鍙傛暟锛�
public final static String UNI_EVENT_OPEN_DEVICE_DETAILS = "pages/powerStationDetail/childPage/device/detail";//璁惧璇︽儏
public final static String UNI_EVENT_OPEN_MINE_MINESTAFFMANAGER = "pages/mine/mineStaffManager";//B绔墦寮�鍛樺伐绠＄悊鐣岄潰
+ public final static String UNI_EVENT_OPEN_MINE_DEVICEDEBUG = "pages/deviceDebug/searchInverterList";//B绔墦寮�璁惧璋冭瘯鐣岄潰
+
public final static String UNI_EVENT_OPEN_DEVICESCAN = "pages/powerStation/deviceScan";//璺冲埌uni鎵簩缁寸爜鐣岄潰
/*********璁惧妯″潡*********/
--
Gitblit v1.8.0