From 755e2893c12b79649ee12dec2b7d832d58b9265b Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期三, 18 十月 2023 16:19:26 +0800
Subject: [PATCH] 上报oid列表新增parentoid
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 67 insertions(+), 26 deletions(-)
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index d8e4570..c73aa4c 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/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,31 +29,29 @@
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;
import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
-import com.hdl.sdk.connect.cloud.CallBackListener;
-import com.hdl.sdk.connect.cloud.CheckAppVersionListener;
-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;
@@ -73,13 +69,7 @@
private String testLightSid = "02010131D9C03D01020300010107";
private String secret = "";
- @Override
- protected void onDestroy() {
- super.onDestroy();
- removeAllTopicsListener();
- }
-
- void applyDeviceSecret() {
+ /*void applyDeviceSecret() {
tv.setText("寮�濮嬬敵璇疯澶囧瘑閽�...");
responseTv.setText("");
@@ -145,7 +135,7 @@
}
});
- }
+ }*/
public void UploadDeviceAuth(String mac, String result, String message, String auth_code) {
//灏嗚璇佺粨鏋滀笂鎶ョ粰缃戝叧
@@ -193,6 +183,8 @@
}
});
+ UploadSidList();
+
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@Override
public void onActivityResult(Map<String, Boolean> result) {
@@ -236,7 +228,7 @@
switch (position) {
case 0:
//鐢宠璁惧瀵嗛挜
- applyDeviceSecret();
+// applyDeviceSecret();
break;
case 1:
//鍏ョ綉璁よ瘉
@@ -300,7 +292,7 @@
break;
case 16:
//妫�娴嬫洿鏂�
- checkAppVersion();
+// checkAppVersion();
break;
}
}
@@ -388,19 +380,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");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
+ infoBean.setSupplier("JINMAOYUN");
HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
+
}
/**
@@ -417,8 +411,8 @@
// 姝ｅ紡鏈嶅姟鍣�
String spkStr = "screen.mirror";//浜у搧spk
- String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
- String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+ String macStr = "f2c5d8bad48f";//璁惧鍞竴MAC鍦板潃
+// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
String mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
@@ -428,7 +422,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 +808,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缃戠粶璁惧锛屽垯濉嚜韬玱id锛涘鏋滄槸椹卞姩鍒欎笉闇�瑕佹瀛楁
+
+ 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 +870,10 @@
return versionName;
}
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ removeAllTopicsListener();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0