Merge branch 'hxb' into wjc

wjc

2023-06-29 ab4fde3dd12361b4092fd52060a66017a060236b

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

@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.other;


import android.content.Intent;
import android.text.TextUtils;

import com.alibaba.fastjson.JSON;
@@ -55,6 +56,8 @@
        return sHdlUniLogic;
    }

    //region ******【原生】和【小程序】通讯的方法 onOtherUniMPEventReceive();openUniMP();sendUni();******

    /**
     * 原生接收到uni发来的数据
     *
@@ -108,7 +111,6 @@
//                                sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean);
                                uniCallbackData(callBackBaseBean, callback);
                            }


                            @Override
                            public void onError(HDLLinkException e) {
@@ -221,6 +223,10 @@
    public void checkRemoveOtherUniMPEventCallBack() {
        HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
    }
    //endregion


    //region ******一般方法******

    /**
     * 组装uni发送数据格式
@@ -319,6 +325,7 @@
            return "";
        }
    }
    //endregion

}