From d8a4151b56f04796dff5bc4164246732036c05f9 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 十一月 2024 18:14:27 +0800
Subject: [PATCH] 增加uni请求功能http接口
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 50 +++++++++++--------------
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 7 ++-
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 26 +++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 2
4 files changed, 54 insertions(+), 31 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 930ffff..67b7d2e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -37,6 +37,7 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.internet.api.TopicApi;
@@ -48,6 +49,7 @@
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.Geolocation;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
@@ -736,6 +738,30 @@
}
break;
}
+ } else if (HDLUniMP.UNI_EVENT_REPLY_COMMON_MODEL.equals(topic)) {
+ //缃戠粶璇锋眰妯″潡
+ if (type.equals(HDLUniMP.UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD)) {
+ String url = getKeyValue("url", getKeyValue("data", data));
+ JsonObject jObject = new JsonObject();
+ String body = getKeyValue("body", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(body)) {
+ try {
+ jObject = new Gson().fromJson(body, JsonObject.class);
+ } catch (Exception ignored) {
+ }
+ }
+ HttpClient.getInstance().requestHttp(url, jObject.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ uniSuccessCallback(mode_type, jsonStr, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(mode_type, e, callback);
+ }
+ });
+ }
}
} catch (Exception e) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index a1139e7..f51699b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -16,6 +16,7 @@
import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -103,7 +104,6 @@
public void onBindView(Bundle savedInstanceState) {
// setNotificationBarBackgroundColor(CustomColor.blue);
setStatusBarTranslucent();
-
//鍒濆鍖栫鐗�
initFragment(savedInstanceState);
//鍒濆鍖�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 15030b7..8f0ea99 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -39,39 +39,33 @@
AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
//鍒ゆ柇AccessToken鏄惁null
if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
-// showLoading();
- HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
- @Override
- public void onSuccess(List<HouseIdBean> obj) {
-// hideLoading();
- HdlResidenceLogic.getInstance().setHouseIdList(obj);
-
- Intent intent = new Intent();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ openActivity(intent);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ showLoading();
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ @Override
+ public void onSuccess(List<HouseIdBean> obj) {
+ hideLoading();
+ HdlResidenceLogic.getInstance().setHouseIdList(obj);
+ Intent intent = new Intent();
intent.setClass(StartActivity.this, CPowerStationActivity.class);
-
+ openActivity(intent);
}
- openActivity(intent);
- }
- @Override
- public void onFailure(HDLException e) {
-// hideLoading();
- Intent intent = new Intent();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
+ @Override
+ public void onFailure(HDLException e) {
+ hideLoading();
+ Intent intent = new Intent();
intent.setClass(StartActivity.this, CPowerStationActivity.class);
+ openActivity(intent);
}
- openActivity(intent);
- }
- });
+ });
+ }
} else {
Intent intent = new Intent();
intent.setClass(this, LoginActivity.class);
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 687e023..17a041b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -95,8 +95,7 @@
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_LOCAL_JSON = " get_local_json";//鏈湴json璧勬簮鏂囦欢鑾峰彇
/*********銆愭垜鐨勩�戞ā鍧�*********/
@@ -134,6 +133,10 @@
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_COMMON_MODEL = "uni_common_model ";//缃戠粶璇锋眰(澶х被)
+ public final static String UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD = "uni_send_to_cloud";
+
//endregion
--
Gitblit v1.8.0