Merge branch '1.4.4' into dev

wjc

1 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java

@@ -38,6 +38,7 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
@@ -714,7 +715,8 @@
                    //uni通知原生退出登录
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
                        HdlLogLogic.print("uni通知原生退出登录---", true);
                        HDLLinkPMUser.getInstance().logout(0);
//                        HDLLinkPMUser.getInstance().logout(0);
                        HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
                    }
                    break;
                    //本地密钥获取
@@ -775,10 +777,10 @@
                                            } else if (s.startsWith("[")) {
                                                uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
                                            } else {
                                                uniSuccessCallback(type, s, callback);
                                                uniSuccessCallback(type, new JsonArray(), callback);
                                            }
                                        } catch (Exception e) {
                                            uniSuccessCallback(type, s, callback);
                                            uniSuccessCallback(type, new JsonArray(), callback);
                                        }
                                    }
                                }
@@ -799,10 +801,10 @@
                                    } else if (json.startsWith("[")) {
                                        uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
                                    } else {
                                        uniSuccessCallback(type, json, callback);
                                        uniSuccessCallback(type, new JsonArray(), callback);
                                    }
                                } catch (Exception e) {
                                    uniSuccessCallback(type, json, callback);
                                    uniSuccessCallback(type, new JsonArray(), callback);
                                }
                                long endTime = System.currentTimeMillis() - startTime;
                                Log.d("====耗时时间====", String.valueOf(endTime));
@@ -822,6 +824,7 @@
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT: {
                        //退出无网模式标识
                        UserConfigManage.getInstance().setNoNetworkFlag(false);
                        UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(false);
                        UserConfigManage.getInstance().Save();
                        uniSuccessCallback(mode_type, true, callback);
                        if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
@@ -832,6 +835,12 @@
                        HDLApp.getInstance().startActivity(intent);
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE: {
                        //设备离网时有入口进入无网模式
                        uniSuccessCallback(mode_type, true, callback);
                        HdlAccountLogic.getInstance().logout(LogoutType.UniLogout);
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO: {
                        try {
                            //进入无网模式逆变器详情页，缓存mac和密码