From 9a437cca9b3d21f5081d544024ee2b3e216176f8 Mon Sep 17 00:00:00 2001 From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com> Date: 星期一, 24 二月 2025 11:21:49 +0800 Subject: [PATCH] 更新demo --- HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 589 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 468 insertions(+), 121 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 20780bf..0fa735a 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 @@ -1,8 +1,10 @@ package com.hdl.hdlsdk; import android.Manifest; +import android.content.Context; import android.content.Intent; -import android.os.Build; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; @@ -15,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; @@ -23,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,14 +38,18 @@ 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.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; @@ -51,8 +60,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; - -import retrofit2.http.HEAD; public class MainActivity extends AppCompatActivity { @@ -65,46 +72,25 @@ 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(); - } - - void initDeviceInfo() { - AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean(); - - infoBean.setDeviceMAC("f2c5d8bad48f"); - infoBean.setIPMAC("f2c5d8bad48f"); - - infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧 - infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿 - infoBean.setAccessMode("WIFI"); - infoBean.setIPGateway("192.168.1.1"); - infoBean.setIPAddress("192.168.1.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); - } + 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<>(); void applyDeviceSecret() { tv.setText("寮�濮嬬敵璇疯澶囧瘑閽�..."); responseTv.setText(""); // //姝e紡鏈嶅姟鍣� - String appKey = "i8hR07jzrIS";//appkey - String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret +// String appKey = "i8hR07jzrIS";//appkey +// String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret //娴嬭瘯鏈嶅姟鍣� -// String appKey ="FcRyUJlLJFF"; -// String appSecret = "wz8wn75ABidx8vXcFGUotqhwFkTaYvvJ"; + String appKey = "FcRyUJlLJFF"; + String appSecret = "wz8wn75ABidx8vXcFGUotqhwFkTaYvvJ"; // String appKey = "L2OZliZRxHc"; // String appSecret = "aCIWSvJDOukXfx3kivsKW11x9xdR3IbV"; @@ -136,63 +122,30 @@ } - /** - * 鍏ョ綉璁よ瘉 - */ - void sendAuthenticateRequest() { - tv.setText("寮�濮嬪叆缃戣璇�..."); + void checkAppVersion() { + tv.setText("寮�濮嬫娴嬫洿鏂�..."); responseTv.setText(""); - //璁よ瘉鎻愪氦鍙傛暟鍑嗗 -// -// //娴嬭瘯鏈嶅姟鍣� -// String spkStr = "music.standard";//浜у搧spk -// String macStr = "AA000000000000AF";//璁惧鍞竴MAC鍦板潃 -// String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret -// 姝e紡鏈嶅姟鍣� - String spkStr = "screen.touch";//浜у搧spk -// String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃 - String macStr = editText.getText().toString();//璁惧鍞竴MAC鍦板潃 -// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑 +// //姝e紡鏈嶅姟鍣� + String appKey = "i8hR07jzrIS";//appkey + String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret - String mac_key = stringToMD5(stringToMD5(macStr + secret)); - String versionString = "HDL_V1.0.1";// - String time = String.valueOf(System.currentTimeMillis()); - HDLLinkConfig.getInstance().getDeviceInfoBean().setDeviceMAC(macStr); -// HDLLinkConfig.getInstance().setCurrentGateway(infoBean); + String appCode = "1697150870315999233";//appCode - //1.璁剧疆璁よ瘉淇℃伅 - AuthenticateRequest.RequestBean requestBean = new AuthenticateRequest.RequestBean(); - requestBean.setMAC(macStr); - requestBean.setSupplier("JINMAOYUN"); - requestBean.setFirmwareVersion(versionString); - requestBean.setHardwareModel("1956F"); -// HDLLinkConfig.getInstance().setRequestBean(requestBean); - - AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean(); - 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() { + HDLLink.getInstance().checkAppVersion(this, appKey, appSecret, getAppVersionName(this), appCode, new CheckAppVersionListener() { @Override - public void onError(HDLLinkException e) { - tv.setText("璁よ瘉澶辫触" + e.getCode()); - responseTv.setText(e.getMsg()); - Log.e(TAG, "onError: 璁よ瘉澶辫触 " + e.getCode()); + public void onSuccess(UpdateInfo info) { + tv.setText("鏈夋柊鏇存柊"); + responseTv.setText(info.toString()); } - @RequiresApi(api = Build.VERSION_CODES.O) @Override - public void onSuccess(String msg) { - tv.setText("璁よ瘉鎴愬姛"); - responseTv.setText(msg.toString()); - localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret()); + public void onError(HDLException e) { + tv.setText("妫�娴嬫洿鏂板け璐�"); + responseTv.setText(e.getMsg()); } }); + } public void UploadDeviceAuth(String mac, String result, String message, String auth_code) { @@ -241,6 +194,8 @@ } }); + UploadSidList(); + ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() { @Override public void onActivityResult(Map<String, Boolean> result) { @@ -255,27 +210,24 @@ 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("Source鍔熻兘鏀寔")); + beans.add(new DemoBean("鑾峰彇鎴块棿鍒楄〃")); + beans.add(new DemoBean("鑾峰彇鎴块棿璁惧鍒楄〃")); + beans.add(new DemoBean("鑾峰彇鎴块棿鍦烘櫙鍒楄〃")); + beans.add(new DemoBean("鑾峰彇鑷姩鍖栧垪琛�")); + 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 @@ -298,11 +250,12 @@ UploadOidList(); break; case 4: - //鑾峰彇鍔熻兘鍒楄〃 + //鑾峰彇璁惧鍒楄〃 getFunctionList(); + //startDevicesListActivity(); break; case 5: - //鍔熻兘灞炴�ц鍙� + //璁惧鍔熻兘灞炴�ц鍙� getFunctionAttribute(); break; case 6: @@ -318,32 +271,48 @@ getSceneList(); break; case 9: + //鍦烘櫙璇︽儏 + getSceneDetail(); + break; + case 10: //鍦烘櫙鎺у埗 controlScene(); break; - case 10: - //鍔熻兘鍒楄〃 - startDevicesListActivity(); - 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: + //鑾峰彇鎴块棿璁惧鍒楄〃 + getRoomDeviceList(); + break; + case 17: + //鑾峰彇鎴块棿鍦烘櫙鍒楄〃 + getRoomSceneList(); + break; + case 18: + //鑾峰彇鑷姩鍖栧垪琛� + getLogicList(); + break; + case 19: + //饩冨姩鍖栧惎饨ょ饨� + editEnableLogic(); break; } } @@ -377,8 +346,10 @@ @Override public void onMessage(Object msg) { LinkResponse response = (LinkResponse) msg; - if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())){ + Log.i("onMessage", "response.getTopic():" + response.getTopic()); + if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())) { localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret()); + } } }; @@ -428,6 +399,74 @@ HDLLink.getInstance().removeAllTopicsListener(allTopicsListener); } + void initDeviceInfo() { + AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean(); + infoBean.setDeviceMAC("f2c5d8bad48f"); + infoBean.setIPMAC("f2c5d8bad48f"); + infoBean.setDeviceName("榄旈暅");//璁惧鍚嶅瓧 + infoBean.setDeviceModel("HDLSDK");//璁惧鍨嬪彿 + infoBean.setAccessMode("WIFI"); + 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 sendAuthenticateRequest() { + tv.setText("寮�濮嬪叆缃戣璇�..."); + //璁よ瘉鎻愪氦鍙傛暟鍑嗗 + +// 娴嬭瘯鏈嶅姟 +// String spkStr = "ir.module";//浜у搧spk +// String macStr = "AA000000000000AF";//璁惧鍞竴MAC鍦板潃 +// String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret + +// 姝e紡鏈嶅姟鍣� + String spkStr = "screen.mirror";//浜у搧spk + String macStr = "f2c5d8bad48f";//璁惧鍞竴MAC鍦板潃 +// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret + + String mac_key = stringToMD5(stringToMD5(macStr + secret)); + String versionString = "HDL_V1.0.1";// + String time = String.valueOf(System.currentTimeMillis()); + HDLLinkConfig.getInstance().getDeviceInfoBean().setDeviceMAC(macStr); + + //1.璁剧疆璁よ瘉淇℃伅 + AuthenticateRequest.RequestBean requestBean = new AuthenticateRequest.RequestBean(); + requestBean.setMAC(macStr); + requestBean.setSupplier("JINMAOYUN"); + requestBean.setFirmwareVersion(versionString); + requestBean.setHardwareModel("1956F"); + AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean(); + authbean.setSpk(spkStr); + authbean.setMACKey(mac_key); + authbean.setRequest(requestBean); + //HDLLinkConfig.getInstance().getDeviceInfoBean()杩欎釜鍒濆鍖栫殑鏃跺�欒鍏堣缃ソ + AuthenticateRequest request = new AuthenticateRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), authbean); + HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() { + @Override + public void onError(HDLLinkException e) { + tv.setText("璁よ瘉澶辫触"); + responseTv.setText(e.getMsg()); + Log.i("TAG", "onError: 璁よ瘉澶辫触"); + } + + @Override + public void onSuccess(String msg) { + tv.setText("璁よ瘉鎴愬姛"); + responseTv.setText(msg.toString()); + } + }); + } String stringToMD5(String text) { byte[] hash; @@ -443,8 +482,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)); } @@ -458,6 +496,7 @@ void searchGatewayBroadcast() { tv.setText("鎼滅储缃戝叧涓�..."); responseTv.setText(""); + HDLLinkConfig.getInstance().getGatewayId(); HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() { @Override public void onError(HDLLinkException e) { @@ -475,10 +514,10 @@ } /** - * 鑾峰彇鍔熻兘鍒楄〃 + * 鑾峰彇璁惧鍒楄〃 */ void getFunctionList() { - tv.setText("鑾峰彇鍔熻兘鍒楄〃涓�..."); + tv.setText("鑾峰彇璁惧鍒楄〃涓�..."); responseTv.setText(""); HDLLink.getInstance().getFunctionList(new HDLLinkCallBack() { @Override @@ -488,18 +527,37 @@ @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); @@ -558,6 +616,7 @@ statusBeanList.add(bean); request.setStatus(statusBeanList); requestList.add(request); + HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() { @Override public void onSuccess(String data) { @@ -581,6 +640,8 @@ @Override public void onSuccess(String msg) { responseTv.setText(msg); + + handelSceneList(msg); } @Override @@ -590,8 +651,73 @@ }); } + 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 getSceneDetail() { + tv.setText("鍦烘櫙璇诲彇"); + responseTv.setText(""); + //鍦烘櫙sid鍒楄〃锛屾敮鎸佹壒閲忚鍙� + 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); + + 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()); + } + + } /** * 鎺у埗鍦烘櫙 @@ -604,9 +730,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 @@ -621,9 +747,161 @@ }); } + /** + * 鑾峰彇鎴块棿鍒楄〃 + */ + 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"; + + 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); } @@ -764,4 +1042,73 @@ } }); } + + 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鐗堟湰 + * + * @param context + * @return + */ + public static String getAppVersionName(Context context) { + String versionName = "0"; + try { + PackageManager packageManager = context.getPackageManager(); + PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0); + versionName = packageInfo.versionName; + if (TextUtils.isEmpty(versionName)) { + versionName = "0"; + } + } catch (Exception e) { + e.printStackTrace(); + } + return versionName; + } + + @Override + protected void onDestroy() { + super.onDestroy(); + removeAllTopicsListener(); + } + } \ No newline at end of file -- Gitblit v1.8.0