From 989b4cf5a84e898e9682f8d9723a8ba1ff20c23b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 16:55:57 +0800
Subject: [PATCH] Merge branch 'hxb' into wjc

---
 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java |  224 +++++++++++++++++--------------------------------------
 1 files changed, 70 insertions(+), 154 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 0a2763a..1bc3474 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -1,173 +1,79 @@
 package com.hdl.photovoltaic.uni;
 
-import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+
+import org.json.JSONObject;
 
 import java.io.Serializable;
 
 /**
- * Created by jlchen on 12/15/21.
  * UniMP 鍘熺敓鍜屽皬绋嬪簭浜や簰鐩稿叧閰嶇疆鍙傛暟
  */
 public class HDLUniMP {
 
     /*********UniMP wgt id*********/
     public final static String UNI_APP_ID = "__UNI__A2E7300";//鍏変紡wgt鍖呭皬绋嬪簭id
-
     /*********UniMP Event 鍘熺敓鍜屽皬绋嬪簭浜や簰 鑷畾涔夐�氱煡浜嬩欢*********/
     public final static String UNI_EVENT_uniMPOnClose = "uni_MPOnClose";//鑷畾涔夊皬绋嬪簭鍏抽棴浜嬩欢
-    //get event 灏忕▼搴忓彂閫佸埌鍘熺敓 鍔犲墠缂�:uni_
     public final static String UNI_EVENT_GetAppParams = "uni_GetAppParams";//鑾峰彇APP搴旂敤淇℃伅
-    public final static String UNI_EVENT_GetFloorDataEvent = "uni_GetFloorDataEvent";//鑾峰彇妤煎眰鎴栬�呮埧灞嬩俊鎭�
-    public final static String UNI_EVENT_SaveFloorDataEvent = "uni_SaveFloorDataEvent";//鏂板缓鎴栬�呯紪杈戞ゼ灞傛垨鑰呮埧闂翠簨浠�
-    public final static String UNI_EVENT_GetRoomDetailsEvent = "uni_GetRoomDetailsEvent";//鑾峰彇鎴块棿璇︽儏锛氱粦瀹氱殑璁惧鍒楄〃
-    public final static String UNI_EVENT_SendLinkBindUid = "uni_SendLinkBindUid";//鍙戦�丩ink鎸囦护缁戝畾鎴块棿
-    public final static String UNI_EVENT_SendLinkDeleteUid = "uni_SendLinkDeleteUid";//鍙戦�丩ink鎸囦护瑙g粦瀹氭埧闂�
-    public final static String UNI_EVENT_SendChangeGWName = "uni_SendChangeGWName";//鍙戦�佺綉鍏冲娉ㄥ悕鏇存敼鎸囦护锛坙ink锛�
-    public final static String UNI_EVENT_SendDisableToONPRO = "uni_SendDisableToONPRO";//onpro绂佺敤鎸囦护锛坙ink锛�
-    public final static String UNI_EVENT_SendIARCCFirmware = "uni_SendIARCCFirmware";//鍙戦�両ARCC涓夋柟鍥轰欢鍒嗙被
-    public final static String UNI_EVENT_SendReadACFirmwareVersion = "uni_SendReadACFirmwareVersion";//鍙戦�佽鍙朓RACC妯″潡鍥轰欢鐗堟湰
-    public final static String UNI_EVENT_SendUpgradeACNotification = "uni_SendUpgradeACNotification";//鍗囩骇IRACC妯″潡閫氱煡
-    public final static String UNI_EVENT_SendUpgrade = "uni_SendUpgrade";//鍙戦�佸崌绾ф寚浠�
-    public final static String UNI_EVENT_SendFinish = "uni_SendFinish";//鍒嗗寘缁撴潫
-    public final static String UNI_EVENT_SendOpenIRACC = "uni_SendOpenIRACC";//鎵撳紑IRACC閫忎紶鏁�
-    public final static String UNI_EVENT_SendControlTestIRACC = "uni_SendControlTestIRACC";//IRACC鎺у埗娴嬭瘯
-    public final static String UNI_EVENT_SendLinkBindRoom = "uni_SendLinkBindRoom";//鍙戦�丩ink鎸囦护缁戝畾鎴块棿
-    public final static String UNI_EVENT_SendLinkRename = "uni_SendLinkRename";//鍙戦�丩ink鎸囦护淇敼澶囨敞
 
-    /**
-     * 鍦烘櫙
-     */
-    public final static String UNI_EVENT_CreateScene = "uni_CreateScene";//鍙戦�丩ink鎸囦护鍒涘缓鍦烘櫙
-    public final static String UNI_EVENT_EditScene = "uni_EditScene";//鍙戦�丩ink鎸囦护缂栬緫鍦烘櫙
-    public final static String UNI_EVENT_GetSceneSid = "uni_GetSceneSid";//鍙戦�丩ink鎸囦护鑾峰彇鍦烘櫙sid
-    public final static String UNI_EVENT_GetSceneDetail = "uni_GetSceneDetail";//鍙戦�丩ink鎸囦护鑾峰彇鍦烘櫙璇︽儏
-    public final static String UNI_EVENT_GetRoomBindSidList = "uni_GetRoomBindSidList";//鍙戦�丩ink鎸囦护鑾峰彇鎴垮眿鍏宠仈鍦烘櫙璁惧琛ㄦ牸
-    public final static String UNI_EVENT_GetFunctionSidList = "uni_GetFunctionSidList";//鍙戦�丩ink鎸囦护鑾峰彇鍥炶矾sid
-    public final static String UNI_EVENT_CONTROLSCENE = "uni_ControlScene";//鎵ц鍦烘櫙
-    public final static String UNI_EVENT_DeleteScene = "uni_DeleteScene";//鍙戦�丩ink鎸囦护鍒犻櫎鍦烘櫙
-    public final static String UNI_EVENT_GatewayVersion = "uni_GatewayVersion";//鑾峰彇缃戝叧鐗堟湰 鐢ㄤ簬鎺у埗寤舵椂鏀寔0.1s
+    //region --------銆愬皬绋嬪簭銆戝彂閫佸埌銆愬師鐢熴��(鍔犲墠缂�:uni_)--------
+    /*********浣忓畢銆愮數绔欍�戞ā鍧�*********/
+    public final static String UNI_EVENT_REPLY_HOME_MODEL = "uni_home_model";//浣忓畢妯″潡
+    public final static String UNI_EVENT_REPLY_HOME_LIST = "list";//鑾峰彇浣忓畢銆愮數绔欍�戝垪琛�
+    public final static String UNI_EVENT_REPLY_HOME_CREATION = "creation";//浣忓畢銆愮數绔欍�戝垱寤�
+    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_DEVICE_MODEL = "uni_device_model";//璁惧妯″潡
+    public final static String UNI_EVENT_REPLY_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛�
+    public final static String UNI_EVENT_REPLY_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛�
+    public final static String UNI_EVENT_REPLY_DEVICE_ADD = "add";//璁惧娣诲姞
+    public final static String UNI_EVENT_REPLY_DEVICE_DEL = "del";//璁惧鍒犻櫎
+    public final static String UNI_EVENT_REPLY_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃
+    public final static String UNI_EVENT_REPLY_DEVICE_MODBUS_SEND="modbus_send";//modbus鍗忚
 
-    /**
-     * 鑷姩鍖�
-     */
-    public final static String UNI_EVENT_GetLogicSid = "uni_GetLogicSid";//鍙戦�丩ink鎸囦护鑾峰彇鑷姩鍖杝id
-    public final static String UNI_EVENT_GetSceneList = "uni_GetSceneList";//鍙戦�丩ink鎸囦护鑾峰彇鍦烘櫙鍒楄〃
-    public final static String UNI_EVENT_GetLogicList = "uni_GetLogicList";//鍙戦�丩ink鎸囦护鑾峰彇鑷姩鍖栧垪琛�
-    public final static String UNI_EVENT_CreateLogic = "uni_CreateLogic";//鍙戦�丩ink鎸囦护鍒涘缓鑷姩鍖�  鍒涘缓缂栬緫鍚屼竴涓�
-    public final static String UNI_EVENT_GetLogicDetail = "uni_GetLogicDetail";//鍙戦�丩ink鎸囦护鑾峰彇鑷姩鍖栬鎯�
+    /*********Wifi妯″潡*********/ //鍗敠瀹氫箟
+    public final static String UNI_EVENT_REPLY_WIFI_MODEL = "uni_wifi_model";//wifi妯″潡
+    public final static String UNI_EVENT_REPLY_WIFI_LIST = "list";//鑾峰彇wifi鍒楄〃
+    public final static String UNI_EVENT_REPLY_WIFI_INFO = "info";//鑾峰彇褰撳墠wifi淇℃伅
+    public final static String UNI_EVENT_REPLY_WIFI_CONNECT = "connect";//杩炴帴wifi
+    //endregion
 
-    /**
-     * 缃戝叧椹卞姩鍗囩骇锛岃澶囧浐浠跺崌绾�
-     */
-    public final static String UNI_EVENT_GetOidList = "uni_GetOidList";//鍙戦�丩ink鎸囦护鑾峰彇浜戠涓奜id鍒楄〃
-    public final static String UNI_EVENT_GetGatewayDrivers = "uni_GetGatewayDrivers";//鍙戦�丩ink缃戝叧椹卞姩鍒楄〃鑾峰彇
-    public final static String UNI_EVENT_GetCloudGatewayDrivers = "uni_GetCloudGatewayDrivers";//鍙戦�丩ink鎸囦护浜戠鐨勯┍鍔ㄥ垎椤靛垪琛�
-    public final static String UNI_EVENT_UpgradeGatewayDriver = "uni_UpgradeGatewayDriver";//鍙戦�丩ink鎸囦护缃戝叧椹卞姩鍗囩骇OTA鍛戒护涓嬪彂
-    public final static String UNI_EVENT_GetDeviceFirmwares = "uni_GetDeviceFirmwares";//鍙戦�丩ink鎸囦护鑾峰彇璁惧鍥轰欢鍒楄〃鑾峰彇
-    public final static String UNI_EVENT_GetCloudDeviceFirmwares = "uni_GetCloudDeviceFirmwares";//鍙戦�丩ink鎸囦护浜戠鐨勮澶囧浐浠跺垎椤靛垪琛�
-    public final static String UNI_EVENT_UpgradeDeviceFirmware = "uni_UpgradeDeviceFirmware";//鍙戦�丩ink璁惧鍥轰欢鍗囩骇OTA鍛戒护涓嬪彂
-    /**
-     * 瀹夐槻
-     */
-    public final static String UNI_EVENT_GetSecuritySid = "uni_GetSecuritySid";//鍙戦�丩ink鎸囦护鑾峰彇瀹夐槻sid
-    public final static String UNI_EVENT_GetSecurityList = "uni_GetSecurityList";//鍙戦�丩ink鎸囦护鑾峰彇瀹夐槻鍒楄〃
-    public final static String UNI_EVENT_CreateSecurity = "uni_CreateSecurity";//鍙戦�丩ink鎸囦护鍒涘缓瀹夐槻  鍒涘缓缂栬緫鍚屼竴涓�
-    public final static String UNI_EVENT_GetSecurityDetail = "uni_GetSecurityDetail";//鍙戦�丩ink鎸囦护鑾峰彇瀹夐槻璇︽儏
-    public final static String UNI_EVENT_DeleteSecurity = "uni_DeleteSecurity";//鍙戦�丩ink鎸囦护鍒犻櫎瀹夐槻
+    //region --------銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆�--------
+    public final static String UNI_EVENT_NOTIFICATION_DEVICE_MODEL = "uni_notification_model";//閫氱煡妯″潡
+    public final static String UNI_EVENT_NOTIFICATION_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛�
+    public final static String UNI_EVENT_NOTIFICATION_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛�
+    public final static String UNI_EVENT_NOTIFICATION_DEVICE_ADD = "add";//璁惧娣诲姞
+    public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//璁惧鍒犻櫎
+    public final static String UNI_EVENT_NOTIFICATION_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃
+    //endregion
 
-    /**
-     * 妯℃澘
-     */
-    public final static String UNI_EVENT_UpdataTemplateData = "uni_UpdataTemplateData";//鏇存柊妯℃澘鍛戒护鏁版嵁
-
-    public final static String UNI_EVENT_GetLinkOidList = "uni_GetLinkOidList";//鑾峰彇LinkOid鍒楄〃
-    public final static String UNI_EVENT_GetRoomBindList = "uni_GetRoomBindList";//鑾峰彇RoomBind鍒楄〃
-    public final static String UNI_EVENT_GetDeviceLoopList = "uni_GetDeviceLoopList";//鑾峰彇DeviceLoop鍒楄〃
-    public final static String UNI_EVENT_GetLinkFunctionList = "uni_GetLinkFunctionList";//鑾峰彇LinkFunction鍒楄〃
-    public final static String UNI_EVENT_GetLinkSceneList = "uni_GetLinkSceneList";//鑾峰彇LinkScene鍒楄〃
-    public final static String UNI_EVENT_GetDeviceList = "uni_GetDeviceList";//鑾峰彇Device鍒楄〃
-    public final static String UNI_EVENT_GetRoomList = "uni_GetRoomList";//鍙戦�丩ink鎸囦护鑾峰彇鎴垮眿鍒楄〃
-
-
-    public final static String UNI_EVENT_GetZigBeeDeviceInfo = "uni_GetZigBeeDeviceInfo";//鑾峰彇ZigBee璁惧淇℃伅
-    public final static String UNI_EVENT_GetAllDataSize = "uni_GetAllDataSize";//鑾峰彇鏁版嵁闀垮害
-    public final static String UNI_EVENT_GetMillimeterDeviceInfo = "uni_GetMillimeterDeviceInfo";//鑾峰彇姣背娉㈣澶囦俊鎭�
-    public final static String UNI_EVENT_SetMillimeterConfiguration = "uni_SetMillimeterConfiguration";//閰嶇疆姣背娉㈡暟鎹�
-    public final static String UNI_EVENT_GetMillimeterConfiguration = "uni_GetMillimeterConfiguration";//鑾峰彇姣背娉㈤厤缃暟鎹�
-    public final static String UNI_EVENT_MillimeterPositioning = "uni_MillimeterPositioning";//姣背娉㈠畾浣�
-    public final static String UNI_EVENT_EditMillimeter = "uni_EditMillimeter";//缂栬緫姣背娉�
-    public final static String UNI_EVENT_DeleteMillimeterDevice = "uni_DeleteMillimeterDevice";//鍒犻櫎姣背娉㈣澶�
-    public final static String UNI_EVENT_GetFunctionInfo = "uni_GetFunctionInfo";//鑾峰彇link璁惧璇︽儏
-    public final static String UNI_EVENT_GetLinkRoom = "uni_GetLinkRoom";//鑾峰彇link鎴块棿鍒楄〃
-    public final static String UNI_EVENT_LinkPropertyToCloudControl = "uni_LinkPropertyToCloudControl";//link鎺у埗
-    public final static String UNI_EVENT_LinkPropertyToGatewayControl = "uni_LinkPropertyToGatewayControl";//link鎺у埗
-    public final static String UNI_EVENT_LinkDeviceNameEdit = "uni_LinkDeviceNameEdit";//鑾峰彇link鎺у埗
-    public final static String UNI_EVENT_ChangeDeviceImgVersion = "uni_ChangeDeviceImgVersion";//鏇存敼璁惧鐨勫浐浠剁増鏈�
+    //region --------銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆戦〉闈㈣矾寰�(UNI_EVENT_OPEN_HOME_CREATION+?key=value&key=鍙傛暟涓�)--------
+    /*********浣忓畢妯″潡*********/
+    public final static String UNI_EVENT_OPEN_HOME_CREATION = "pages/powerStation/powerStationCreate";//浣忓畢銆愮數绔欍�戝垱寤�
+    public final static String UNI_EVENT_OPEN_HOME_EDIT = "pages/powerStation/powerStationEdit";//浣忓畢銆愮數绔欍�戠紪杈�
+    public final static String UNI_EVENT_OPEN_HOME_DETAILS = "pages/powerStationDetail/index";//浣忓畢銆愮數绔欍�戣鎯�
+    public final static String UNI_EVENT_OPEN_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+    /*********璁惧妯″潡*********/
+    //璁惧妯″潡鎵撳紑椤甸潰鍏ㄨ矾寰�
+    //endregion
 
 
     /**
-     * 绾㈠瀹�
+     * 灏忕▼搴忎笌鍘熺敓閫氳鏁版嵁鏍煎紡
+     * 鑷畾涔夋暟鎹牸寮�
      */
-    public final static String UNI_EVENT_GetIrTypeList = "uni_GetIrTypeList";//鑾峰彇绾㈠璁惧绫诲瀷
-    public final static String UNI_EVENT_GetIrBrandList = "uni_GetIrBrandList";//鑾峰彇绾㈠璁惧瀵瑰簲鍝佺墝
-    public final static String UNI_EVENT_GetIrCodeList = "uni_GetIrCodeList";//鑾峰彇绾㈠璁惧瀵瑰簲鍝佺墝鐨勫叿浣撶爜搴�
-    public final static String UNI_EVENT_IrLocation = "uni_IrLocation";//绾㈠瀹濆畾浣�
-    public final static String UNI_EVENT_IrControlDelete = "uni_IrControlDelete";//绾㈠瀹濋仴鎺у櫒鍒犻櫎
-    public final static String UNI_EVENT_GetIrInfo = "uni_GetIrInfo";//鑾峰彇绾㈠璁惧link灞傛暟鎹�
-    public final static String UNI_EVENT_IrCodeTest = "uni_IrCodeTest";//绾㈠瀹濊瘯鐮�
-    public final static String UNI_EVENT_IrDeviceAdd = "uni_IrDeviceAdd";//绾㈠瀹濋仴鎺у櫒娣诲姞
-    public final static String UNI_EVENT_IrDeviceAddGetSid = "uni_IrDeviceAddGetSid";//绾㈠瀹濋仴鎺у櫒sid
-    public final static String UNI_EVENT_IrCodeStudy = "uni_IrCodeStudy";//绾㈠瀹濊嚜瀛︾爜
-    public final static String UNI_EVENT_IrCodeRemove = "uni_IrCodeRemove";//绾㈠瀹濊嚜瀛︾爜鍒犻櫎
-    public final static String UNI_EVENT_LinkDeviceControl = "uni_LinkDeviceControl";//link璁惧鎺у埗
-    public final static String UNI_EVENT_LinkOtaDeviceUpgradeDown = "uni_LinkOtaDeviceUpgradeDown";//link妯℃嫙浜戠ota
-
-
-    public final static String UNI_EVENT_IrDeviceListGet = "uni_IrDeviceListGet";//绾㈠瀹濋仴鎺у櫒鍒楄〃鑾峰彇
-
-    public final static String UNI_EVENT_GetGateWayDeviceInfo = "uni_GetGateWayDeviceInfo";//鑾峰彇缃戝叧璁惧淇℃伅
-    public final static String UNI_EVENT_SendZigBeePassthrough = "uni_SendZigBeePassthrough";//鍙戦�乑igBee閫忎紶鎸囦护
-    /**
-     * Zigbee閫忎紶鏁版嵁鍏ㄥ眬鍥炲
-     */
-    public final static String UNI_EVENT_ZigBeePassthrough = "uni_ZigBeePassthrough";
-    /**
-     * Zigbee鐘舵�佹暟鎹�忎紶
-     */
-    public final static String EVENT_DeviceStatusReportPassthrough = "DeviceStatusReportPassthrough";
-
-    //send event 鍘熺敓鍙戦�佸埌灏忕▼搴� 鍔犲墠缂�:app_
-//    public final static String UNI_APP_EVENT_UIDataEvent = "app_GetFloorDataEvent";//鍘熺敓閫氱煡灏忕▼搴� 鑾峰彇妤煎眰鎴栬�呮埧灞嬩俊鎭�
-
-    /*********UniMP PATH 鍚勪釜灏忕▼搴忛〉闈㈣矾寰�*********/
-    //鍚姩鐩磋揪椤甸潰鏍囪瘑鍙傛暟 锛堝簾寮冿級
-    public final static String UNI_ACTION = "?action=redirect";
-    //UniMP灏忕▼搴� 鎬昏矾鐢遍〉闈� 鍚庨潰閫氳繃pathKey鍐嶅垎鍙戣矾鐢辫烦杞�佸皬绋嬪簭甯垜浠嫾鎺�?action=redirect
-    public final static String UNI_PATH_MAIN = "pages/index/index?pathKey=";
-    //娣诲姞妤煎眰鎴栬�呮埧闂�
-    public final static String UNI_PATH_AddFloor = UNI_PATH_MAIN + "room";
-    //鏌ョ湅鎴块棿璇︽儏
-    public final static String UNI_PATH_RoomDetails = UNI_PATH_MAIN + "roomDetails";
-    //鏌ョ湅缃戝叧淇℃伅
-    public final static String UNI_PATH_GATEWAY = UNI_PATH_MAIN + "gateway";
-    //鏌ョ湅姣背娉俊鎭�
-    public final static String UNI_PATH_MILLIMETER = UNI_PATH_MAIN + "Millimeter";
-    //鏌ョ湅璁惧閫氱敤淇℃伅
-    public final static String UNI_PATH_DEVICE = UNI_PATH_MAIN + "device_info";
-
-    //Link鏁版嵁鍏ㄥ眬鍥炲
-    public final static String UNI_EVENT_LinkPassthrough = "LinkPassthrough";
-    //鍏抽棴杩涘害鏉$洃鍚簨浠�
-    public final static String UNI_EVENT_Progress = "uni_CloseProgress";
-    //鏌ョ湅鍚搁《寮忎紶鎰熷櫒璁惧淇℃伅
-    public final static String UNI_PATH_CEILINGLIGHTSENSOR = UNI_PATH_MAIN + "ceilingLightSensor";
-
-
     public static class UniCallBackBaseBean implements Serializable {
-        private String code = "-1";
-        private String mes;
-        private Object data;
-        private String topic;
+
+
+        private String path;//鎵撳紑灏忕▼搴忚矾寰�(鏆傛椂鐢ㄤ笉涓�)
+        private String code;//鐘舵�佺爜
+        private String mes;//淇℃伅鎻忚堪
+        private String type;//鍔熻兘绫诲瀷
+        private Object data;//闄勫姞json鏁版嵁
 
         public UniCallBackBaseBean(String code, String mes) {
             this.code = code;
@@ -179,21 +85,20 @@
             this.mes = "鎴愬姛";
         }
 
-        @NonNull
+
         public String getCode() {
             return code == null ? "" : code;
         }
 
-        public void setCode(@NonNull String code) {
+        public void setCode(String code) {
             this.code = code;
         }
 
-        @NonNull
         public String getMes() {
             return mes == null ? "" : mes;
         }
 
-        public void setMes(@NonNull String mes) {
+        public void setMes(String mes) {
             this.mes = mes;
         }
 
@@ -205,12 +110,23 @@
             this.data = data;
         }
 
-        public String getTopic() {
-            return topic;
+
+        public String getType() {
+            return type == null ? "" : type;
         }
 
-        public void setTopic(String topic) {
-            this.topic = topic;
+        public void setType(String type) {
+            this.type = type;
         }
+
+        public String getPath() {
+            return path == null ? "" : path;
+        }
+
+        public void setPath(String path) {
+            this.path = path;
+        }
+
+
     }
 }

--
Gitblit v1.8.0