From 2af932533ef851bf983385244e9912976dbd4daa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 24 十一月 2022 12:11:08 +0800
Subject: [PATCH] 备份
---
AndroidOpenDemo/.idea/misc.xml | 3 +
AndroidOpenDemo/.idea/workspace.xml | 67 +++++++++++++++++++++-
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java | 8 ++
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java | 6 +
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 22 ++++++-
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java | 2
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java | 8 +-
AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 3
AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml | 4 +
9 files changed, 106 insertions(+), 17 deletions(-)
diff --git a/AndroidOpenDemo/.idea/misc.xml b/AndroidOpenDemo/.idea/misc.xml
index 41d4729..17007bd 100644
--- a/AndroidOpenDemo/.idea/misc.xml
+++ b/AndroidOpenDemo/.idea/misc.xml
@@ -3,8 +3,11 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
+ <entry key="../../../../../layout/custom_preview.xml" value="0.33645833333333336" />
+ <entry key="DeviceAddModule/src/main/res/layout/activity_device_add.xml" value="0.16666666666666666" />
<entry key="app/src/main/res/layout/activity_device_detail.xml" value="0.16666666666666666" />
<entry key="app/src/main/res/layout/activity_device_list.xml" value="0.16666666666666666" />
+ <entry key="app/src/main/res/layout/activity_device_online_media_play.xml" value="0.16666666666666666" />
<entry key="app/src/main/res/layout/activity_device_record_list.xml" value="0.17552083333333332" />
<entry key="app/src/main/res/layout/fragment_device_detail_main.xml" value="0.17552083333333332" />
<entry key="app/src/main/res/layout/item_device_list.xml" value="0.17552083333333332" />
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 23885b5..7d21316 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -14,15 +14,22 @@
</component>
<component name="ChangeListManager">
<list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.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/res/layout/activity_device_online_media_play.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_device_online_media_play.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
+ <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[364c4b3158493098]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -125,6 +132,8 @@
<property name="RunOnceActivity.cidr.known.project.marker" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="android-custom-view/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx/sources/android-29/android/view/View.java_SELECTED" value="View" />
+ <property name="android-custom-view/Users/kaede/Desktop/HdlToLc/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/widget/CommonTitle.java_CommonTitle_DIMENSIONS" value="1080 1920" />
+ <property name="android-custom-view/Users/kaede/Desktop/HdlToLc/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/widget/CommonTitle.java_SELECTED" value="CommonTitle" />
<property name="cidr.known.project.marker" value="true" />
<property name="dart.analysis.tool.window.visible" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -155,7 +164,7 @@
<recent name="com.mm.android.deviceaddmodule.utils" />
</key>
</component>
- <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]">
+ <component name="RunManager" selected="Android App.app">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -408,7 +417,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java</url>
- <line>187</line>
+ <line>191</line>
<option name="timeStamp" value="84" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
@@ -426,6 +435,56 @@
<line>410</line>
<option name="timeStamp" value="98" />
</line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java</url>
+ <line>38</line>
+ <option name="timeStamp" value="112" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java</url>
+ <line>118</line>
+ <option name="timeStamp" value="113" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java</url>
+ <line>115</line>
+ <option name="timeStamp" value="114" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/DeviceAddActivity.java</url>
+ <line>330</line>
+ <option name="timeStamp" value="116" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/DeviceAddActivity.java</url>
+ <line>462</line>
+ <option name="timeStamp" value="117" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_ap/ApBindSuccessFragment.java</url>
+ <line>138</line>
+ <option name="timeStamp" value="118" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java</url>
+ <line>151</line>
+ <option name="timeStamp" value="119" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/DeviceAddActivity.java</url>
+ <line>287</line>
+ <option name="timeStamp" value="120" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java</url>
+ <line>141</line>
+ <option name="timeStamp" value="123" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/presenter/ScanPresenter.java</url>
+ <line>293</line>
+ <option name="timeStamp" value="124" />
+ </line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager>
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
index 93d7dd6..2446cdf 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
@@ -106,9 +106,13 @@
*/
public static BindDeviceData.Response userDeviceBind(BindDeviceData bindDeviceData) throws BusinessException {
HashMap<String, Object> paramsMap = new HashMap<String, Object>();
- paramsMap.put("token", bindDeviceData.data.token);
- paramsMap.put("deviceId", bindDeviceData.data.deviceId);
+// paramsMap.put("token", bindDeviceData.data.token);
+// paramsMap.put("deviceId", bindDeviceData.data.deviceId);
paramsMap.put("code", bindDeviceData.data.code);
+ paramsMap.put("spk","security.ipcam.imou");
+ paramsMap.put("extDevId",bindDeviceData.data.deviceId);
+
+
JsonObject json = HttpSend.execute(paramsMap, CONST.METHOD_BINDDEVICE,DMS_TIME_OUT);
BindDeviceData.Response response = new BindDeviceData.Response();
response.parseData(json);
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
index e0bc9ad..2d51db2 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
@@ -35,7 +35,11 @@
Map<String, Object> map = paramsInit(paramsMap);
JsonObject jsonResult = null;
if (CONST.isHdlServer()) {
- jsonResult = doPost(CONST.HOST + "/home-wisdom/imou/openapi/" + method, map, timeOut);
+ if(method.equals("bindDevice")){
+ jsonResult = doPost(CONST.HOST + "/home-wisdom/app/device/independentRegister", map, timeOut);
+ }else {
+ jsonResult = doPost(CONST.HOST + "/home-wisdom/imou/openapi/" + method, map, timeOut);
+ }
} else {
jsonResult = doPost(CONST.HOST + "/openapi/" + method, map, timeOut);
if (jsonResult == null) {
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java
index 6be6ab2..8c6b649 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_inputsn/ScanFragment.java
@@ -138,7 +138,7 @@
PageNavigationHelper.gotoManualInputPage(this);
return;
}
-
+ //鎵弿浜岀淮鐮�--kaede
mPresenter.getDeviceInfo(scanResult.getSn().trim(), scanResult.getMode());
}
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
index 08de111..ecdcd9a 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java
@@ -577,7 +577,7 @@
mLayoutParams.addRule(RelativeLayout.BELOW, R.id.rl_title);
frLiveWindow.setLayoutParams(mLayoutParams);
MediaPlayHelper.quitFullScreen(DeviceOnlineMediaPlayActivity.this);
- llController.setVisibility(View.VISIBLE);
+ llController.setVisibility(View.GONE);
rlTitle.setVisibility(View.VISIBLE);
llSpeak1.setVisibility(View.GONE);
llCloudStage1.setVisibility(View.GONE);
@@ -601,10 +601,10 @@
MediaPlayHelper.setFullScreen(DeviceOnlineMediaPlayActivity.this);
llController.setVisibility(View.GONE);
rlTitle.setVisibility(View.GONE);
- llSpeak1.setVisibility(View.VISIBLE);
+ llSpeak1.setVisibility(View.GONE);
llCloudStage1.setVisibility(View.VISIBLE);
- llVideo1.setVisibility(View.VISIBLE);
- llScreenShot1.setVisibility(View.VISIBLE);
+ llVideo1.setVisibility(View.GONE);
+ llScreenShot1.setVisibility(View.GONE);
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(frRecord
.getLayoutParams());
layoutParams.removeRule(RelativeLayout.BELOW);
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 807af2e..282fa4e 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
@@ -7,6 +7,7 @@
import android.widget.TextView;
import android.widget.Toast;
+import com.callBack.IAddCamera;
import com.lechange.demo.R;
import com.lechange.demo.tools.RootUtil;
import com.mm.android.deviceaddmodule.utils.SDsolutionUtility;
@@ -70,12 +71,27 @@
HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com");
HdlToLcUtils.getInstance().setHomeId("1547099040465408002");
- HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0YTJhNzZiYTUxNzU0ZmFmODZlYjhhNDZiODUzZWRjMCIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkyMDEzODYsIm5iZiI6MTY2OTE5NDE4Nn0.jlXwyCbdy41f4tkObmnKup6r2xGRzk5fLtHfNgaNSdJ6deyzKFVLQcDH3FMW_AntAo2ghkTQLZGnMXt8k7uoC0fa6XLHA8bTNYvjx4-2X1ky2FMcvv_sDTmmPMo6EbqOeRNkCoiLly2iTB4Ch6FJRSQo0UFkpOJtJJuCCo92B5c");
+ HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI3MmI0OTEwYWRkYmE0ZjA3YjAxNzQxYmZhOGIzOTIyMSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkyNTk5NTUsIm5iZiI6MTY2OTI1Mjc1NX0.T0Ni3_QGu25At2UNmsqB3lfo_ueRUZTmeRLbeVK4JpvqzwlwYykCnxXZ6pyWmTPEtAvsr68e8xSIMTKp1J8X61CXipHjRBBvgOkcwpuS-436RCQR3cg_uaCQ4Ac63C6N6G94FG6zukbSYRbgBaBQqKcOBbqEYD0hCa8BaXg6sCM");
HdlToLcUtils.getInstance().setSubAccessToken("St_00003ee84eda32b14126af958052f20a");
// HdlToLcUtils.getInstance().openActivity();
- //HdlToLcUtils.getInstance().addCamera();
- HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
+ HdlToLcUtils.getInstance().addCamera(new IAddCamera() {
+ @Override
+ public void success(String deviceId) {
+
+ }
+
+ @Override
+ public void onError(String errMsg) {
+
+ }
+
+ @Override
+ public void back() {
+
+ }
+ });
+// HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");
}
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 e00bd8f..6aaf1d6 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
@@ -180,7 +180,8 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/lc_demo_color_442c2c2c"
- android:gravity="center">
+ android:gravity="center"
+ android:visibility="gone">
<ImageView
android:id="@+id/iv_sound"
@@ -277,6 +278,7 @@
android:layout_height="@dimen/px_140"
android:layout_marginBottom="@dimen/px_20"
android:background="@color/lc_demo_color_ffffff"
+ android:visibility="gone"
android:paddingLeft="@dimen/px_30"
android:paddingRight="@dimen/px_30">
diff --git a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
index 6dc6914..ede31b8 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
@@ -167,7 +167,8 @@
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/px_50"
android:background="@color/lc_demo_color_ffffff"
- android:gravity="center_vertical">
+ android:gravity="center_vertical"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
--
Gitblit v1.8.0