From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 24b28b7..6abe6c5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -31,9 +31,10 @@
public final static String UNI_EVENT_REPLY_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈�
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_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_DELIVERYURLQRCODE = "delivery_url_qrcode";//鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+ 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绔�)
public final static String UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE = "close_home_details_page";//鍏抽棴璇︽儏椤�
/*********璁惧妯″潡*********/
@@ -104,6 +105,7 @@
public final static String UNI_EVENT_REPLY_MEMBER_EDIT = "member_edit";//鎴愬憳缂栬緫锛堝寘鍚娉ㄣ�佹潈闄愪慨鏀癸級
public final static String UNI_EVENT_REPLY_STAFF_LIST = "staff_list";//鍛樺伐鍒楄〃
public final static String UNI_EVENT_REPLY_STAFF_ADD = "staff_add";//鍛樺伐娣诲姞
+ public final static String UNI_EVENT_REPLY_STAFF_DETAIL = "staff_detail";//鍛樺伐璇︽儏鑾峰彇
public final static String UNI_EVENT_REPLY_STAFF_DELETE = "staff_delete";//鍛樺伐鍒犻櫎
public final static String UNI_EVENT_REPLY_STAFF_EDIT = "staff_edit";//鍛樺伐缂栬緫
public final static String UNI_EVENT_REPLY_USERRIGHTTYPe = "user_right_type";//鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
@@ -149,7 +151,9 @@
public final static String UNI_EVENT_OPEN_HOME_DETAILS_C = "pages/powerStationDetail/tabbarPage";//C绔墦寮�銆愮數绔欍�戣鎯�
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_MINESTAFFMANAGER = "pages/mine/mineStaffManager";//B绔墦寮�鍛樺伐绠＄悊鐣岄潰
+
+ public final static String UNI_EVENT_OPEN_DEVICESCAN = "pages/powerStation/deviceScan";//璺冲埌uni鎵簩缁寸爜鐣岄潰
/*********璁惧妯″潡*********/
//璁惧妯″潡鎵撳紑椤甸潰鍏ㄨ矾寰�
//endregion
--
Gitblit v1.8.0