Merge branch 'hxb' into wjc

wjc

2023-06-28 989b4cf5a84e898e9682f8d9723a8ba1ff20c23b

 app/src/main/java/com/hdl/photovoltaic/HDLApp.java

@@ -1,11 +1,20 @@
package com.hdl.photovoltaic;

import android.Manifest;
import android.app.Application;
import android.content.pm.PackageManager;


import androidx.annotation.NonNull;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.QueueUtils;

import java.util.HashMap;
import java.util.Objects;
@@ -30,8 +39,10 @@

    @Override
    public void onCreate() {

        super.onCreate();
        mHDLApp = this;
        initThirdSDK();
    }

    public void setInfoMap(String key, String value) {
@@ -81,27 +92,20 @@
//        NetWorkUtil.init(this);
//        //10.初始化极光推送
//        initJPush();
         initSocket();
    }

    /**
     * 初始化UniMPSDK 小程序SDK
     */
    private void initDCUniMPSDK() {
        DCSDKInitConfig config = new DCSDKInitConfig.Builder()
                .setCapsule(false)//设置是否使用胶囊按钮
                .setEnableBackground(false)//开启后台运行
                .build();
        DCUniMPSDK.getInstance().initialize(this, config, new IDCUniMPPreInitCallback() {
            @Override
            public void onInitFinished(boolean b) {
        HDLUniMPSDKManager.getInstance().initDCUniMPSDK(this);
    }

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

        //初始化UniMPSDKManager
        HDLUniMPSDKManager.getInstance().init(HDLApp.getInstance());

    //初始化socket及启动处理接收到数据的处理方法
    private void initSocket() {
        QueueUtils.getInstance().start();
        HDLUdpConnect.getInstance().initUdp();
    }

}