From bf547c154d899ec6d10efdff4b22cf732932f16b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 07 十二月 2021 17:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-hxb' into dev-CJL
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 ea90450..44815ae 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -9,6 +9,7 @@
import androidx.recyclerview.widget.RecyclerView;
import android.Manifest;
+import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -19,6 +20,7 @@
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.device.DevicesListActivity;
import com.hdl.sdk.common.event.EventListener;
import com.hdl.sdk.common.exception.HDLLinkException;
import com.hdl.sdk.common.utils.IdUtils;
@@ -97,6 +99,7 @@
beans.add(new DemoBean("璇诲彇鐘舵��"));
beans.add(new DemoBean("鑾峰彇鍦烘櫙鍒楄〃"));
beans.add(new DemoBean("鍦烘櫙鎺у埗"));
+ beans.add(new DemoBean("璁惧鍔熻兘鍒楄〃"));
demoAdapter = new DemoAdapter(beans);
rv.setAdapter(demoAdapter);
@@ -142,6 +145,10 @@
case 7:
//鑾峰彇鍦烘櫙鍒楄〃
controlScene();
+ break;
+ case 8:
+ //鍔熻兘鍒楄〃
+ startDevicesListActivity();
break;
}
}
@@ -313,6 +320,7 @@
@Override
public void onError(HDLLinkException e) {
tv.setText("缃戝叧涓嶅湪绾�");
+ responseTv.setText(e.getMsg());
}
@Override
public void onSuccess(GatewaySearchBean gatewaySearchBean) {
@@ -464,4 +472,8 @@
}
+ void startDevicesListActivity(){
+ Intent intent = new Intent(this, DevicesListActivity.class);
+ startActivity(intent);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0