From 535d69817e83737f3da6250fc6fb70da25fc1a4c Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 24 十一月 2022 12:11:36 +0800
Subject: [PATCH] 完善了功能
---
AndroidOpenDemo/.idea/workspace.xml | 100 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index bc65b4b..b6acf35 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -18,10 +18,17 @@
<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$/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/common/openapi/DeviceDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceDetailService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/IGetDeviceInfoCallBack.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/MethodConst.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/common/openapi/MethodConst.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/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/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" />
@@ -133,8 +140,8 @@
<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="1669194142378" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/res/layout" />
+ <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" />
@@ -150,15 +157,16 @@
<recent name="com" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.common.openapi" />
<recent name="com.utils" />
<recent name="com.mm.android.deviceaddmodule.utils" />
</key>
<key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/app/src/main/res/layout" />
+ <recent name="$PROJECT_DIR$/app/src/main/java/com/utils" />
+ <recent name="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui" />
<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" />
</key>
</component>
<component name="RunManager" selected="Android App.app">
@@ -363,67 +371,54 @@
</ignored-roots>
</component>
<component name="WindowStateProjectService">
- <state x="453" y="91" key="#com.intellij.ide.util.MemberChooser" timestamp="1669107811029">
+ <state x="321" y="0" key="#app" timestamp="1669252776150">
<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">
+ <state x="321" y="0" key="#app/0.0.1280.800@0.0.1280.800" timestamp="1669252776150" />
+ <state x="453" y="113" key="#com.intellij.ide.util.MemberChooser" timestamp="1669257253970">
<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">
+ <state x="453" y="113" key="#com.intellij.ide.util.MemberChooser/0.0.1280.800@0.0.1280.800" timestamp="1669257253970" />
+ <state width="1236" height="418" key="GridCell.Tab.0.bottom" timestamp="1669257607924">
<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">
+ <state width="1236" height="418" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669257607924" />
+ <state width="1236" height="164" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669257377595" />
+ <state width="1236" height="418" key="GridCell.Tab.0.center" timestamp="1669257607924">
<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">
+ <state width="1236" height="418" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669257607924" />
+ <state width="1236" height="164" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669257377593" />
+ <state width="1236" height="418" key="GridCell.Tab.0.left" timestamp="1669257607923">
<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">
+ <state width="1236" height="418" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669257607923" />
+ <state width="1236" height="164" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669257377592" />
+ <state width="1236" height="418" key="GridCell.Tab.0.right" timestamp="1669257607924">
<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">
+ <state width="1236" height="418" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669257607924" />
+ <state width="1236" height="164" key="GridCell.Tab.0.right/0.23.1280.777@0.23.1280.777" timestamp="1669257377594" />
+ <state width="1236" height="164" key="GridCell.Tab.1.bottom" timestamp="1669257522605">
<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">
+ <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669257522605" />
+ <state width="1236" height="164" key="GridCell.Tab.1.center" timestamp="1669257522603">
<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">
+ <state width="1236" height="164" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669257522603" />
+ <state width="1236" height="164" key="GridCell.Tab.1.left" timestamp="1669257522602">
<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">
+ <state width="1236" height="164" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669257522602" />
+ <state width="1236" height="164" key="GridCell.Tab.1.right" timestamp="1669257522604">
<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">
+ <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669257522604" />
+ <state x="332" y="155" width="708" height="490" key="find.popup" timestamp="1669259388351">
<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" />
+ <state x="332" y="155" width="708" height="490" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669259388351" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -460,7 +455,7 @@
</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>
+ <line>73</line>
<option name="timeStamp" value="61" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="java-line">
@@ -469,14 +464,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