app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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) { 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); //初始化 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); 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