From 27d7958c1979a75cac2f820a75e6e6ac33652d63 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期五, 16 六月 2023 18:21:17 +0800 Subject: [PATCH] 2023年06月16日18:21:15 --- app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 68 +++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 25 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 2d35ae6..f9a6b51 100644 --- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java +++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java @@ -1,6 +1,5 @@ package com.hdl.photovoltaic.uni; -import androidx.annotation.NonNull; import com.google.gson.Gson; @@ -20,28 +19,35 @@ public final static String UNI_EVENT_uniMPOnClose = "uni_MPOnClose";//鑷畾涔夊皬绋嬪簭鍏抽棴浜嬩欢 public final static String UNI_EVENT_GetAppParams = "uni_GetAppParams";//鑾峰彇APP搴旂敤淇℃伅 - //銆愬皬绋嬪簭銆戝彂閫佸埌銆愬師鐢熴�� 鍔犲墠缂�:uni_ - /*********浣忓畢銆愮數绔欍�戞ā鍧�*********/ - public final static String UNI_EVENT_HOME_LIST = "list";//鑾峰彇浣忓畢銆愮數绔欍�戝垪琛� - public final static String UNI_EVENT_HOME_CREATION = "creation";//浣忓畢銆愮數绔欍�戝垱寤� - public final static String UNI_EVENT_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈� - public final static String UNI_EVENT_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯� - public final static String UNI_EVENT_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄� - /*********璁惧妯″潡*********/ - public final static String UNI_EVENT_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛� - public final static String UNI_EVENT_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛� - public final static String UNI_EVENT_DEVICE_ADD = "add";//璁惧娣诲姞 - public final static String UNI_EVENT_DEVICE_DEL = "del";//璁惧鍒犻櫎 - public final static String UNI_EVENT_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃 - //銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆� 鍔犲墠缂�:app_ - - //銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆戦〉闈㈣矾寰�:open_ +// //銆愬皬绋嬪簭銆戝彂閫佸埌銆愬師鐢熴�� 鍔犲墠缂�:uni_ +//public final static String UNI_EVENT_HOME_MODEL = "uni_home_model";//浣忓畢妯″潡 +// public final static String UNI_EVENT__DEVICE_MODEL = "uni_device_model";//璁惧妯″潡 +// /*********浣忓畢銆愮數绔欍�戞ā鍧�*********/ +// public final static String UNI_EVENT_HOME_LIST = "list";//鑾峰彇浣忓畢銆愮數绔欍�戝垪琛� // public final static String UNI_EVENT_HOME_CREATION = "creation";//浣忓畢銆愮數绔欍�戝垱寤� // public final static String UNI_EVENT_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈� // public final static String UNI_EVENT_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯� // public final static String UNI_EVENT_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄� +// /*********璁惧妯″潡*********/ +// public final static String UNI_EVENT_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛� +// public final static String UNI_EVENT_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛� +// public final static String UNI_EVENT_DEVICE_ADD = "add";//璁惧娣诲姞 +// public final static String UNI_EVENT_DEVICE_DEL = "del";//璁惧鍒犻櫎 +// public final static String UNI_EVENT_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃 + + + //銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆� 鍔犲墠缂�:app_ + + //銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆戦〉闈㈣矾寰�(UNI_EVENT_HOME_CREATION+?key=value&key=鍙傛暟涓�) + /*********浣忓畢妯″潡*********/ + public final static String UNI_EVENT_HOME_CREATION = "pages/powerStation/powerStationCreate";//浣忓畢銆愮數绔欍�戝垱寤� + public final static String UNI_EVENT_HOME_EDIT = "pages/powerStation/powerStationEdit";//浣忓畢銆愮數绔欍�戠紪杈� + public final static String UNI_EVENT_HOME_DETAILS = "pages/powerStationDetail/index";//浣忓畢銆愮數绔欍�戣鎯� +// public final static String UNI_EVENT_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄� + /*********璁惧妯″潡*********/ + //璁惧妯″潡鎵撳紑椤甸潰鍏ㄨ矾寰� /** @@ -51,6 +57,7 @@ public static class UniCallBackBaseBean implements Serializable { + private String path;//鎵撳紑灏忕▼搴忚矾寰�(鏆傛椂鐢ㄤ笉涓�) private String code;//鐘舵�佺爜 private String mes;//淇℃伅鎻忚堪 private String topic;//鏆傛椂鐢ㄤ笉涓� @@ -109,15 +116,26 @@ this.type = type; } - public JSONObject getJSONObject(Object obj) { - Gson gson = new Gson(); - String json = gson.toJson(obj); - com.alibaba.fastjson.JSONObject d=new com.alibaba.fastjson.JSONObject(); - JSONObject jsonObject = gson.fromJson(json, JSONObject.class); - if (jsonObject == null) { - jsonObject = new JSONObject(); + public String getPath() { + return path == null ? "" : path; + } + + public void setPath(String path) { + this.path = path; + } + + /** + * 褰撳墠瀵硅薄杞� JSONObject + * + * @return JSONObject + */ + public JSONObject getJSONObject() { + try { + String json = new Gson().toJson(this); + return new JSONObject(json); + } catch (Exception e) { + return new JSONObject(); } - return jsonObject; } -- Gitblit v1.8.0