From 2588ab0681d9ef96f98114a1de018b420e3ee1da Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 11:16:14 +0800
Subject: [PATCH] Merge branch 'dev' into library
---
AndroidOpenDemo/.idea/workspace.xml | 85 +++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 132feed..86c688f 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,10 +15,16 @@
</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/lechange/demo/dialog/RecoverSDCardDialog.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_sd_card_reconver.xml" afterDir="false" />
+ <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$/DeviceAddModule/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/build.gradle" 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/java/com/utils/HdlToLcUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.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" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -124,14 +130,15 @@
<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="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="1668648803566" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/res/layout" />
+ <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">
@@ -139,17 +146,27 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/app/src/main/res/layout" />
+ <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
<recent name="$PROJECT_DIR$/app/src/main/java/com/hdl" />
<recent name="$PROJECT_DIR$/app/src/main/res/drawable" />
<recent name="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi" />
- <recent name="$PROJECT_DIR$/app/src/main/res/layout" />
- <recent name="$PROJECT_DIR$/app/src/main/java/com" />
+ </key>
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="com" />
</key>
</component>
<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$" />
+ <method v="2">
+ <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+ </method>
+ </configuration>
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
<module name="LCAndroidSDKDemo.app" />
<option name="DEPLOY" value="true" />
@@ -293,10 +310,10 @@
<DebugAllEnabled>false</DebugAllEnabled>
<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">
@@ -318,13 +335,16 @@
<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>
- <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="false" />
+ <component name="SvnConfiguration">
+ <configuration />
+ </component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="" />
@@ -356,46 +376,11 @@
<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>1080</line>
- <option name="timeStamp" value="3" />
- </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/common/openapi/DeviceInfoOpenApiManager.java</url>
- <line>340</line>
- <option name="timeStamp" value="12" />
- </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>31</line>
- <option name="timeStamp" value="14" />
- </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>91</line>
- <option name="timeStamp" value="15" />
+ <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java</url>
+ <line>285</line>
+ <option name="timeStamp" value="141" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
- <watches-manager>
- <configuration name="app">
- <watch expression="LCDeviceEngine.newInstance().subAccessToken" language="JAVA" />
- </configuration>
- </watches-manager>
</component>
</project>
\ No newline at end of file
--
Gitblit v1.8.0