代码同步

562935844@qq.com

2023-09-15 b1072a799774a18b19856d10c9ecfdda96a8b48d

 HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java

@@ -74,19 +74,32 @@

    void initDeviceInfo() {
        AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
<<<<<<< HEAD
        infoBean.setDeviceMAC("AA00000000000100");
        infoBean.setIPMAC("AA00000000000100");
=======
        infoBean.setDeviceMAC("f2c5d8bad48f");
        infoBean.setIPMAC("f2c5d8bad48f");
>>>>>>> not_androidx
        infoBean.setDeviceName("音乐播放器");//设备名字
        infoBean.setDeviceModel("MCLog.431");//设备型号
        infoBean.setAccessMode("WIFI");
        infoBean.setIPGateway("192.168.1.1");
<<<<<<< HEAD
        infoBean.setIPAddress("192.168.1.116");
        infoBean.setGateway_type("music.standard");
=======
        infoBean.setIPAddress("192.168.1.103");
        infoBean.setGateway_type("screen.touch");
>>>>>>> not_androidx
        infoBean.setHw_version("HW2.0");
        infoBean.setFw_version("Fw1.0");
        infoBean.setOID("010105000000FE11");//每个设备oid都要不一样
        infoBean.setSid("110105000000FE08110100000011");//每个设备的sid都要不一样
<<<<<<< HEAD
=======
        infoBean.setSupplier("JINMAOYUN");
>>>>>>> not_androidx
        HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
    }

@@ -146,10 +159,16 @@
//        String secret = "44b360eb74b7ba64";//通过spk和mac提交云端认证后分配的secret

//        正式服务器
<<<<<<< HEAD
        String spkStr = "screen.mirror";//产品spk
        String macStr = "AA00000000000100";//设备唯一MAC地址
        String secret = "e186beeb7974998e";//通过spk和mac提交云端认证后分配的secret
=======
        String spkStr = "screen.touch";//产品spk
//        String macStr = "AA00000000000100";//设备唯一MAC地址
        String macStr = editText.getText().toString();//设备唯一MAC地址
//        String secret = "e186beeb7974998e";//通过spk和mac提交云端认证后分配的secret
>>>>>>> not_androidx

        String mac_key = stringToMD5(stringToMD5(macStr + secret));
        String versionString = "HDL_V1.0.1";//