From 2225b1f0727fb74e10ac5692e68e4cd48f4f62d7 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 03 三月 2025 15:02:14 +0800 Subject: [PATCH] 2025年03月03日15:02:11 --- app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 d8587be..c1009cd 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java @@ -724,19 +724,21 @@ break; //鏈湴json璧勬簮鏂囦欢鑾峰彇 case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_LOCAL_JSON: { - String url = getKeyValue("url", getKeyValue("data", data)); - String deviceModel = getKeyValue("deviceModel", getKeyValue("data", data)); +// String url = getKeyValue("url", getKeyValue("data", data)); + String fileName = getKeyValue("fileName", getKeyValue("data", data));//鍞竴鏍囪瘑 + String deviceType = getKeyValue("deviceType", getKeyValue("data", data));//璁惧绫诲瀷 + String deviceModel = getKeyValue("deviceModel", getKeyValue("data", data));//璁惧妯″瀷 String language = getKeyValue("language", getKeyValue("data", data)); - String json = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel); + String json = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(fileName + ".json", deviceModel); if (TextUtils.isEmpty(json)) { //鏈湴娌℃湁缂撳瓨 - HdlESLocalJsonLogic.getInstance().getHdlESLocalJson(url, deviceModel, new CloudCallBeak<String>() { + HdlESLocalJsonLogic.getInstance().getHdlESLocalJson(fileName, deviceType, deviceModel, new CloudCallBeak<String>() { @Override public void onSuccess(String obj) { // if (callback != null) { // uniSuccessCallback(type, obj, callback); // } - String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel); + String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(fileName, deviceModel); //鏈湴缂撳瓨鏁版嵁 if (callback != null) { try { -- Gitblit v1.8.0