HDLSDK_A_Android
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
562935844@qq.com
2023-09-19 6521c8e329665cc97f0714a9a094d2d823e23980 
 HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java


@@ -5,7 +5,6 @@


import android.content.Intent;


import android.content.pm.PackageInfo;


import android.content.pm.PackageManager;


import android.os.Build;


import android.os.Bundle;


import android.text.TextUtils;


import android.util.Log;


@@ -18,7 +17,6 @@


import androidx.activity.result.ActivityResultLauncher;


import androidx.activity.result.contract.ActivityResultContracts;


import androidx.annotation.NonNull;


import androidx.annotation.RequiresApi;


import androidx.appcompat.app.AppCompatActivity;


import androidx.recyclerview.widget.LinearLayoutManager;


import androidx.recyclerview.widget.RecyclerView;


@@ -31,15 +29,19 @@


import com.hdl.sdk.common.event.DeleteNetworkListener;


import com.hdl.sdk.common.event.EventListener;


import com.hdl.sdk.common.exception.HDLLinkException;


import com.hdl.sdk.common.utils.AllTopicManagerUtils;


import com.hdl.sdk.common.utils.IdUtils;


import com.hdl.sdk.common.utils.LogUtils;


import com.hdl.sdk.common.utils.gson.GsonConvert;


import com.hdl.sdk.connect.HDLLink;


import com.hdl.sdk.connect.bean.LinkResponse;


import com.hdl.sdk.connect.bean.request.AttributesRequest;


import com.hdl.sdk.connect.bean.request.AuthenticateRequest;


import com.hdl.sdk.connect.bean.request.DeviceControlRequest;


import com.hdl.sdk.connect.bean.request.ListSidRequest;


import com.hdl.sdk.connect.bean.request.ListUploadRequest;


import com.hdl.sdk.connect.bean.response.BaseLocalResponse;


import com.hdl.sdk.connect.bean.response.DeviceInfoResponse;


import com.hdl.sdk.connect.bean.response.GatewaySearchBean;


import com.hdl.sdk.connect.bean.response.UpdateInfo;


import com.hdl.sdk.connect.callback.HDLLinkCallBack;


@@ -49,13 +51,11 @@


import com.hdl.sdk.connect.cloud.HDLException;


import com.hdl.sdk.connect.config.HDLLinkConfig;


import com.hdl.sdk.connect.socket.HDLAuthSocket;


import com.hdl.sdk.connect.utils.AesUtil;




import java.io.UnsupportedEncodingException;


import java.security.MessageDigest;


import java.security.NoSuchAlgorithmException;


import java.util.ArrayList;


import java.util.Base64;


import java.util.List;


import java.util.Map;




@@ -72,12 +72,6 @@


    private EventListener allTopicsListener;


    private String testLightSid = "02010131D9C03D01020300010107";


    private String secret = "";




    @Override


    protected void onDestroy() {


        super.onDestroy();


        removeAllTopicsListener();


    }




    void applyDeviceSecret() {


        tv.setText("开始申请设备密钥...");


@@ -192,6 +186,8 @@


                LogUtils.i("setDeleteNetworkListener onFailure");


            }


        });




        UploadSidList();




        ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {


            @Override


@@ -388,19 +384,21 @@


    void initDeviceInfo()


    {


        AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();


        infoBean.setDeviceMAC("AA00000000000100");


        infoBean.setIPMAC("AA00000000000100");


        infoBean.setDeviceName("音乐播放器");//设备名字


        infoBean.setDeviceModel("MCLog.431");//设备型号


        infoBean.setDeviceMAC("f2c5d8bad48f");


        infoBean.setIPMAC("f2c5d8bad48f");


        infoBean.setDeviceName("魔镜");//设备名字


        infoBean.setDeviceModel("HDLSDK");//设备型号


        infoBean.setAccessMode("WIFI");


        infoBean.setIPGateway("192.168.1.1");


        infoBean.setIPAddress("192.168.1.116");


        infoBean.setGateway_type("music.standard");


        infoBean.setGateway_type("screen.touch");


        infoBean.setHw_version("HW2.0");


        infoBean.setFw_version("Fw1.0");


        infoBean.setOID("010105000000FE11");//每个设备oid都要不一样


        infoBean.setSid("110105000000FE08110100000011");//每个设备的sid都要不一样


        infoBean.setSupplier("JINMAOYUN");


        HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);




    }




    /**


@@ -417,8 +415,8 @@




//        正式服务器


        String spkStr = "screen.mirror";//产品spk


        String macStr = "AA00000000000100";//设备唯一MAC地址


        String secret = "e186beeb7974998e";//通过spk和mac提交云端认证后分配的secret


        String macStr = "f2c5d8bad48f";//设备唯一MAC地址


//        String secret = "e186beeb7974998e";//通过spk和mac提交云端认证后分配的secret




        String mac_key = stringToMD5(stringToMD5(macStr + secret));


        String versionString = "HDL_V1.0.1";//


@@ -428,7 +426,7 @@


        //1.设置认证信息


        AuthenticateRequest.RequestBean requestBean = new AuthenticateRequest.RequestBean();


        requestBean.setMAC(macStr);


        requestBean.setSupplier("WISE");


        requestBean.setSupplier("JINMAOYUN");


        requestBean.setFirmwareVersion(versionString);


        requestBean.setHardwareModel("1956F");


        AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean();


@@ -814,6 +812,47 @@


        });


    }




    private void UploadSidList() {


        tv.setText("上报Sid列表...");


        responseTv.setText("");




        //1.设置设备信息


        AuthenticateRequest.AuthenticateDeviceInfoBean authenticateDeviceInfoBean = HDLLinkConfig.getInstance().getDeviceInfoBean();




        ListSidRequest request = new ListSidRequest();


        request.setOid(authenticateDeviceInfoBean.getOID());


        request.setName("sid名称");


        request.setOmodel(authenticateDeviceInfoBean.getDeviceModel());


        request.setSid("12345678");//当前sid的


        request.setSpk("light.switch");//当前spk名称，根据实际设备来定义


        request.setFrom(authenticateDeviceInfoBean.getOID());//来自哪个网关，如果时Link网络设备，则填自身oid；如果是驱动则不需要此字段




        AttributesRequest attributes = new AttributesRequest();


        attributes.setKey("on_off");


        attributes.setData_type("string");


        List<Object> valueList=new ArrayList<>();


        valueList.add("on");


        valueList.add("off");


        attributes.setValue(valueList);


        //添加支持的属性列表


        List<AttributesRequest> attributesList = new ArrayList<>();


        request.setAttributes(attributesList);


        List<ListSidRequest> sidRequestList = new ArrayList<>();


        sidRequestList.add(request);


        HDLLink.getInstance().UploadSidList(sidRequestList, new HDLLinkCallBack() {


            @Override


            public void onError(HDLLinkException error) {


                tv.setText(error.getMsg());


            }




            @Override


            public void onSuccess(String data) {


                tv.setText("上报sid列表成功");


                responseTv.setText(data);


            }


        });


    }




    /**


     * 获取APP版本


     *


@@ -835,4 +874,10 @@


        return versionName;


    }




    @Override


    protected void onDestroy() {


        super.onDestroy();


        removeAllTopicsListener();


    }




}