From 2a8632ea01505603ba5b0812995e68efbd0fe249 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 25 十一月 2022 17:44:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wxr/HdlToLc into dev
---
AndroidOpenDemo/.idea/workspace.xml | 166 ++++++++++++++-----------------------------------------
1 files changed, 43 insertions(+), 123 deletions(-)
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 6fac68e..142784c 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -6,7 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_CUSTOM_FILTER" value="reqest: " />
+ <option name="TOOL_WINDOW_CUSTOM_FILTER" value="HttpSend" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
@@ -15,15 +15,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java" 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/HttpClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.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$/app/src/main/java/com/hdl/HdlToLc.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/HdlToLc.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.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/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" />
@@ -62,6 +57,19 @@
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
<item name="app" type="2d1252cf:ModuleNode" />
+ </path>
+ <path>
+ <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+ <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
+ <item name="app" type="2d1252cf:ModuleNode" />
+ <item name="Tasks" type="e4a08cd1:TasksNode" />
+ </path>
+ <path>
+ <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+ <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
+ <item name="app" type="2d1252cf:ModuleNode" />
+ <item name="Tasks" type="e4a08cd1:TasksNode" />
+ <item name="build" type="c8890929:TasksNode$1" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
@@ -113,33 +121,29 @@
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
- <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="M7BBB18B19152766" />
- <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2022-11-21T06:37:44.567Z" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<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="cidr.known.project.marker" value="true" />
<property name="dart.analysis.tool.window.visible" value="false" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="memory.settings.postsync.last.time.stamp" value="1668998991362" />
- <property name="multi-representation-preview/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx/sources/android-29/android/view/View.java_selected" value="Custom views" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/DeviceAddModule/libs" />
+ <property name="memory.settings.postsync.last.time.stamp" value="1669278541025" />
<property name="project.structure.last.edited" value="Dependencies" />
<property name="project.structure.proportion" value="0.17" />
<property name="project.structure.side.proportion" value="0.2" />
- <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
+ <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
<property name="show.migrate.to.gradle.popup" value="false" />
</component>
<component name="PsdUISettings">
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
</component>
<component name="RecentsManager">
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
+ </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="com" />
- </key>
- <key name="CopyClassDialog.RECENTS_KEY">
- <recent name="com.mm.android.deviceaddmodule.utils" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
@@ -290,10 +294,10 @@
<GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" />
</configuration>
- <configuration name="AndroidOpenDemo:usermodule [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+ <configuration name="AndroidOpenDemo:third-zxing [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
- <option name="externalProjectPath" value="$PROJECT_DIR$/usermodule" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$/third-zxing" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
@@ -313,9 +317,9 @@
<list>
<item itemvalue="Gradle.AndroidOpenDemo:app [assembleRelease]" />
<item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]" />
+ <item itemvalue="Gradle.AndroidOpenDemo:third-zxing [assembleRelease]" />
<item itemvalue="Gradle.AndroidOpenDemo:app [assembleDebug]" />
<item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleDebug]" />
- <item itemvalue="Gradle.AndroidOpenDemo:usermodule [assembleRelease]" />
</list>
</recent_temporary>
</component>
@@ -351,125 +355,41 @@
</ignored-roots>
</component>
<component name="WindowStateProjectService">
- <state x="453" y="91" key="#com.intellij.ide.util.MemberChooser" timestamp="1669099481115">
+ <state width="1236" height="362" key="GridCell.Tab.0.bottom" timestamp="1669368743267">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state x="453" y="91" key="#com.intellij.ide.util.MemberChooser/0.0.1280.800@0.0.1280.800" timestamp="1669099481115" />
- <state width="462" height="480" key="DebuggerActiveHint" timestamp="1669100189203">
- <screen x="0" y="23" width="1280" height="777" />
- </state>
- <state width="462" height="480" key="DebuggerActiveHint/0.0.1280.800@0.0.1280.800" timestamp="1669096140301" />
- <state width="462" height="480" key="DebuggerActiveHint/0.23.1280.777@0.23.1280.777" timestamp="1669100189203" />
- <state width="1236" height="288" key="GridCell.Tab.0.bottom" timestamp="1669100498343">
+ <state width="1236" height="362" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669368743267" />
+ <state width="1236" height="362" key="GridCell.Tab.0.center" timestamp="1669368743265">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669100498343" />
- <state width="1236" height="206" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669007123738" />
- <state width="1236" height="288" key="GridCell.Tab.0.center" timestamp="1669100498342">
+ <state width="1236" height="362" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669368743265" />
+ <state width="1236" height="362" key="GridCell.Tab.0.left" timestamp="1669368743264">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669100498342" />
- <state width="1236" height="206" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669007123735" />
- <state width="1236" height="288" key="GridCell.Tab.0.left" timestamp="1669100498341">
+ <state width="1236" height="362" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669368743264" />
+ <state width="1236" height="362" key="GridCell.Tab.0.right" timestamp="1669368743266">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669100498341" />
- <state width="1236" height="206" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669007123734" />
- <state width="1236" height="288" key="GridCell.Tab.0.right" timestamp="1669100498342">
+ <state width="1236" height="362" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669368743266" />
+ <state width="1236" height="164" key="GridCell.Tab.1.bottom" timestamp="1669279002690">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669100498342" />
- <state width="1236" height="206" key="GridCell.Tab.0.right/0.23.1280.777@0.23.1280.777" timestamp="1669007123736" />
- <state width="1236" height="288" key="GridCell.Tab.1.bottom" timestamp="1669100498345">
+ <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669279002690" />
+ <state width="1236" height="164" key="GridCell.Tab.1.center" timestamp="1669279002687">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669100498345" />
- <state width="1236" height="288" key="GridCell.Tab.1.center" timestamp="1669100498344">
+ <state width="1236" height="164" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669279002687" />
+ <state width="1236" height="164" key="GridCell.Tab.1.left" timestamp="1669279002687">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669100498344" />
- <state width="1236" height="288" key="GridCell.Tab.1.left" timestamp="1669100498344">
+ <state width="1236" height="164" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669279002687" />
+ <state width="1236" height="164" key="GridCell.Tab.1.right" timestamp="1669279002690">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669100498344" />
- <state width="1236" height="288" key="GridCell.Tab.1.right" timestamp="1669100498345">
+ <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669279002690" />
+ <state x="332" y="155" width="774" height="490" key="find.popup" timestamp="1669368850354">
<screen x="0" y="0" width="1280" height="800" />
</state>
- <state width="1236" height="288" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669100498345" />
- <state x="332" y="155" width="769" height="518" key="find.popup" timestamp="1669100335613">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state x="332" y="155" width="769" height="518" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669100335613" />
- </component>
- <component name="XDebuggerManager">
- <breakpoint-manager>
- <breakpoints>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>jar://$PROJECT_DIR$/DeviceAddModule/libs/lechangeSDK.jar!/com/lechange/opensdk/media/LCOpenSDK_ParamReal.class</url>
- <line>46</line>
- <option name="timeStamp" value="2" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java</url>
- <line>1085</line>
- <option name="timeStamp" value="4" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceSubAccountListService.java</url>
- <line>19</line>
- <option name="timeStamp" value="11" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java</url>
- <line>112</line>
- <option name="timeStamp" value="21" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java</url>
- <line>108</line>
- <option name="timeStamp" value="26" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java</url>
- <line>237</line>
- <option name="timeStamp" value="40" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceLocalRecordListFragment.java</url>
- <line>295</line>
- <option name="timeStamp" value="47" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceLocalRecordListFragment.java</url>
- <line>301</line>
- <option name="timeStamp" value="48" />
- </line-breakpoint>
- <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java</url>
- <line>77</line>
- <option name="timeStamp" value="61" />
- </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>186</line>
- <option name="timeStamp" value="84" />
- </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>102</line>
- <option name="timeStamp" value="86" />
- </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>100</line>
- <option name="timeStamp" value="87" />
- </line-breakpoint>
- </breakpoints>
- </breakpoint-manager>
- <watches-manager>
- <configuration name="app">
- <watch expression="LCDeviceEngine.newInstance().subAccessToken" language="JAVA" />
- </configuration>
- </watches-manager>
+ <state x="332" y="155" width="774" height="490" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669368850354" />
</component>
</project>
\ No newline at end of file
--
Gitblit v1.8.0