Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -1,9 +1,13 @@
package com.hdl.photovoltaic.uni;

import android.app.ActivityManager;
import android.app.Application;
import android.content.Context;
import android.os.Build;
import android.os.Environment;
import android.os.Process;
import android.text.TextUtils;
import android.util.Log;


import com.google.gson.Gson;
@@ -23,8 +27,10 @@

import java.io.File;
import java.util.HashMap;
import java.util.List;

import io.dcloud.common.DHInterface.ICallBack;
import io.dcloud.common.util.RuningAcitvityUtil;
import io.dcloud.feature.sdk.DCSDKInitConfig;
import io.dcloud.feature.sdk.DCUniMPSDK;
import io.dcloud.feature.sdk.Interface.IDCUniMPPreInitCallback;
@@ -37,6 +43,10 @@

public class HDLUniMPSDKManager {
    private static final String TAG = "HDLUniMPSDKManager";
    /**
     * 标记登录界面是否已经存在
     */
    public static boolean isExistsActivity = false;
    /**
     * context
     */
@@ -134,10 +144,11 @@
            public void onUniMPEventReceive(String appid, String event, Object data, DCUniMPJSCallback callback) {
//                handelUniMPEventReceive(appid, event, data, callback);
                HdlLogLogic.print("收到小程序通知    event=" + event);
//                String processMessage = Process.myPid() + " ";
//                HdlLogLogic.print("进程信息：" + processMessage);
                //暂时通过这个处理小程序同时多条相同的请求
                if (data == null) {
                    HdlLogLogic.print("收到小程序通知,data数据为null。", true);

                    return;
                }
//                String key= MD5Utils.getMd5(event+data.toString());
@@ -159,10 +170,13 @@
                    if (onOtherUniMPEventCallBack != null) {
                        onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback);
                    } else {
                        HdlLogLogic.print("收到小程序通知,回调事件为null,无法回调事件并执行业务逻辑--->event=" + event + "\r\n" + "data=" + data, true);
                        //有可能是系统回收掉activity导致回调为null，这样情况下强制返回登录界面；
                        //todo 长时间没响应将退出登录界面重新登录
                        HDLLinkPMUser.getInstance().logout(0);
                        if (!HDLUniMPSDKManager.isExistsActivity) {
                            HDLUniMPSDKManager.isExistsActivity = true;
                            HdlLogLogic.print("收到小程序通知,回调事件为null,无法回调事件并执行业务逻辑---event=" + event + "\r\n" + "data=" + data, true);
                            //有可能是系统回收掉activity导致回调为null，这样情况下强制返回登录界面；
                            //todo 长时间没响应将退出登录界面重新登录
                            HDLLinkPMUser.getInstance().logout(0);
                        }
                    }
                }
            }
@@ -277,12 +291,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有些设备有问题，需要等待
@@ -374,7 +387,7 @@
//                HdlLogLogic.print("Android---通知---uni---失败---小程序对象为空:" + uniAppId);
            }
        } else {
//            HdlLogLogic.print("Android---通知---uni--->失败---¬小程序对象为空:" + uniAppId);
//            HdlLogLogic.print("Android---通知---uni---失败---¬小程序对象为空:" + uniAppId);
        }

    }
@@ -425,6 +438,7 @@
     * @param onOtherUniMPEventCallBack -
     */
    public void checkRemoveOtherUniMPEventCallBack(IOnOtherUniMPEventCallBack onOtherUniMPEventCallBack) {
        HdlLogLogic.print("onOtherUniMPEventCallBack", true);
        if (this.onOtherUniMPEventCallBack == onOtherUniMPEventCallBack) {
            this.onOtherUniMPEventCallBack = null;
            HdlLogLogic.print("onOtherUniMPEventCallBack remove callback", true);