From f6d09ab21edc6a1196ed7db6e0f83e0961bb3278 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 24 十一月 2022 09:39:16 +0800
Subject: [PATCH] Merge branch 'wxr-sdk-test'
---
AndroidOpenDemo/.idea/workspace.xml | 102 +++++++++-----------------------------------------
1 files changed, 19 insertions(+), 83 deletions(-)
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index bc65b4b..c9915ab 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -6,29 +6,23 @@
</shared>
</component>
<component name="AndroidLogFilters">
- <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" />
- <option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
</component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/AndroidManifest123456.xml" beforeDir="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/DeviceUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/DeviceUtils.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/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.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[M7BBB18B19152766]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -134,7 +128,7 @@
<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="1669194142378" />
+ <property name="memory.settings.postsync.last.time.stamp" value="1669180114457" />
<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="project.structure.last.edited" value="Dependencies" />
<property name="project.structure.proportion" value="0.17" />
@@ -146,13 +140,6 @@
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
</component>
<component name="RecentsManager">
- <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
- <recent name="com" />
- </key>
- <key name="CopyClassDialog.RECENTS_KEY">
- <recent name="com.utils" />
- <recent name="com.mm.android.deviceaddmodule.utils" />
- </key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
<recent name="$PROJECT_DIR$/app/src/main/java/com/hdl" />
@@ -160,8 +147,15 @@
<recent name="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi" />
<recent name="$PROJECT_DIR$/app/src/main/res/layout" />
</key>
+ <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="com" />
+ </key>
+ <key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.utils" />
+ <recent name="com.mm.android.deviceaddmodule.utils" />
+ </key>
</component>
- <component name="RunManager" selected="Android App.app">
+ <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -331,7 +325,7 @@
</list>
</recent_temporary>
</component>
- <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration />
</component>
@@ -361,69 +355,6 @@
<ignored-roots>
<path value="$PROJECT_DIR$" />
</ignored-roots>
- </component>
- <component name="WindowStateProjectService">
- <state x="453" y="91" key="#com.intellij.ide.util.MemberChooser" timestamp="1669107811029">
- <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="1669107811029" />
- <state x="180" y="331" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1669107459555">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state x="180" y="331" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1280.800@0.0.1280.800" timestamp="1669107459555" />
- <state x="326" y="276" width="628" height="256" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1669169928930">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state x="326" y="276" width="628" height="256" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1280.800@0.0.1280.800" timestamp="1669169928930" />
- <state x="326" y="288" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.packages" timestamp="1669107461906">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state x="326" y="288" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.packages/0.0.1280.800@0.0.1280.800" timestamp="1669107461905" />
- <state width="503" height="480" key="DebuggerActiveHint" timestamp="1669195478136">
- <screen x="0" y="23" width="1280" height="777" />
- </state>
- <state width="503" height="480" key="DebuggerActiveHint/0.0.1280.800@0.0.1280.800" timestamp="1669194412110" />
- <state width="503" height="480" key="DebuggerActiveHint/0.23.1280.777@0.23.1280.777" timestamp="1669195478136" />
- <state width="1236" height="164" key="GridCell.Tab.0.bottom" timestamp="1669195789335">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669195789335" />
- <state width="1236" height="206" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669007123738" />
- <state width="1236" height="164" key="GridCell.Tab.0.center" timestamp="1669195789334">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669195789333" />
- <state width="1236" height="206" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669007123735" />
- <state width="1236" height="164" key="GridCell.Tab.0.left" timestamp="1669195789333">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669195789333" />
- <state width="1236" height="206" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669007123734" />
- <state width="1236" height="164" key="GridCell.Tab.0.right" timestamp="1669195789334">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669195789334" />
- <state width="1236" height="206" key="GridCell.Tab.0.right/0.23.1280.777@0.23.1280.777" timestamp="1669007123736" />
- <state width="1236" height="164" key="GridCell.Tab.1.bottom" timestamp="1669195789336">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669195789336" />
- <state width="1236" height="164" key="GridCell.Tab.1.center" timestamp="1669195789336">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669195789336" />
- <state width="1236" height="164" key="GridCell.Tab.1.left" timestamp="1669195789335">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669195789335" />
- <state width="1236" height="164" key="GridCell.Tab.1.right" timestamp="1669195789336">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669195789336" />
- <state x="215" y="44" width="1065" height="629" key="find.popup" timestamp="1669195142751">
- <screen x="0" y="0" width="1280" height="800" />
- </state>
- <state x="215" y="44" width="1065" height="629" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669195142751" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -469,14 +400,19 @@
<option name="timeStamp" value="84" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/adapter/DeviceListAdapter.java</url>
+ <line>48</line>
+ <option name="timeStamp" value="92" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceRecordListActivity.java</url>
<line>36</line>
<option name="timeStamp" value="94" />
</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>411</line>
- <option name="timeStamp" value="103" />
+ <line>410</line>
+ <option name="timeStamp" value="98" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
--
Gitblit v1.8.0