From fdcf461fbfa3bcd650685743e891ad3357898f0c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期四, 31 八月 2023 17:36:50 +0800
Subject: [PATCH] 更新sdk
---
HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index 5054c03..bc5e1a0 100644
--- a/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -2,6 +2,7 @@
import android.Manifest;
import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -14,6 +15,7 @@
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;
@@ -23,9 +25,11 @@
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlsdk.device.DevicesListActivity;
import com.hdl.sdk.common.config.TopicConstant;
+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.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;
@@ -55,10 +59,11 @@
private RecyclerView rv;
private TextView tv;
private TextView responseTv;
+ private TextView localSecret;
private EditText editText;
boolean isOn;
private EventListener allTopicsListener;
- private String testLightSid = "0001010D48C71B02020100010101";
+ private String testLightSid = "02010131D9C03D01020300010107";
private String secret = "";
@Override
@@ -69,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");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
+<<<<<<< HEAD
+=======
infoBean.setSupplier("JINMAOYUN");
+>>>>>>> not_androidx
HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
}
@@ -141,10 +159,16 @@
// String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
// 姝ｅ紡鏈嶅姟鍣�
+<<<<<<< HEAD
+ String spkStr = "screen.mirror";//浜у搧spk
+ String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
+ String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+=======
String spkStr = "screen.touch";//浜у搧spk
// String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
String macStr = editText.getText().toString();//璁惧鍞竴MAC鍦板潃
// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+>>>>>>> not_androidx
String mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
@@ -164,6 +188,8 @@
authbean.setSpk(spkStr);
authbean.setMACKey(mac_key);
authbean.setRequest(requestBean);
+ HDLLinkConfig.getInstance().setAuthBean(authbean);
+
//HDLLinkConfig.getInstance().getDeviceInfoBean()杩欎釜鍒濆鍖栫殑鏃跺�欒鍏堣缃ソ
AuthenticateRequest request = new AuthenticateRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), authbean);
HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
@@ -174,10 +200,12 @@
Log.e(TAG, "onError: 璁よ瘉澶辫触 " + e.getCode());
}
+ @RequiresApi(api = Build.VERSION_CODES.O)
@Override
public void onSuccess(String msg) {
tv.setText("璁よ瘉鎴愬姛");
responseTv.setText(msg.toString());
+ localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
}
});
}
@@ -207,6 +235,7 @@
setContentView(R.layout.activity_main);
responseTv = findViewById(R.id.response_tv);
editText = findViewById(R.id.edittext);
+ localSecret = findViewById(R.id.local_secret);
tv = findViewById(R.id.state_tv);
rv = findViewById(R.id.rv);
rv.setLayoutManager(new LinearLayoutManager(this));
@@ -215,6 +244,17 @@
checkIfCertified();
initDeviceInfo();//鍒濆鍖�
registerAllTopicsListener();
+ HDLLink.getInstance().setDeleteNetworkListener(new DeleteNetworkListener() {
+ @Override
+ public void onSuccess(Object msg) {
+ LogUtils.i("setDeleteNetworkListener onSucceed = " + msg);
+ }
+
+ @Override
+ public void onFailure() {
+ LogUtils.i("setDeleteNetworkListener onFailure");
+ }
+ });
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@Override
@@ -352,6 +392,9 @@
@Override
public void onMessage(Object msg) {
LinkResponse response = (LinkResponse) msg;
+ if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())){
+ localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
+ }
}
};
HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);
--
Gitblit v1.8.0