From b01eb4ec0468ad08f5ae7a92c5e2e7be3096330a Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 22 十一月 2022 15:33:37 +0800
Subject: [PATCH] 完成子账号功能

---
 AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java |   42 +++++++++++++++++-------------------------
 1 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java b/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java
index 930fa7f..1331223 100644
--- a/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java
+++ b/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java
@@ -18,57 +18,49 @@
 import com.usermodule.net.UserNetManager;
 
 public class HdlToLc {
-    private static String mAppid;
-    private static String mAppSecret;
-    private static String mUrl;
-//    private static String mOpenId;
-
-    /**
-     * 瀛愯处鍙穞oken
-     */
-    private static String mSubToken;
 
     private static Activity mActivity;
 
-    public static void initData(Activity activity, boolean isChina,String subToken) {
+    public static void initData(Activity activity,String appKey,String secretKey, boolean isChina) {
         mActivity = activity;
-        mSubToken = subToken;
         MediaPlayHelper.initContext(mActivity.getApplication().getApplicationContext());
         ClassInstanceManager.newInstance().init(mActivity.getApplication());
+        String mUrl;
         if (isChina) {
-            mAppSecret = "f869433de68a4a06bb8f9bb89118fc";
-            mAppid = "lc2ea929282d5f4636";
+//            mAppSecret = "f869433de68a4a06bb8f9bb89118fc";
+//            mAppid = "lc2ea929282d5f4636";
             mUrl = CONST.Envirment.CHINA_TEST.url;
             ProviderManager.getAppProvider().setAppType(0);
         } else {
-            mAppSecret = "017fc27bb987496f9a677e4e6f0c88";
-            mAppid = "lc0285433bc7e8423d";
-            mUrl = CONST.Envirment.OVERSEAS_PRO.url;
+//            mAppSecret = "017fc27bb987496f9a677e4e6f0c88";
+//            mAppid = "lc0285433bc7e8423d";
+//            mUrl = CONST.Envirment.OVERSEAS_PRO.url;
+            mUrl=CONST.Envirment.CHINA_TEST.url;
             ProviderManager.getAppProvider().setAppType(1);
         }
 
 
-        try {
 
+        try {
             CommonParam commonParam = new CommonParam();
             commonParam.setEnvirment(mUrl);//浜戠杩炴帴
             commonParam.setContext(mActivity.getApplication());
-            commonParam.setAppId(mAppid);
-            commonParam.setAppSecret(mAppSecret);
+            commonParam.setAppId(appKey);
+            commonParam.setAppSecret(secretKey);
+
             //SDK淇℃伅鍒濆鍖�
             LCDeviceEngine.newInstance().init(commonParam);
         } catch (Throwable e) {
             Toast.makeText(mActivity, e.getMessage(), Toast.LENGTH_SHORT).show();
         }
     }
-    public static void openActivity()
-    {
+    public static void openActivity(String homeId,String token,String subAccessToken) {
         try {
-
 //            getSubAccountToken("827a98c98da7469b8bc19bb6a3c7651906");
-            String str = "St_00009073b431d8b2490c9df0c5cb0e73";
-            LCDeviceEngine.newInstance().setSubAccessToken(mSubToken);
-            mActivity.startActivity(new Intent(mActivity,com.lechange.demo.ui.DeviceListActivity.class));
+            LCDeviceEngine.newInstance().setHomeId(homeId);
+            LCDeviceEngine.newInstance().accessToken=(token);
+            LCDeviceEngine.newInstance().setSubAccessToken(subAccessToken);
+            mActivity.startActivity(new Intent(mActivity, com.lechange.demo.ui.DeviceListActivity.class));
         } catch (Throwable e) {
             Toast.makeText(mActivity, e.getMessage(), Toast.LENGTH_SHORT).show();
         }

--
Gitblit v1.8.0