From 49c135d23c6038a8c456cf1fcf450e5fb649047a Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 25 十一月 2022 17:44:06 +0800
Subject: [PATCH] 合并代码

---
 AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
index 37fce5c..40eeb41 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
@@ -6,10 +6,12 @@
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.hdl.HdlToLc;
+
+import com.callBack.IAddCamera;
 import com.lechange.demo.R;
 import com.lechange.demo.tools.RootUtil;
 import com.mm.android.deviceaddmodule.utils.SDsolutionUtility;
+import com.utils.HdlToLcUtils;
 
 public class EnvGuideActivity extends Activity implements View.OnClickListener {
     private TextView tvTitleCn;
@@ -64,10 +66,22 @@
         if (id == R.id.tv_title_cn) {
 //            HdlToLc.initData( this,true,"");
         } else if (id == R.id.tv_overseas) {
-            HdlToLc.initData(this,"HDL-HOME-APP-TEST","WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss",false,"St_00003ee84eda32b14126af958052f20a");
         }
 
-        HdlToLc.openActivity();
+        HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com");
+
+        HdlToLcUtils.getInstance().setHomeId("1547099040465408002");
+        HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJiMmYwMTAzYmU4OTM0MmVkYmM0ZTNiM2ZkZGZmOGU1NSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkzNzUxMDUsIm5iZiI6MTY2OTM2NzkwNX0.GRAs6PQxyQrUswj_svLXVDKcmZ679OovaypAMtJiHr8zK6E3Y_DeBUl5S2KjyLXjMetXPgV3Qtpcg3oZqGCzvK5-koBWHwkdbas6C2Z6NVqbGYC-w5qOzY2eUm9zQg8Kz0B9f5TaZYORVeHQr0QgcVTBmrmqT11ZVCH248VxJAQ");
+        HdlToLcUtils.getInstance().setSubAccessToken("St_00009ed748c2b03f4100b6ea97a37466");
+
+//        HdlToLcUtils.getInstance().openActivity();
+        HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
+            @Override
+            public void back() {
+
+            }
+        });
+//        HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
 
     }
 

--
Gitblit v1.8.0