Merge branch 'hxb' into wjc

wjc

2023-06-30 3ea2633e2113e35c431e165b4c94dca66ca191ae

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

@@ -13,6 +13,8 @@
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.QueueUtils;

@@ -92,7 +94,8 @@
//        NetWorkUtil.init(this);
//        //10.初始化极光推送
//        initJPush();
         initSocket();
        HDLLinkLocalSdk.getInstance().init(getInstance());
        initSocket();
    }

    /**