From 68d9078b49cfa8e83ed553835b05d4042c183969 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 09:39:34 +0800
Subject: [PATCH] 云台不显示问题修复，LC问题
---
AndroidOpenDemo/.idea/workspace.xml | 92 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 0a9f565..47c46f0 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -6,7 +6,6 @@
</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" />
</component>
@@ -15,20 +14,14 @@
</component>
<component name="ChangeListManager">
<list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHMobileToolset_1_1_1_aar.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHScanner_1_0_7_aar.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_PullToRefreshListView_release_aar.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.xml" beforeDir="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$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.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/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/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$/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/layout/fragment_device_detail_name.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_name.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" />
- <change beforePath="$PROJECT_DIR$/third-zxing/src/main/res/values/colors_ui.xml" beforeDir="false" afterPath="$PROJECT_DIR$/third-zxing/src/main/res/values/colors_ui.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,24 +54,6 @@
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
- </path>
- <path>
- <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" />
@@ -137,7 +112,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$/app/src/main/res/layout" />
- <property name="memory.settings.postsync.last.time.stamp" value="1670203339524" />
+ <property name="memory.settings.postsync.last.time.stamp" value="1676946748415" />
<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" />
@@ -162,7 +137,7 @@
<recent name="com" />
</key>
</component>
- <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]">
+ <component name="RunManager" selected="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -336,15 +311,15 @@
</configuration>
<recent_temporary>
<list>
- <item itemvalue="Gradle.AndroidOpenDemo:app [assembleRelease]" />
<item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]" />
+ <item itemvalue="Gradle.AndroidOpenDemo:app [assembleRelease]" />
<item itemvalue="Gradle.AndroidOpenDemo:third-zxing [assembleRelease]" />
<item itemvalue="Gradle.AndroidOpenDemo:app [assembleDebug]" />
<item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleDebug]" />
</list>
</recent_temporary>
</component>
- <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="false" />
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration />
</component>
@@ -376,15 +351,54 @@
</ignored-roots>
</component>
<component name="XDebuggerManager">
+ <breakpoint-manager>
+ <breakpoints>
+ <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>57</line>
+ <option name="timeStamp" value="6" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java</url>
+ <line>163</line>
+ <option name="timeStamp" value="13" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java</url>
+ <line>160</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/mobilecommon/base/BaseFragmentActivity.java</url>
+ <line>181</line>
+ <option name="timeStamp" value="15" />
+ </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>71</line>
+ <option name="timeStamp" value="18" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java</url>
+ <line>47</line>
+ <option name="timeStamp" value="19" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java</url>
+ <line>51</line>
+ <option name="timeStamp" value="20" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+ <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/mobilecommon/base/BaseFragmentActivity.java</url>
+ <line>142</line>
+ <option name="timeStamp" value="24" />
+ </line-breakpoint>
+ </breakpoints>
+ </breakpoint-manager>
<watches-manager>
<configuration name="app">
- <watch expression="openApi" language="JAVA" />
- <watch expression="new Gson().fromJson(openApi,JsonObject.class);" language="JAVA" />
- <watch expression="e.getMessage()" language="JAVA" />
- <watch expression="exception" language="JAVA" />
- <watch expression="jsonResult.get("msg").getAsString()" language="JAVA" />
- <watch expression="jsonObject" language="JAVA" />
- <watch expression="jsonResult.get("code").getAsString()" language="JAVA" />
+ <watch expression="addBaseDialogFragment();" language="JAVA" />
+ <watch expression="intent.getStringExtra("data");" language="JAVA" />
</configuration>
</watches-manager>
</component>
--
Gitblit v1.8.0