Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -137,7 +137,6 @@
                //暂时通过这个处理小程序同时多条相同的请求
                if (data == null) {
                    HdlLogLogic.print("收到小程序通知,data数据为null。", true);

                    return;
                }
//                String key= MD5Utils.getMd5(event+data.toString());
@@ -162,6 +161,7 @@
                        HdlLogLogic.print("收到小程序通知,回调事件为null,无法回调事件并执行业务逻辑--->event=" + event + "\r\n" + "data=" + data, true);
                        //有可能是系统回收掉activity导致回调为null，这样情况下强制返回登录界面；
                        //todo 长时间没响应将退出登录界面重新登录
                        HdlLogLogic.print("回调事件为null退出登录--->", true);
                        HDLLinkPMUser.getInstance().logout(0);
                    }
                }
@@ -277,12 +277,11 @@
                UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
                uniMPOpenConfiguration.path = path;
                uniMPOpenConfiguration.extraData = jsonObject;
//                if(UserConfigManage.getInstance().isBAccount()){
                uniMPOpenConfiguration.splashClass = BSplashView.class;
//                }
//                else {
//                    uniMPOpenConfiguration.splashClass = CSplashView.class;
//                }
                if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 0) {
                    uniMPOpenConfiguration.splashClass = CSplashView.class;
                } else {
                    uniMPOpenConfiguration.splashClass = BSplashView.class;
                }
                uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
            }
//            //android14有些设备有问题，需要等待
@@ -369,12 +368,12 @@
        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);
//            HdlLogLogic.print("Android---通知---uni--->失败---¬小程序对象为空:" + uniAppId);
        }

    }