Merge branch '1.4.4' into dev

wjc

12 小时以前 0287b5d20f7d57f5352248175733b99d5a99959b

 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java

@@ -16,6 +16,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
@@ -178,7 +179,7 @@
                            //有可能是系统回收掉activity导致回调为null，这样情况下强制返回登录界面；
                            //todo 长时间没响应将退出登录界面重新登录
//                            HDLLinkPMUser.getInstance().logout(0);
                            HdlAccountLogic.getInstance().logout();
                            HdlAccountLogic.getInstance().logout(LogoutType.AbnormalLogout);
                        }
                    }
                }
@@ -334,7 +335,7 @@
            @Override
            public void onInitFinished(boolean b) {

                HdlLogLogic.print("UniMPSDK 初始化完成----" + b,true);
                HdlLogLogic.print("UniMPSDK 初始化完成----" + b, true);
            }
        });

@@ -386,9 +387,9 @@
        if (mUniMPCaches.containsKey(uniAppId)) {
            if (mUniMPCaches.get(uniAppId) != null) {
                mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, data);
//                HdlLogLogic.print("Android---通知---uni---主题:" + topic + "---发送数据:" + new Gson().toJson(data));
//                HdlLogLogic.print("android---通知---uni---主题:" + topic + "---发送数据:" + new Gson().toJson(data));
            } else {
//                HdlLogLogic.print("Android---通知---uni---失败---小程序对象为空:" + uniAppId);
//                HdlLogLogic.print("android---通知---uni---失败---小程序对象为空:" + uniAppId);
            }
        } else {
//            HdlLogLogic.print("Android---通知---uni---失败---¬小程序对象为空:" + uniAppId);