Merge branch 'wjc' into dev-hxb

mac

2024-02-20 dc8ae12444d1d887394eb525e2b80dd120dc4c87

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

@@ -12,7 +12,9 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

import org.greenrobot.eventbus.EventBus;
import org.json.JSONException;
import org.json.JSONObject;

@@ -111,6 +113,12 @@
                if (appid.equals(mCurrentAppId)) {
                    mCurrentAppId = "";
                }

                //小程序被关闭了通知给原生
                BaseEventBus baseEventBus = new BaseEventBus();
                baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
                EventBus.getDefault().post(baseEventBus);

            }
        });

@@ -336,15 +344,15 @@
     * 注意：需要提前小程序在运行才可成功
     *
     * @param uniAppId 小程序指定
     * @param event    小程序指定主题
     * @param topic    小程序指定主题
     * @param data     String或JSON
     */
    public void sendUniMPEvent(String uniAppId, String event, Object data) {
    public void sendUniMPEvent(String uniAppId, String topic, Object data) {

        if (mUniMPCaches.containsKey(uniAppId)) {
            if (mUniMPCaches.get(uniAppId) != null) {
                mUniMPCaches.get(uniAppId).sendUniMPEvent(event, data);
                HdlLogLogic.print("发送通知成功：event：" + event + " data：" + new Gson().toJson(data));
                mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, data);
                HdlLogLogic.print("发送通知成功：event：" + topic + " data：" + new Gson().toJson(data));
            } else {
                HdlLogLogic.print("发送失败，小程序对象为空：" + uniAppId);
            }