From a1628cc4760d366e118ea46d7d7057323ea87d31 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期二, 26 八月 2025 10:58:14 +0800
Subject: [PATCH] 代码同步
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 587 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 479 insertions(+), 108 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..e76c21e 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;
@@ -26,6 +24,10 @@
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.google.gson.reflect.TypeToken;
+import com.hdl.hdlsdk.bean.FunctionBean;
+import com.hdl.hdlsdk.bean.RoomFunctionBean;
+import com.hdl.hdlsdk.bean.SceneBean;
+import com.hdl.hdlsdk.bean.SceneDetailBean;
import com.hdl.hdlsdk.device.DevicesListActivity;
import com.hdl.sdk.common.config.TopicConstant;
import com.hdl.sdk.common.event.DeleteNetworkListener;
@@ -33,13 +35,17 @@
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.SPUtils;
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.BindInfoBean;
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
import com.hdl.sdk.connect.bean.response.UpdateInfo;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
@@ -47,15 +53,18 @@
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.cloud.bean.GatewayInfo;
+import com.hdl.sdk.connect.cloud.listener.GatewayListener;
+import com.hdl.sdk.connect.cloud.listener.SibichiListener;
+import com.hdl.sdk.connect.cloud.bean.AiLoginInfo;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.connect.socket.HDLAuthSocket;
-import com.hdl.sdk.connect.utils.AesUtil;
+import com.hdl.sdk.sourceos.utils.SPKey;
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;
@@ -70,40 +79,30 @@
private EditText editText;
boolean isOn;
private EventListener allTopicsListener;
- private String testLightSid = "02010131D9C03D01020300010107";
+ private String testLightSid = "020101A19B485D02020100010101";
private String secret = "";
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- removeAllTopicsListener();
- }
+ private List<FunctionBean> devicesList = new ArrayList<>();
+ private List<FunctionBean> roomDevicesList = new ArrayList<>();
+ private List<SceneBean> sceneList = new ArrayList<>();
+ private List<SceneDetailBean> sceneDetailList = new ArrayList<>();
+ private List<SceneDetailBean> roomSceneList = new ArrayList<>();
+ private GatewayInfo gatewayInfo;
void applyDeviceSecret() {
tv.setText("寮�濮嬬敵璇疯澶囧瘑閽�...");
responseTv.setText("");
-// //姝ｅ紡鏈嶅姟鍣�
- String appKey = "i8hR07jzrIS";//appkey
- String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret
-
- //娴嬭瘯鏈嶅姟鍣�
-// String appKey ="FcRyUJlLJFF";
-// String appSecret = "wz8wn75ABidx8vXcFGUotqhwFkTaYvvJ";
-
-// String appKey = "L2OZliZRxHc";
-// String appSecret = "aCIWSvJDOukXfx3kivsKW11x9xdR3IbV";
- String supplier = "JINMAOYUN";//鍘傚晢
-// String mac = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
- String mac = editText.getText().toString();
+ String supplier = "HIK KNX";//鍘傚晢
+ String mac = "FQ4895630";//璁惧鍞竴MAC鍦板潃
+// String mac = editText.getText().toString();
String spk = "screen.touch";//浜у搧spk
if (TextUtils.isEmpty(mac)) {
Toast.makeText(this, "mac涓嶈兘涓虹┖锛�", Toast.LENGTH_SHORT).show();
return;
}
-
- HDLLink.getInstance().applyDeviceSecret(this, appKey, appSecret, supplier, mac, spk, new CallBackListener() {
+ //璋冪敤浜戠鎺ュ彛闇�鍒濆鍖朒DLLink.getInstance().initCloud();
+ HDLLink.getInstance().applyDeviceSecret(supplier, mac, spk, new CallBackListener() {
@Override
public void onError(HDLException e) {
tv.setText("鐢宠澶辫触");
@@ -125,13 +124,10 @@
tv.setText("寮�濮嬫娴嬫洿鏂�...");
responseTv.setText("");
-// //姝ｅ紡鏈嶅姟鍣�
- String appKey = "i8hR07jzrIS";//appkey
- String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret
-
String appCode = "1697150870315999233";//appCode
- HDLLink.getInstance().checkAppVersion(this, appKey, appSecret, getAppVersionName(this), appCode, new CheckAppVersionListener() {
+ //璋冪敤浜戠鎺ュ彛闇�鍒濆鍖朒DLLink.getInstance().initCloud();
+ HDLLink.getInstance().checkAppVersion(getAppVersionName(this), appCode, new CheckAppVersionListener() {
@Override
public void onSuccess(UpdateInfo info) {
tv.setText("鏈夋柊鏇存柊");
@@ -141,6 +137,59 @@
@Override
public void onError(HDLException e) {
tv.setText("妫�娴嬫洿鏂板け璐�");
+ responseTv.setText(e.getMsg());
+ }
+ });
+
+ }
+
+ void getSibichiToken() {
+ tv.setText("鑾峰彇鎬濆繀椹皌oken...");
+ responseTv.setText("");
+
+ BindInfoBean bindInfoBean = (BindInfoBean) SPUtils.getSerializableEntity(SPKey.BIND_HOME_INFO);
+ String clientId = "4ED634B5A7AD97A770A52AC00FF43805";//鎬濆繀椹癱lientId
+
+ //璋冪敤浜戠鎺ュ彛闇�鍒濆鍖朒DLLink.getInstance().initCloud();
+ HDLLink.getInstance().getSibichiToken(bindInfoBean.getHomeId(), clientId, new SibichiListener() {
+ @Override
+ public void onSuccess(AiLoginInfo info) {
+ tv.setText("鎬濆繀椹皌oken");
+ responseTv.setText(info.toString());
+ }
+
+ @Override
+ public void onError(HDLException e) {
+ tv.setText("鑾峰彇鎬濆繀椹皌oken澶辫触");
+ responseTv.setText(e.getMsg());
+ }
+ });
+
+ }
+
+ void syncMainGateway() {
+ tv.setText("鑾峰彇涓荤綉鍏充俊鎭�...");
+ responseTv.setText("");
+
+ BindInfoBean bindInfoBean = (BindInfoBean) SPUtils.getSerializableEntity(SPKey.BIND_HOME_INFO);
+ if (bindInfoBean == null) {
+ Toast.makeText(this, "璇峰厛鎵爜缁戝畾浣忓畢锛�", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ //璋冪敤浜戠鎺ュ彛闇�鍒濆鍖朒DLLink.getInstance().initCloud();
+ HDLLink.getInstance().syncMainGateway(bindInfoBean.getHomeId(), new GatewayListener() {
+ @Override
+ public void onSuccess(GatewayInfo info) {
+ tv.setText("鑾峰彇涓荤綉鍏充俊鎭�");
+ responseTv.setText(info.toString());
+ if (info != null) {
+ HDLLinkConfig.getInstance().setGatewayId(info.getGatewayId());
+ }
+ }
+
+ @Override
+ public void onError(HDLException e) {
+ tv.setText("鑾峰彇涓荤綉鍏充俊鎭け璐�");
responseTv.setText(e.getMsg());
}
});
@@ -179,7 +228,7 @@
selectnetwork();
checkIfCertified();
- initDeviceInfo();//鍒濆鍖�
+ //initDeviceInfo();//涓嶈蛋浠庢満鍏ョ綉鐨勬柟寮忎笉闇�瑕佸垵濮嬪寲
registerAllTopicsListener();
HDLLink.getInstance().setDeleteNetworkListener(new DeleteNetworkListener() {
@Override
@@ -192,6 +241,8 @@
LogUtils.i("setDeleteNetworkListener onFailure");
}
});
+
+ UploadSidList();
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@Override
@@ -207,28 +258,27 @@
beans.add(new DemoBean("鍏ョ綉璁よ瘉"));
beans.add(new DemoBean("鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎"));
beans.add(new DemoBean("涓婃姤oid鍒楄〃"));
- beans.add(new DemoBean("鑾峰彇鍔熻兘鍒楄〃"));
- beans.add(new DemoBean("鍔熻兘灞炴�ц鍙�"));
+ beans.add(new DemoBean("鑾峰彇璁惧鍒楄〃"));
+ beans.add(new DemoBean("璁惧鍔熻兘灞炴�ц鍙�"));
beans.add(new DemoBean("璁惧鎺у埗"));
beans.add(new DemoBean("璇诲彇鐘舵��"));
beans.add(new DemoBean("鑾峰彇鍦烘櫙鍒楄〃"));
+ beans.add(new DemoBean("鍦烘櫙璇︽儏"));
beans.add(new DemoBean("鍦烘櫙鎺у埗"));
- beans.add(new DemoBean("璁惧鍔熻兘鍒楄〃"));
- beans.add(new DemoBean("UDP鍙戦��"));
- beans.add(new DemoBean("TCP鍙戦��"));
beans.add(new DemoBean("UDP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�"));
beans.add(new DemoBean("TCP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�"));
beans.add(new DemoBean("閫�缃�"));
- beans.add(new DemoBean("妫�娴嬫洿鏂�"));
+ beans.add(new DemoBean("Source鍔熻兘鏀寔"));
+ beans.add(new DemoBean("鑾峰彇鎴块棿鍒楄〃"));
+ beans.add(new DemoBean("鑾峰彇鎴块棿璁惧鍒楄〃"));
+ beans.add(new DemoBean("鑾峰彇鎴块棿鍦烘櫙鍒楄〃"));
+ beans.add(new DemoBean("鑾峰彇鑷姩鍖栧垪琛�"));
+ beans.add(new DemoBean("饩冨姩鍖栧惎饨ょ饨�"));
+ beans.add(new DemoBean("鐢熸垚浜岀淮鐮佺粦瀹氫綇瀹�"));
+ beans.add(new DemoBean("鑾峰彇鎬濆繀椹皌oken"));
+ beans.add(new DemoBean("鑾峰彇缃戝叧淇℃伅"));
demoAdapter = new DemoAdapter(beans);
rv.setAdapter(demoAdapter);
-
-
-// final SocketOptions options = new SocketOptions();
-//
-// MessagePipeLine pipeLine = new MessagePipeLine();
-// options.setHandleMessage(pipeLine);
-// options.setEnabledHeartbeat(false);
demoAdapter.setOnItemClickListener(new OnItemClickListener() {
@Override
@@ -251,11 +301,12 @@
UploadOidList();
break;
case 4:
- //鑾峰彇鍔熻兘鍒楄〃
+ //鑾峰彇璁惧鍒楄〃
getFunctionList();
+ //startDevicesListActivity();
break;
case 5:
- //鍔熻兘灞炴�ц鍙�
+ //璁惧鍔熻兘灞炴�ц鍙�
getFunctionAttribute();
break;
case 6:
@@ -271,36 +322,60 @@
getSceneList();
break;
case 9:
- //鍦烘櫙鎺у埗
- getScene();
+ //鍦烘櫙璇︽儏
+ getSceneDetail();
break;
case 10:
- //鍔熻兘鍒楄〃
- startDevicesListActivity();
+ //鍦烘櫙鎺у埗
+ controlScene();
break;
case 11:
- //UDP鍙戦��
- udpSend();
- break;
- case 12:
- //TCP鍙戦��
- tcpSend();
- break;
- case 13:
//UDP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�
udpSendWithCallback();
break;
- case 14:
+ case 12:
//TCP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�
tcpSendWithCallback();
break;
- case 15:
+ case 13:
//閫�缃�
deleteNetwork();
break;
+ case 14:
+ //Source鍔熻兘鏀寔
+ startSourceTestActivity();
+ break;
+ case 15:
+ //鑾峰彇鎴块棿鍒楄〃
+ getRoomList();
+ break;
case 16:
- //妫�娴嬫洿鏂�
- checkAppVersion();
+ //鑾峰彇鎴块棿璁惧鍒楄〃
+ getRoomDeviceList();
+ break;
+ case 17:
+ //鑾峰彇鎴块棿鍦烘櫙鍒楄〃
+ getRoomSceneList();
+ break;
+ case 18:
+ //鑾峰彇鑷姩鍖栧垪琛�
+ getLogicList();
+ break;
+ case 19:
+ //饩冨姩鍖栧惎饨ょ饨�
+ editEnableLogic();
+ break;
+ case 20:
+ //鐢熸垚浜岀淮鐮佺粦瀹氫綇瀹�
+ startSourceBindActivity();
+ break;
+ case 21:
+ //鑾峰彇鎬濆繀椹皌oken
+ getSibichiToken();
+ break;
+ case 22:
+ //鑾峰彇缃戝叧淇℃伅
+ syncMainGateway();
break;
}
}
@@ -334,8 +409,14 @@
@Override
public void onMessage(Object msg) {
LinkResponse response = (LinkResponse) msg;
+ Log.i("onMessage", "response.getTopic():" + response.getTopic());
+ String topic = String.format(TopicConstant.GATEWAY_LOGIN,
+ HDLLinkConfig.getInstance().getGatewayId())+ "_reply";;
+
if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())) {
localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
+ }else if (topic.equals(response.getTopic())){
+ //tcp杩炴帴鎴愬姛锛屽鐞嗕笟鍔￠�昏緫
}
}
};
@@ -385,22 +466,37 @@
HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
}
- void initDeviceInfo()
- {
+ 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.setIPGateway("192.168.31.1");
+ infoBean.setIPAddress("192.168.31.103");
+ 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);
+
+ }
+
+ void initLink() {
+ //step1:鍏堢敓鎴愪簩缁寸爜锛岀敤onpro鎵爜缁戝畾浣忓畢鑾峰彇浣忓畢淇℃伅
+ BindInfoBean bindInfoBean = (BindInfoBean) SPUtils.getSerializableEntity(SPKey.BIND_HOME_INFO);
+ if (bindInfoBean != null) {
+ HDLLinkConfig.getInstance().setHomeId(bindInfoBean.getHomeId());
+ HDLLinkConfig.getInstance().setLocalSecret(bindInfoBean.getLocalSecret());
+
+ }
+ //step2锛氬啀鑾峰彇缃戝叧淇℃伅
+ if (gatewayInfo != null) {
+ HDLLinkConfig.getInstance().setGatewayId(gatewayInfo.getGatewayId());//褰撳墠涓荤綉鍏砳d
+ }
}
/**
@@ -410,15 +506,9 @@
tv.setText("寮�濮嬪叆缃戣璇�...");
//璁よ瘉鎻愪氦鍙傛暟鍑嗗
-// 娴嬭瘯鏈嶅姟
-// String spkStr = "ir.module";//浜у搧spk
-// String macStr = "AA000000000000AF";//璁惧鍞竴MAC鍦板潃
-// String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
-
-// 姝ｅ紡鏈嶅姟鍣�
+ //姝ｅ紡鏈嶅姟鍣�
String spkStr = "screen.mirror";//浜у搧spk
- String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
- String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+ String macStr = "f2c5d8bad48f";//璁惧鍞竴MAC鍦板潃
String mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
@@ -428,7 +518,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();
@@ -467,8 +557,7 @@
StringBuilder hex = new StringBuilder(hash.length * 2);
for (byte b : hash) {
- if ((b & 0xFF) < 0x10)
- hex.append("0");
+ if ((b & 0xFF) < 0x10) hex.append("0");
hex.append(Integer.toHexString(b & 0xFF));
}
@@ -482,6 +571,9 @@
void searchGatewayBroadcast() {
tv.setText("鎼滅储缃戝叧涓�...");
responseTv.setText("");
+
+ String gatewayId = HDLLinkConfig.getInstance().getGatewayId();
+ Log.d("panlili", "MainActivity.java:searchGatewayBroadcast----->gatewayId= " + gatewayId);
HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() {
@Override
public void onError(HDLLinkException e) {
@@ -499,10 +591,10 @@
}
/**
- * 鑾峰彇鍔熻兘鍒楄〃
+ * 鑾峰彇璁惧鍒楄〃
*/
void getFunctionList() {
- tv.setText("鑾峰彇鍔熻兘鍒楄〃涓�...");
+ tv.setText("鑾峰彇璁惧鍒楄〃涓�...");
responseTv.setText("");
HDLLink.getInstance().getFunctionList(new HDLLinkCallBack() {
@Override
@@ -512,21 +604,45 @@
@Override
public void onSuccess(String data) {
- tv.setText("鑾峰彇鍔熻兘鍒楄〃鎴愬姛");
+ tv.setText("鑾峰彇璁惧鍒楄〃鎴愬姛");
responseTv.setText(data);
+
+ handelFunctionList(data);
}
});
}
+ void handelFunctionList(String data) {
+ try {
+ final LinkResponse linkResponse = GsonConvert.getGson().fromJson(data, new TypeToken<LinkResponse>() {
+ }.getType());
+
+ final BaseLocalResponse<List<FunctionBean>> bean = GsonConvert.getGson().fromJson(linkResponse.getData(), new TypeToken<BaseLocalResponse<List<FunctionBean>>>() {
+ }.getType());
+ devicesList.clear();
+ devicesList.addAll(bean.getObjects());
+
+ Log.d(TAG, "handelFunList-----> " + devicesList.toString());
+ } catch (Exception e) {
+ Log.e(TAG, "handelFunList: " + e.getMessage());
+ }
+
+ }
+
/**
- * 鍔熻兘灞炴�ц鍙�
+ * 璁惧鍔熻兘灞炴�ц鍙�
* 鏀寔鎵归噺璇诲彇
*/
void getFunctionAttribute() {
- tv.setText("鍔熻兘灞炴�ц鍙�");
+ tv.setText("璁惧鍔熻兘灞炴�ц鍙�");
responseTv.setText("");
List<String> sids = new ArrayList<>();
- sids.add(testLightSid);
+ if (devicesList.size() != 0) {
+ sids.add(devicesList.get(0).getSid());
+ } else {
+ sids.add(testLightSid);
+ }
+
HDLLink.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
@@ -548,7 +664,11 @@
tv.setText("璇诲彇鐘舵�佷腑...");
responseTv.setText("");
List<String> list = new ArrayList<>();
- list.add(testLightSid);//瑕佽鍙栬澶囩殑sid
+ if (devicesList.size() != 0) {
+ list.add(devicesList.get(0).getSid());
+ } else {
+ list.add(testLightSid);//瑕佽鍙栬澶囩殑sid
+ }
HDLLink.getInstance().propertyRead(list, new HDLLinkCallBack() {
@Override
public void onSuccess(String data) {
@@ -574,7 +694,11 @@
isOn = !isOn;
List<DeviceControlRequest> requestList = new ArrayList<>();
DeviceControlRequest request = new DeviceControlRequest();
- request.setSid(testLightSid);
+ if (devicesList.size() != 0) {
+ request.setSid(devicesList.get(0).getSid());
+ } else {
+ request.setSid(testLightSid);//瑕佽鍙栬澶囩殑sid
+ }
List<DeviceControlRequest.StatusBean> statusBeanList = new ArrayList<>();
DeviceControlRequest.StatusBean bean = new DeviceControlRequest.StatusBean();
bean.setKey("on_off");
@@ -582,6 +706,7 @@
statusBeanList.add(bean);
request.setStatus(statusBeanList);
requestList.add(request);
+
HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {
@Override
public void onSuccess(String data) {
@@ -605,7 +730,8 @@
@Override
public void onSuccess(String msg) {
responseTv.setText(msg);
- Log.d("panlili", "MainActivity.java:getSceneList-----> " + msg);
+
+ handelSceneList(msg);
}
@Override
@@ -615,31 +741,72 @@
});
}
+ void handelSceneList(String data) {
+ try {
+ final LinkResponse linkResponse = GsonConvert.getGson().fromJson(data, new TypeToken<LinkResponse>() {
+ }.getType());
+
+ final BaseLocalResponse<List<SceneBean>> bean = GsonConvert.getGson().fromJson(linkResponse.getData(), new TypeToken<BaseLocalResponse<List<SceneBean>>>() {
+ }.getType());
+ sceneList.clear();
+ sceneList.addAll(bean.getObjects());
+
+ Log.d(TAG, "handelSceneList-----> " + sceneList.toString());
+ } catch (Exception e) {
+ Log.e(TAG, "handelSceneList: " + e.getMessage());
+ }
+
+ }
+
//鍦烘櫙鍒楄〃
- // {"id":"8a5eaa143ce943b987b577df5a66759b","time_stamp":"1637040217235","objects":[{"sid":"04010560D2C7170A0A0100000000","name":"鍥炲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634871490"},{"sid":"04010560D2C76E0A0A0100010000","name":"绂诲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634785823"}]}
+// {"id":"98a683eca5384f2db2ca1ed688953439","time_stamp":"1740024067320","code":"0","msg":"Success","objects":[{"sid":"0201039965BF5D0A0A0100011100","name":"鍦烘櫙-1","status":"off","group":"255","delay":"0","modify_time":"1735293636","local":"false"},{"sid":"030105016B84AA0A0A0100020000","name":"澶у巺鐏紑","status":"off","group":"255","delay":"0","modify_time":"1740023916","local":"false"},{"sid":"030105016D14240A0A0100030000","name":"澶у巺鐏叧","status":"off","group":"255","delay":"0","modify_time":"1740023969","local":"false"},{"sid":"020103D465BF5D0A0A0100041100","name":"鍦烘櫙-4","status":"off","group":"255","delay":"0","modify_time":"1735200096","local":"false"}]}
/**
* 鑾峰彇鍦烘櫙璇︽儏
* 鎵ц鎴愬姛鐨勮瘽 鍝嶅簲code涓�200
*/
- void getScene() {
+ void getSceneDetail() {
tv.setText("鍦烘櫙璇诲彇");
responseTv.setText("");
//鍦烘櫙sid鍒楄〃锛屾敮鎸佹壒閲忚鍙�
- List<String> sids = new ArrayList<>();
- sids.add("0201034C50B53F0A0A0100011100");
- sids.add("0201037F50B53F0A0A0100021100");
- HDLLink.getInstance().getScene(sids, new HDLLinkCallBack() {
- @Override
- public void onSuccess(String msg) {
- responseTv.setText(msg);
+ if (sceneList != null && sceneList.size() != 0) {
+ List<String> sids = new ArrayList<>();
+ for (SceneBean s : sceneList) {
+ sids.add(s.getSid());//閬嶅巻鎵�鏈夊満鏅嬁鍒拌鎯呬俊鎭�
}
+ HDLLink.getInstance().getScene(sids, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
- @Override
- public void onError(HDLLinkException e) {
- responseTv.setText(e.getMsg());
- }
- });
+ handelSceneDetailList(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ } else {
+ Toast.makeText(MainActivity.this, "璇峰厛鑾峰彇鍦烘櫙鍒楄〃", Toast.LENGTH_SHORT).show();
+ }
+ }
+
+ void handelSceneDetailList(String data) {
+ try {
+ final LinkResponse linkResponse = GsonConvert.getGson().fromJson(data, new TypeToken<LinkResponse>() {
+ }.getType());
+
+ final BaseLocalResponse<List<SceneDetailBean>> bean = GsonConvert.getGson().fromJson(linkResponse.getData(), new TypeToken<BaseLocalResponse<List<SceneDetailBean>>>() {
+ }.getType());
+ sceneDetailList.clear();
+ sceneDetailList.addAll(bean.getObjects());
+
+ Log.d(TAG, "handelSceneDetailList-----> " + sceneDetailList.toString());
+ } catch (Exception e) {
+ Log.e(TAG, "handelSceneDetailList: " + e.getMessage());
+ }
+
}
/**
@@ -653,9 +820,9 @@
List<String> sids = new ArrayList<>();
isOn = !isOn;
if (isOn) {
- sids.add("04010560D2C7170A0A0100000000");
+ sids.add("030105016D14240A0A0100030000");
} else {
- sids.add("04010560D2C76E0A0A0100010000");
+ sids.add("030105016B84AA0A0A0100020000");
}
HDLLink.getInstance().controlScene(sids, new HDLLinkCallBack() {
@Override
@@ -670,9 +837,166 @@
});
}
+ /**
+ * 鑾峰彇鎴块棿鍒楄〃
+ */
+ void getRoomList() {
+ tv.setText("璇诲彇鎴块棿鍒楄〃");
+ responseTv.setText("");
+ HDLLink.getInstance().getRoomList(new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鎴块棿璁惧鍒楄〃
+ * 鍏堣幏鍙栨埧闂寸粦瀹氬叧绯诲垪琛紝閫氳繃sid鍜岃澶囧垪琛ㄥ尮閰嶇瓫閫�
+ */
+ void getRoomDeviceList() {
+ tv.setText("鑾峰彇鎴块棿璁惧鍒楄〃");
+ responseTv.setText("");
+ //鎴块棿uid鍒楄〃锛屾敮鎸佹壒閲忚鍙�
+ List<String> uid = new ArrayList<>();
+ uid.add("64a4fc6f-4eae-4d1d-82e4-40140c802c48");
+ HDLLink.getInstance().getRoomBindList(uid, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ if (!TextUtils.isEmpty(msg)) {
+ handelRoomFunctionList(msg);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ void handelRoomFunctionList(String data) {
+ try {
+ final LinkResponse linkResponse = GsonConvert.getGson().fromJson(data, new TypeToken<LinkResponse>() {
+ }.getType());
+
+ final BaseLocalResponse<List<RoomFunctionBean>> bean = GsonConvert.getGson().fromJson(linkResponse.getData(), new TypeToken<BaseLocalResponse<List<RoomFunctionBean>>>() {
+ }.getType());
+
+ List<RoomFunctionBean> roomFunctionBeans = bean.getObjects();
+ List<RoomFunctionBean.Functions> functions = roomFunctionBeans.get(0).getFunctions();
+
+ roomDevicesList.clear();
+
+ if (devicesList != null && devicesList.size() != 0) {
+ for (int i = 0; i < functions.size(); i++) {
+ for (int j = 0; j < devicesList.size(); j++) {
+ //涓庤澶囧垪琛ㄧ殑鏁版嵁鍖归厤锛宻id瀵瑰簲
+ if (functions.get(i).getSid().equals(devicesList.get(j).getSid())) {
+ roomDevicesList.add(devicesList.get(j));
+ }
+ }
+ }
+ responseTv.setText(roomDevicesList.toString());
+ Log.d(TAG, "handelRoomFunctionList-----> " + roomDevicesList.toString());
+ } else {
+ Toast.makeText(MainActivity.this, "璇峰厛鑾峰彇璁惧鍒楄〃", Toast.LENGTH_SHORT).show();
+ }
+
+ } catch (Exception e) {
+ Log.e(TAG, "handelRoomFunctionList: " + e.getMessage());
+ }
+
+ }
+
+ /**
+ * 鑾峰彇鑷姩鍖栧垪琛�
+ */
+ void getLogicList() {
+ tv.setText("璇诲彇鑷姩鍖栧垪琛�");
+ responseTv.setText("");
+ HDLLink.getInstance().getLogicList(new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 饩冨姩鍖栧惎饨ょ饨�
+ */
+ void editEnableLogic() {
+ tv.setText("饩冨姩鍖栧惎饨ょ饨�");
+ responseTv.setText("");
+
+ String sid = "0301050041800C161501000A0000";//鑷姩鍖杝id
+ boolean enable = true;//true=鍚饯 false=绂佲饯
+
+ HDLLink.getInstance().editEnableLogic(sid, enable, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鎴块棿鍦烘櫙鍒楄〃锛堥渶瑕佸厛鎷垮埌鍦烘櫙璇︽儏锛�
+ */
+ void getRoomSceneList() {
+ tv.setText("鑾峰彇鎴块棿鍦烘櫙鍒楄〃");
+ responseTv.setText("");
+ String uid = "64a4fc6f-4eae-4d1d-82e4-40140c802c48";//鎴块棿uid
+
+ roomSceneList.clear();
+ if (sceneDetailList != null && sceneDetailList.size() != 0) {
+ for (SceneDetailBean s : sceneDetailList) {
+ List<String> roomUids = s.getUids();
+ if (roomUids != null && roomUids.size() != 0) {
+ for (int i = 0; i < roomUids.size(); i++) {
+ if (uid.equals(roomUids.get(i))) {
+ roomSceneList.add(s);
+ }
+ }
+ }
+ }
+ responseTv.setText(roomSceneList.toString());
+ Log.d(TAG, "getRoomSceneList-----> " + roomSceneList.toString());
+ } else {
+ Toast.makeText(MainActivity.this, "璇峰厛鑾峰彇鍦烘櫙鍒楄〃璇︽儏", Toast.LENGTH_SHORT).show();
+ }
+
+ }
void startDevicesListActivity() {
Intent intent = new Intent(this, DevicesListActivity.class);
+ startActivity(intent);
+ }
+
+ void startSourceTestActivity() {
+ Intent intent = new Intent(this, SourceTestActivity.class);
+ startActivity(intent);
+ }
+
+ void startSourceBindActivity() {
+ Intent intent = new Intent(this, SourceBindActivity.class);
startActivity(intent);
}
@@ -814,6 +1138,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 +1200,10 @@
return versionName;
}
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ removeAllTopicsListener();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0