From f07847295b3715eaac6095068adc1e8439c22223 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期二, 22 十一月 2022 17:49:54 +0800 Subject: [PATCH] 完善细节 --- AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 24 +++++++++++------------- AndroidOpenDemo/.idea/workspace.xml | 23 ++++++++++------------- AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 8 +++++--- AndroidOpenDemo/app/src/main/java/com/lechange/demo/App.java | 4 ++-- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml index 848df7b..3079c58 100644 --- a/AndroidOpenDemo/.idea/workspace.xml +++ b/AndroidOpenDemo/.idea/workspace.xml @@ -15,13 +15,10 @@ </component> <component name="ChangeListManager"> <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment=""> - <change afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/DeviceUtils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/HdlToLc.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/net/IUserDataCallBack.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/net/IUserDataCallBack.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/app/src/main/java/com/hdl/net/UserNetManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/net/UserNetManager.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/App.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/App.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -367,25 +364,25 @@ </state> <state width="503" height="480" key="DebuggerActiveHint/0.0.1280.800@0.0.1280.800" timestamp="1669108173504" /> <state width="462" height="480" key="DebuggerActiveHint/0.23.1280.777@0.23.1280.777" timestamp="1669100189203" /> - <state width="1236" height="287" key="GridCell.Tab.0.bottom" timestamp="1669108419917"> + <state width="1236" height="441" key="GridCell.Tab.0.bottom" timestamp="1669109814728"> <screen x="0" y="0" width="1280" height="800" /> </state> - <state width="1236" height="287" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669108419917" /> + <state width="1236" height="441" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669109814728" /> <state width="1236" height="206" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669007123738" /> - <state width="1236" height="287" key="GridCell.Tab.0.center" timestamp="1669108419916"> + <state width="1236" height="441" key="GridCell.Tab.0.center" timestamp="1669109814726"> <screen x="0" y="0" width="1280" height="800" /> </state> - <state width="1236" height="287" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669108419916" /> + <state width="1236" height="441" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669109814726" /> <state width="1236" height="206" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669007123735" /> - <state width="1236" height="287" key="GridCell.Tab.0.left" timestamp="1669108419916"> + <state width="1236" height="441" key="GridCell.Tab.0.left" timestamp="1669109814725"> <screen x="0" y="0" width="1280" height="800" /> </state> - <state width="1236" height="287" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669108419916" /> + <state width="1236" height="441" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669109814725" /> <state width="1236" height="206" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669007123734" /> - <state width="1236" height="287" key="GridCell.Tab.0.right" timestamp="1669108419917"> + <state width="1236" height="441" key="GridCell.Tab.0.right" timestamp="1669109814726"> <screen x="0" y="0" width="1280" height="800" /> </state> - <state width="1236" height="287" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669108419917" /> + <state width="1236" height="441" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669109814726" /> <state width="1236" height="206" key="GridCell.Tab.0.right/0.23.1280.777@0.23.1280.777" timestamp="1669007123736" /> <state width="1236" height="287" key="GridCell.Tab.1.bottom" timestamp="1669108419920"> <screen x="0" y="0" width="1280" height="800" /> diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/App.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/App.java index 4bb3afc..06dbdc5 100644 --- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/App.java +++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/App.java @@ -1,6 +1,7 @@ package com.lechange.demo; import android.app.Application; +import android.content.Intent; import com.common.openapi.ClassInstanceManager; import com.lechange.demo.tools.MediaPlayHelper; @@ -14,7 +15,6 @@ // ARouter.openLog(); // ARouter.init(this); // MediaPlayHelper.initContext(getApplicationContext()); - ClassInstanceManager.newInstance().init(this); - +// ClassInstanceManager.newInstance().init(this); } } \ No newline at end of file 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 d4b138c..ffe7386 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 @@ -65,13 +65,15 @@ if (id == R.id.tv_title_cn) { // HdlToLc.initData( this,true,""); } else if (id == R.id.tv_overseas) { - HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", false); } + HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com"); + HdlToLcUtils.getInstance().setHomeId("1547099040465408002"); - HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIzMTI5ZjNlMDAwY2Q0YzhiOTgyYjUyNTk5MTE2MTJlMCIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkxMDkxMjcsIm5iZiI6MTY2OTEwMTkyN30.TIyMqggqbaYoBEApeHTq3AidoKWZt5HpO2eUkhn_58VslSTxc-NhHwclTHjLpdVaMklJk1HMLQLwPOiJGhbUksOewO2dStzW1xYOpb_6zDs6Rw6v0h5cKmAYOf1f1S6RLqF2EHigf9fyy090ClWYcJo-9c_CFBXir4Y1lzDmLZQ"); + HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIxYTNiZjA4M2I3ZTc0NDJjYjM0Y2RhMGFhOGViZTFhOSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkxMTcwMDcsIm5iZiI6MTY2OTEwOTgwN30.bwBRv568IiwkmdRJSt6aRYny5cd3eMqLXP8gal03z1d8O6FPsrLwlTi7VXIBeulg6Qie1GKUUI28cGrEuGWpWwOiJFsoYl1r04ycCuGf2NqbCOOM8hxbUkhehY7H91v9b_mCF0zQDIQXowT6BvcOMoMsqIWVIz-QMRG8OQICB7k"); HdlToLcUtils.getInstance().setSubAccessToken("St_00003ee84eda32b14126af958052f20a"); -// HdlToLcUtils.getInstance().openActivity(); + + //HdlToLcUtils.getInstance().openActivity(); //HdlToLcUtils.getInstance().AddCamera(); HdlToLcUtils.getInstance().play("8F05F83AAG05B3A"); diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java index 06a9b33..fce5f7a 100644 --- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java +++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java @@ -50,29 +50,27 @@ return instance; } - public void initData(Activity activity, String appKey, String secretKey, boolean isChina) { + public void initData(Activity activity, String appKey, String secretKey,String url) { this.activity = activity; MediaPlayHelper.initContext(activity.getApplication().getApplicationContext()); - ClassInstanceManager.newInstance().init(activity.getApplication()); - String mUrl; - if (isChina) { -// mAppSecret = "f869433de68a4a06bb8f9bb89118fc"; -// mAppid = "lc2ea929282d5f4636"; - mUrl = CONST.Envirment.CHINA_TEST.url; - ProviderManager.getAppProvider().setAppType(0); - } else { + ClassInstanceManager.newInstance().init(activity.getApplication().getApplicationContext()); +// if (isChina) { +//// 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; - mUrl=CONST.Envirment.CHINA_TEST.url; - ProviderManager.getAppProvider().setAppType(1); - } + ProviderManager.getAppProvider().setAppType(1); +// } try { CommonParam commonParam = new CommonParam(); - commonParam.setEnvirment(mUrl);//浜戠杩炴帴 + commonParam.setEnvirment(url);//浜戠杩炴帴 commonParam.setContext(activity.getApplication()); commonParam.setAppId(appKey); commonParam.setAppSecret(secretKey); -- Gitblit v1.8.0