From 0d3e6fb21efe6f3c748d9bbece41b1a1e728ac07 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 23 十一月 2022 17:34:23 +0800
Subject: [PATCH] 完善
---
/dev/null | 60 --------------------
AndroidOpenDemo/.idea/modules/LCAndroidSDKDemo.iml | 1
AndroidOpenDemo/.idea/workspace.xml | 22 +-----
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 4
AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java | 42 +++++++++-----
AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml | 1
6 files changed, 36 insertions(+), 94 deletions(-)
diff --git a/AndroidOpenDemo/.idea/modules/LCAndroidSDKDemo.iml b/AndroidOpenDemo/.idea/modules/LCAndroidSDKDemo.iml
index 960f337..04302d0 100644
--- a/AndroidOpenDemo/.idea/modules/LCAndroidSDKDemo.iml
+++ b/AndroidOpenDemo/.idea/modules/LCAndroidSDKDemo.iml
@@ -3,6 +3,7 @@
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
+ <option name="BUILD_FOLDER_PATH" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 1997a08..c9915ab 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -171,7 +171,6 @@
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="ALL_USERS" value="false" />
- <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
@@ -179,7 +178,6 @@
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -238,9 +236,7 @@
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
- <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
- <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
- <DebugAllEnabled>false</DebugAllEnabled>
+ <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:DeviceAddModule [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -259,9 +255,7 @@
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
- <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
- <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
- <DebugAllEnabled>false</DebugAllEnabled>
+ <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:app [assembleDebug]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -280,9 +274,7 @@
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
- <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
- <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
- <DebugAllEnabled>false</DebugAllEnabled>
+ <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:app [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -301,9 +293,7 @@
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
- <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
- <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
- <DebugAllEnabled>false</DebugAllEnabled>
+ <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" />
</configuration>
<configuration name="AndroidOpenDemo:usermodule [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -322,9 +312,7 @@
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
- <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
- <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
- <DebugAllEnabled>false</DebugAllEnabled>
+ <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" />
</configuration>
<recent_temporary>
diff --git a/AndroidOpenDemo/app/AndroidManifest123456.xml b/AndroidOpenDemo/app/AndroidManifest123456.xml
deleted file mode 100644
index f4f2a99..0000000
--- a/AndroidOpenDemo/app/AndroidManifest123456.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.lechange.demo">
-
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
- <application
- android:name=".App"
- android:debuggable="false"
- android:allowBackup="false"
- android:icon="@mipmap/sdk_launcher"
- android:label="@string/app_name"
- android:roundIcon="@mipmap/sdk_launcher"
- android:supportsRtl="false"
- android:theme="@style/AppTheme"
- tools:replace="android:allowBackup,android:label,android:supportsRtl">
- <activity
- android:name=".ui.EnvGuideActivity"
- android:configChanges="orientation|keyboardHidden|screenSize|locale"
- android:launchMode="singleTop"
- android:screenOrientation="portrait">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity
- android:name=".ui.DeviceListActivity"
- android:configChanges="orientation|keyboardHidden|screenSize|locale"
- android:launchMode="singleTop"
- android:exported="false"
- android:screenOrientation="portrait"></activity>
- <activity
- android:name=".ui.DeviceDetailActivity"
- android:configChanges="orientation|keyboardHidden|screenSize|locale"
- android:launchMode="singleTop"
- android:exported="false"
- android:screenOrientation="portrait"></activity>
- <activity
- android:name=".ui.DeviceOnlineMediaPlayActivity"
- android:configChanges="orientation|keyboardHidden|screenSize|locale"
- android:launchMode="singleTop"
- android:exported="false"
- android:screenOrientation="portrait"></activity>
- <activity
- android:name=".ui.DeviceRecordListActivity"
- android:configChanges="orientation|keyboardHidden|screenSize|locale"
- android:launchMode="singleTop"
- android:exported="false"
- android:screenOrientation="portrait"></activity>
- <activity
- android:name=".ui.DeviceRecordPlayActivity"
- android:configChanges="orientation|keyboardHidden|screenSize|locale"
- android:launchMode="singleTop"
- android:exported="false"
- android:screenOrientation="portrait"></activity>
- </application>
-</manifest>
\ 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 0b65c32..807af2e 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
@@ -70,10 +70,10 @@
HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com");
HdlToLcUtils.getInstance().setHomeId("1547099040465408002");
- HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIxYTNiZjA4M2I3ZTc0NDJjYjM0Y2RhMGFhOGViZTFhOSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkxMTcwMDcsIm5iZiI6MTY2OTEwOTgwN30.bwBRv568IiwkmdRJSt6aRYny5cd3eMqLXP8gal03z1d8O6FPsrLwlTi7VXIBeulg6Qie1GKUUI28cGrEuGWpWwOiJFsoYl1r04ycCuGf2NqbCOOM8hxbUkhehY7H91v9b_mCF0zQDIQXowT6BvcOMoMsqIWVIz-QMRG8OQICB7k");
+ HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0YTJhNzZiYTUxNzU0ZmFmODZlYjhhNDZiODUzZWRjMCIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkyMDEzODYsIm5iZiI6MTY2OTE5NDE4Nn0.jlXwyCbdy41f4tkObmnKup6r2xGRzk5fLtHfNgaNSdJ6deyzKFVLQcDH3FMW_AntAo2ghkTQLZGnMXt8k7uoC0fa6XLHA8bTNYvjx4-2X1ky2FMcvv_sDTmmPMo6EbqOeRNkCoiLly2iTB4Ch6FJRSQo0UFkpOJtJJuCCo92B5c");
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/DeviceUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
index ac96eb4..05bef9f 100644
--- a/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
+++ b/AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java
@@ -28,7 +28,7 @@
public DeviceUtils(String deviceId){
this.deviceId=deviceId;
}
- private List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
+ private static List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
private void getDeviceList() {
DeviceSubAccountListService deviceSubAccountListService = ClassInstanceManager.newInstance().getDeviceSubAccountListService();
@@ -36,22 +36,21 @@
}
public void play() {
- if (datas.size() == 0) {
- getDeviceList();
- } else {
- for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
- if (deviceListBean.deviceId.equals(deviceId)) {
- if (!deviceListBean.status.equals("online")) {
- return;
- }
- Bundle bundle = new Bundle();
- bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
- Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
- intent.putExtras(bundle);
- HdlToLcUtils.getInstance().getActivity().startActivity(intent);
+ for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
+ if (deviceListBean.deviceId.equals(deviceId)) {
+ if (!deviceListBean.status.equals("online")) {
+ return;
}
+ Bundle bundle = new Bundle();
+ bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
+ Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
+ intent.putExtras(bundle);
+ HdlToLcUtils.getInstance().getActivity().startActivity(intent);
+
+ return;
}
}
+ getDeviceList();
}
@Override
public void DeviceList(DeviceDetailListData.Response responseData) {
@@ -73,7 +72,20 @@
datas.addAll(responseData.data.deviceList);
- play();
+ for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
+ if (deviceListBean.deviceId.equals(deviceId)) {
+ if (!deviceListBean.status.equals("online")) {
+ return;
+ }
+ Bundle bundle = new Bundle();
+ bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
+ Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
+ intent.putExtras(bundle);
+ HdlToLcUtils.getInstance().getActivity().startActivity(intent);
+
+ return;
+ }
+ }
}
@Override
public void onError(Throwable throwable) {
diff --git a/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml b/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml
index aa7928b..e00bd8f 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml
@@ -338,6 +338,7 @@
</LinearLayout>
<FrameLayout
+ android:visibility="gone"
android:layout_below="@id/ll_controller"
android:id="@+id/fr_record"
android:layout_width="match_parent"
--
Gitblit v1.8.0