From 2588ab0681d9ef96f98114a1de018b420e3ee1da Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 十二月 2022 11:16:14 +0800 Subject: [PATCH] Merge branch 'dev' into library --- AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 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 829988d..d2b7f64 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; @@ -62,12 +64,24 @@ public void onClick(View v) { int id = v.getId(); if (id == R.id.tv_title_cn) { - HdlToLc.initData( this,true,""); +// HdlToLc.initData( this,true,""); } else if (id == R.id.tv_overseas) { - HdlToLc.initData(this,false,"St_00009073b431d8b2490c9df0c5cb0e73"); } - HdlToLc.openActivity(); + HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com"); + + HdlToLcUtils.getInstance().setHomeId("1547099040465408002"); + HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJiZTAzNDE1MTZkMDg0YmNhOGZjM2U5ZTA3OWMzZWY5ZSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2Njk4NzAxNjQsIm5iZiI6MTY2OTg2Mjk2NH0.kCDl6u7hL4bS-tpf5f_jEQ1Hjhj2_65v3cDJBbvVpfOYE8k6NShJjyIVHLUaY0EXWygF6uc-w9izNWksGHWKPOE_7BWnwJrHAJKq6hxbhhJ-9LjU0AG2p9Wxf48CeAyHyT5l71IAoUA_25rZi4GwXB6OkGYbO4-i-L0ZjszJUJU"); + HdlToLcUtils.getInstance().setSubAccessToken("St_00009ed748c2b03f4100b6ea97a37466"); + +// HdlToLcUtils.getInstance().openActivity(); +// HdlToLcUtils.getInstance().addCamera(new IAddCamera() { +// @Override +// public void back() { +// +// } +// }); + HdlToLcUtils.getInstance().play("8F05F83AAG05B3A","xxxx"); } -- Gitblit v1.8.0