From 15b3ee439476e88df66991afb4e0a4d7a8e73422 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十一月 2022 15:14:35 +0800
Subject: [PATCH] 备份
---
AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml | 9
AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml | 5
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java | 96 ++++++++
AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java | 16 +
AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml | 3
/dev/null | 9
AndroidOpenDemo/.idea/misc.xml | 11 +
AndroidOpenDemo/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml | 3
AndroidOpenDemo/.idea/workspace.xml | 131 +++++++++--
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java | 35 +++
AndroidOpenDemo/DeviceAddModule/libs/gson-2.8.8.jar | 0
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HDLMD5Utils.java | 183 ++++++++++++++++
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java | 18
AndroidOpenDemo/DeviceAddModule/build.gradle | 1
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java | 26 +-
AndroidOpenDemo/app/src/main/res/layout/activity_device_list.xml | 26 +-
AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 32 +-
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java | 2
18 files changed, 509 insertions(+), 97 deletions(-)
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_imageload4dh_jar.xml b/AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_imageload4dh_jar.xml
deleted file mode 100644
index 300c62f..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_imageload4dh_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: ./DeviceAddModule/libs/imageload4dh.jar">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/DeviceAddModule/libs/imageload4dh.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_lechangeSDK_jar.xml b/AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_lechangeSDK_jar.xml
deleted file mode 100644
index e3646fd..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_lechangeSDK_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: ./DeviceAddModule/libs/lechangeSDK.jar">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/DeviceAddModule/libs/lechangeSDK.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHMobileToolset_1_1_1_aar_f7d8eb2f1804db3345ec5a537e5ec0db.xml b/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHMobileToolset_1_1_1_aar_f7d8eb2f1804db3345ec5a537e5ec0db.xml
deleted file mode 100644
index 417cf1b..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHMobileToolset_1_1_1_aar_f7d8eb2f1804db3345ec5a537e5ec0db.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: ./../../../.gradle/caches/transforms-1/files-1.1/DHMobileToolset-1.1.1.aar/f7d8eb2f1804db3345ec5a537e5ec0db">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/DHMobileToolset-1.1.1.aar/f7d8eb2f1804db3345ec5a537e5ec0db/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/DHMobileToolset-1.1.1.aar/f7d8eb2f1804db3345ec5a537e5ec0db/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHScanner_1_0_7_aar_0ecd90b9bed2580cb7702e452029b5fe.xml b/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHScanner_1_0_7_aar_0ecd90b9bed2580cb7702e452029b5fe.xml
deleted file mode 100644
index b9075b0..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHScanner_1_0_7_aar_0ecd90b9bed2580cb7702e452029b5fe.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: ./../../../.gradle/caches/transforms-1/files-1.1/DHScanner-1.0.7.aar/0ecd90b9bed2580cb7702e452029b5fe">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/DHScanner-1.0.7.aar/0ecd90b9bed2580cb7702e452029b5fe/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/DHScanner-1.0.7.aar/0ecd90b9bed2580cb7702e452029b5fe/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_PullToRefreshListView_release_aar_1232b6310601f161610e5eb82d661087.xml b/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_PullToRefreshListView_release_aar_1232b6310601f161610e5eb82d661087.xml
deleted file mode 100644
index 3c3411a..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_PullToRefreshListView_release_aar_1232b6310601f161610e5eb82d661087.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: ./../../../.gradle/caches/transforms-1/files-1.1/PullToRefreshListView-release.aar/1232b6310601f161610e5eb82d661087">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/PullToRefreshListView-release.aar/1232b6310601f161610e5eb82d661087/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/PullToRefreshListView-release.aar/1232b6310601f161610e5eb82d661087/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle____third_zxing_libs_zxing_3_3_0_jar.xml b/AndroidOpenDemo/.idea/libraries/Gradle____third_zxing_libs_zxing_3_3_0_jar.xml
deleted file mode 100644
index d066d24..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle____third_zxing_libs_zxing_3_3_0_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: ./third-zxing/libs/zxing_3.3.0.jar">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/third-zxing/libs/zxing_3.3.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml b/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
deleted file mode 100644
index 8100439..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: android.arch.core:common:1.1.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
deleted file mode 100644
index 9259dd4..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: android.arch.core:runtime:1.1.1@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/f3914d400c29aab655fe9080500f1c18/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/f3914d400c29aab655fe9080500f1c18/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml b/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
deleted file mode 100644
index 0d77ad2..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: android.arch.lifecycle:common:1.1.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
deleted file mode 100644
index f20ad41..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/2dafc25bec144912cd7baa2b06103bf0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/2dafc25bec144912cd7baa2b06103bf0/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
deleted file mode 100644
index 3ab1fa7..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/51cf83ab2bb2c1ff34397b3858b71eff/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/51cf83ab2bb2c1ff34397b3858b71eff/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
deleted file mode 100644
index 788c03f..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/65f9fbf2d6dae92de8d9ea1f65ddbe69/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/65f9fbf2d6dae92de8d9ea1f65ddbe69/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
deleted file mode 100644
index 3bb55eb..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/c6db8ff658b2b8de4a22f78c823055bf/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/c6db8ff658b2b8de4a22f78c823055bf/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_annotation_1_0_6.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_annotation_1_0_6.xml
deleted file mode 100644
index a4e2045..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_annotation_1_0_6.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.alibaba:arouter-annotation:1.0.6">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.alibaba/arouter-annotation/1.0.6/667fa943838b31d3a94cce6fe9e0b786cd9445ae/arouter-annotation-1.0.6.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_api_1_4_1_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_api_1_4_1_aar.xml
deleted file mode 100644
index 1b8c04c..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_api_1_4_1_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.alibaba:arouter-api:1.4.1@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/arouter-api-1.4.1.aar/015e319478c0f7958e0441563ac7d56a/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/arouter-api-1.4.1.aar/015e319478c0f7958e0441563ac7d56a/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
deleted file mode 100644
index 6e5bca9..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/743c9ae12b78dc2ed55955f6c0e0d327/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/743c9ae12b78dc2ed55955f6c0e0d327/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
deleted file mode 100644
index 1ab24f8..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/af1e5516ccbf3c62a3eb96e82dd2f042/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/af1e5516ccbf3c62a3eb96e82dd2f042/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/af1e5516ccbf3c62a3eb96e82dd2f042/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
deleted file mode 100644
index 199abb7..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/fc1d79774b572c7edc6165c2044bc836/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/fc1d79774b572c7edc6165c2044bc836/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
deleted file mode 100644
index e906af7..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:cardview-v7:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/d08606ace6213f60bdd13cf318fcac05/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/d08606ace6213f60bdd13cf318fcac05/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
deleted file mode 100644
index 6ccf636..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:collections:28.0.0">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml
deleted file mode 100644
index 69d35e6..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.constraint:constraint-layout:1.1.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/1d8b7a5d9e326d5497f2d8c4e7d7f00a/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/1d8b7a5d9e326d5497f2d8c4e7d7f00a/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0.xml
deleted file mode 100644
index 5dbff82..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.0">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.0/931532e953a477f876f2de18c2e7f16eee01078f/constraint-layout-solver-1.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
deleted file mode 100644
index 995942f..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/d6fd15962868e41da2f2d643faf7eedf/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/d6fd15962868e41da2f2d643faf7eedf/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/d6fd15962868e41da2f2d643faf7eedf/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
deleted file mode 100644
index ed00c7d..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/9361a234a82258237d549852fa3b395e/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/9361a234a82258237d549852fa3b395e/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
deleted file mode 100644
index e86e8c2..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:customview:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/358ea5e98f1f69eb38944bd2ac523ac4/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/358ea5e98f1f69eb38944bd2ac523ac4/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
deleted file mode 100644
index 7055c0e..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:design:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/2ef48b3aca247c9437a11bcb025e6060/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/2ef48b3aca247c9437a11bcb025e6060/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/2ef48b3aca247c9437a11bcb025e6060/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
deleted file mode 100644
index 6a00a45..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:documentfile:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/559c6031ec394a9e4c19d120e5fee401/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/559c6031ec394a9e4c19d120e5fee401/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
deleted file mode 100644
index 382b179..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/db044f7318c1f1029be44dbf263c97ca/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/db044f7318c1f1029be44dbf263c97ca/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/db044f7318c1f1029be44dbf263c97ca/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
deleted file mode 100644
index 9a893a3..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:interpolator:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/8e57400c9ccf3285f7b4a03cbdc54ae8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/8e57400c9ccf3285f7b4a03cbdc54ae8/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
deleted file mode 100644
index 3ee626f..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:loader:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/67a451e4b57e284303e25d6da1998e1b/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/67a451e4b57e284303e25d6da1998e1b/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
deleted file mode 100644
index 46e94a7..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/63492ab9a82305c0fd760d4562357a82/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/63492ab9a82305c0fd760d4562357a82/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
deleted file mode 100644
index c86502b..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:print:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/e01cda6a4f1490f83e0e164212992f54/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/e01cda6a4f1490f83e0e164212992f54/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/e01cda6a4f1490f83e0e164212992f54/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
deleted file mode 100644
index e80bd3e..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/24421858359922ef9c9daa6635011ff2/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/24421858359922ef9c9daa6635011ff2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/24421858359922ef9c9daa6635011ff2/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
deleted file mode 100644
index b29f1a4..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/05b3dd8a9b8acf6a3cf18008b7b61034/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/05b3dd8a9b8acf6a3cf18008b7b61034/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
deleted file mode 100644
index 24e83bc..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-annotations:28.0.0">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
deleted file mode 100644
index f6faafe..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-compat:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/76ff6b44cfa7b874c02780054c242146/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/76ff6b44cfa7b874c02780054c242146/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/76ff6b44cfa7b874c02780054c242146/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
deleted file mode 100644
index dbcb25e..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-core-ui:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/bded591d04c13b20403a46a77e5a9dbb/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/bded591d04c13b20403a46a77e5a9dbb/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
deleted file mode 100644
index 6c1e611..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/0dbd2805f802b9d11f9e1855c46961c8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/0dbd2805f802b9d11f9e1855c46961c8/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
deleted file mode 100644
index fb63b43..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/8abac4bbb8af8a373b6a9ec06d51ea85/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/8abac4bbb8af8a373b6a9ec06d51ea85/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/8abac4bbb8af8a373b6a9ec06d51ea85/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
deleted file mode 100644
index 894999d..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-media-compat:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0.aar/7af6a08473ce8027f47e2e6295b3d538/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0.aar/7af6a08473ce8027f47e2e6295b3d538/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0.aar/7af6a08473ce8027f47e2e6295b3d538/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
deleted file mode 100644
index 771250a..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-v4:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-28.0.0.aar/337cab79775309d0bf2cbe9c1c583100/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-28.0.0.aar/337cab79775309d0bf2cbe9c1c583100/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
deleted file mode 100644
index fd641b4..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/c35f9e81b033c59ee523dc9fe6b221a7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/c35f9e81b033c59ee523dc9fe6b221a7/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
deleted file mode 100644
index 9120faf..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/89aeeeef975e5446c20b20f8b81d9549/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/89aeeeef975e5446c20b20f8b81d9549/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/89aeeeef975e5446c20b20f8b81d9549/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
deleted file mode 100644
index 1eaee13..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-2.2.2.aar/30c8156779e315641ac9677bede0aec2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-2.2.2.aar/30c8156779e315641ac9677bede0aec2/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
deleted file mode 100644
index fea0167..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/08753eefdd4f9556e2ec7ff764778aaf/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/08753eefdd4f9556e2ec7ff764778aaf/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
deleted file mode 100644
index b616655..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-2.2.2.aar/bce9e2e0c0ec2d3973e11b9515b39511/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-2.2.2.aar/bce9e2e0c0ec2d3973e11b9515b39511/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
deleted file mode 100644
index e03e4f0..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/f87341fd3005a2edd8f630f762a57e2e/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/f87341fd3005a2edd8f630f762a57e2e/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
deleted file mode 100644
index 1af21e4..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/exposed-instrumentation-api-publish-0.5.aar/bc62c7cb534a39bd9062c0d2fb1e4343/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/exposed-instrumentation-api-publish-0.5.aar/bc62c7cb534a39bd9062c0d2fb1e4343/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
deleted file mode 100644
index ca4a32c..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test:monitor:1.0.2@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/monitor-1.0.2.aar/84cf6733468782b268ac8a1229f0c3c4/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/monitor-1.0.2.aar/84cf6733468782b268ac8a1229f0c3c4/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
deleted file mode 100644
index 078016b..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test:rules:0.5@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/3d25ed1044033d691e695a547f283ae0/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/3d25ed1044033d691e695a547f283ae0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/3d25ed1044033d691e695a547f283ae0/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
deleted file mode 100644
index 812f4eb..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test:runner:0.5@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/bd213aa88f7431826e6e6dd5e32cf256/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/bd213aa88f7431826e6e6dd5e32cf256/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/bd213aa88f7431826e6e6dd5e32cf256/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
deleted file mode 100644
index 0153720..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test:runner:1.0.2@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/1d2f271d3bd18dc681ea132350e497ed/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/1d2f271d3bd18dc681ea132350e497ed/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
deleted file mode 100644
index 7641448..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:transition:28.0.0@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/6c6e415c4d5e81dafe1aac0c92b8d6e4/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/6c6e415c4d5e81dafe1aac0c92b8d6e4/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/6c6e415c4d5e81dafe1aac0c92b8d6e4/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
deleted file mode 100644
index 2fd6f05..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/9d982810dfe7b7c0aa44a2acc7b6c371/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/9d982810dfe7b7c0aa44a2acc7b6c371/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
deleted file mode 100644
index e931775..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:viewpager:28.0.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/994f7681272756449a4ecf21cb58d2d5/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/994f7681272756449a4ecf21cb58d2d5/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml
deleted file mode 100644
index 2b834ea..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.google.code.findbugs:jsr305:2.0.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.1/516c03b21d50a644d538de0f0369c620989cd8f0/jsr305-2.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_1.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_1.xml
deleted file mode 100644
index 63e6fc0..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.google.code.gson:gson:2.8.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.1/2a8e0aa38a2e21cb39e2f5a7d6704cbdc941da0/gson-2.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml
new file mode 100644
index 0000000..3075c13
--- /dev/null
+++ b/AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: com.google.code.gson:gson:2.8.8">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.8/431fc3cbc0ff81abdbfde070062741089c3ba874/gson-2.8.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml b/AndroidOpenDemo/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
deleted file mode 100644
index dcf9be0..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.squareup:javawriter:2.1.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml b/AndroidOpenDemo/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml
deleted file mode 100644
index 0a6bc48..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: javax.annotation:javax.annotation-api:1.2">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/479c1e06db31c432330183f5cae684163f186146/javax.annotation-api-1.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml b/AndroidOpenDemo/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
deleted file mode 100644
index cbad166..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: javax.inject:javax.inject:1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__junit_junit_4_12.xml b/AndroidOpenDemo/.idea/libraries/Gradle__junit_junit_4_12.xml
deleted file mode 100644
index c1b646b..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: junit:junit:4.12">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml b/AndroidOpenDemo/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
deleted file mode 100644
index 326588d..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: net.sf.kxml:kxml2:2.3.0">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/ccbc77a5fd907ef863c29f3596c6f54ffa4e9442/kxml2-2.3.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index 30bf23a..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.hamcrest:hamcrest-core:1.3">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml b/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
deleted file mode 100644
index 16c340f..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.hamcrest:hamcrest-integration:1.3">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml b/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
deleted file mode 100644
index 7903a97..0000000
--- a/AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.hamcrest:hamcrest-library:1.3">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/misc.xml b/AndroidOpenDemo/.idea/misc.xml
index 58918f5..41d4729 100644
--- a/AndroidOpenDemo/.idea/misc.xml
+++ b/AndroidOpenDemo/.idea/misc.xml
@@ -1,4 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="DesignSurface">
+ <option name="filePathToZoomLevelMap">
+ <map>
+ <entry key="app/src/main/res/layout/activity_device_detail.xml" value="0.16666666666666666" />
+ <entry key="app/src/main/res/layout/activity_device_list.xml" value="0.16666666666666666" />
+ <entry key="app/src/main/res/layout/activity_device_record_list.xml" value="0.17552083333333332" />
+ <entry key="app/src/main/res/layout/fragment_device_detail_main.xml" value="0.17552083333333332" />
+ <entry key="app/src/main/res/layout/item_device_list.xml" value="0.17552083333333332" />
+ </map>
+ </option>
+ </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml b/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml
index 40b07cc..9baaeb2 100644
--- a/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml
+++ b/AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml
@@ -34,7 +34,10 @@
<sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/java" isTestSource="false" />
@@ -58,7 +61,7 @@
<orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/lechangeSDK.jar" level="project" />
<orderEntry type="library" name="Gradle: ./third-zxing/libs/zxing_3.3.0.jar" level="project" />
<orderEntry type="library" name="Gradle: org.greenrobot:eventbus:3.0.0" level="project" />
- <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.8" level="project" />
<orderEntry type="library" name="Gradle: com.alibaba:arouter-annotation:1.0.6" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1" level="project" />
diff --git a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
index 07bcc74..b42b7e9 100644
--- a/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
+++ b/AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
@@ -33,7 +33,10 @@
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
diff --git a/AndroidOpenDemo/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml b/AndroidOpenDemo/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml
index f6f9fd8..f9ec25f 100644
--- a/AndroidOpenDemo/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml
+++ b/AndroidOpenDemo/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml
@@ -34,7 +34,10 @@
<sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../../third-zxing/src/main/res" type="java-resource" />
diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml
index 132feed..73f2c50 100644
--- a/AndroidOpenDemo/.idea/workspace.xml
+++ b/AndroidOpenDemo/.idea/workspace.xml
@@ -15,10 +15,88 @@
</component>
<component name="ChangeListManager">
<list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/DeviceAddModule/libs/gson-2.8.8.jar" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HDLMD5Utils.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_imageload4dh_jar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_lechangeSDK_jar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHMobileToolset_1_1_1_aar_f7d8eb2f1804db3345ec5a537e5ec0db.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHScanner_1_0_7_aar_0ecd90b9bed2580cb7702e452029b5fe.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_PullToRefreshListView_release_aar_1232b6310601f161610e5eb82d661087.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____third_zxing_libs_zxing_3_3_0_jar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_alibaba_arouter_annotation_1_0_6.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_alibaba_arouter_api_1_4_1_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_1.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules/app/LCAndroidSDKDemo.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/LCAndroidSDKDemo.app.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml" 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$/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/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/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/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/DeviceListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_device_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_device_list.xml" 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" />
@@ -57,19 +135,6 @@
<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" />
@@ -124,9 +189,10 @@
<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="last_opened_file_path" value="$PROJECT_DIR$/DeviceAddModule/libs" />
<property name="memory.settings.postsync.last.time.stamp" value="1668648803566" />
<property name="project.structure.last.edited" value="Dependencies" />
<property name="project.structure.proportion" value="0.17" />
@@ -139,11 +205,11 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <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="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="com" />
@@ -362,11 +428,6 @@
</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>
@@ -376,19 +437,29 @@
<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" />
+ <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailActivity.java</url>
+ <line>32</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/openapi/HttpSend.java</url>
- <line>31</line>
- <option name="timeStamp" value="14" />
+ <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$/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/DeviceListActivity.java</url>
+ <line>95</line>
+ <option name="timeStamp" value="25" />
+ </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/DeviceOnlineMediaPlayActivity.java</url>
+ <line>173</line>
+ <option name="timeStamp" value="27" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
diff --git a/AndroidOpenDemo/DeviceAddModule/build.gradle b/AndroidOpenDemo/DeviceAddModule/build.gradle
index d5f5e8b..af2e3c6 100644
--- a/AndroidOpenDemo/DeviceAddModule/build.gradle
+++ b/AndroidOpenDemo/DeviceAddModule/build.gradle
@@ -53,6 +53,7 @@
api fileTree(include: ['imageload4dh.jar'], dir: 'libs')
// compileOnly fileTree(include: ['lechangeSDK.jar'], dir: 'libs')
api fileTree(include: ['lechangeSDK.jar'], dir: 'libs')
+ implementation 'com.google.code.gson:gson:2.8.8'
// compile project(':LcOpenSDk')
diff --git a/AndroidOpenDemo/DeviceAddModule/libs/gson-2.8.8.jar b/AndroidOpenDemo/DeviceAddModule/libs/gson-2.8.8.jar
new file mode 100644
index 0000000..4707d40
--- /dev/null
+++ b/AndroidOpenDemo/DeviceAddModule/libs/gson-2.8.8.jar
Binary files differ
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java
index 20db92a..245d481 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java
@@ -42,7 +42,7 @@
public static String SECRET = "";
public enum Envirment {
- CHINA_TEST("https://funcopenapi.lechange.cn:443"),
+ CHINA_TEST("https://nearest.hdlcontrol.com"),
CHINA_PRO("https://openapi.lechange.cn:443"),
OVERSEAS_TEST("https://openapifunc.easy4ip.com:443"),
OVERSEAS_PRO("https://openapi.easy4ip.com:443");
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HDLMD5Utils.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HDLMD5Utils.java
new file mode 100644
index 0000000..29e7a74
--- /dev/null
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HDLMD5Utils.java
@@ -0,0 +1,183 @@
+package com.mm.android.deviceaddmodule.openapi;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * Created by Tong on 2021/11/3.
+ */
+public final class HDLMD5Utils {
+
+ /**
+ * MD5杞瓧绗︿覆
+ */
+ public static String encodeMD5(String s) {
+ try {
+ MessageDigest digest = MessageDigest.getInstance("MD5");
+ digest.update(s.getBytes("UTF-8"));
+ byte[] messageDigest = digest.digest();
+ return toHexString(messageDigest);
+ } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return "";
+ }
+
+ private static String toHexString(byte[] keyData) {
+ if (keyData == null) {
+ return null;
+ }
+ int expectedStringLen = keyData.length * 2;
+ StringBuilder sb = new StringBuilder(expectedStringLen);
+ for (byte keyDatum : keyData) {
+ String hexStr = Integer.toString(keyDatum & 0x00FF, 16);
+ if (hexStr.length() == 1) {
+ hexStr = "0" + hexStr;
+ }
+ sb.append(hexStr);
+ }
+ return sb.toString();
+ }
+
+ /**
+ * MD5杞瓧绗︿覆
+ * 棰濆鍊�
+ */
+ public static String encodeMD52(String s) {
+ char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+ try {
+ byte[] btInput = s.getBytes("utf-8");
+ MessageDigest digest = MessageDigest.getInstance("MD5");
+ digest.update(btInput);
+ byte[] md = digest.digest();
+ int j = md.length;
+ char[] str = new char[j * 2];
+ int k = 0;
+ for (byte byte0 : md) {
+ str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+ str[k++] = hexDigits[byte0 & 0xf];
+ }
+ return new String(str);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ /**
+ * MD5鏂囦欢杞瓧绗︿覆
+ */
+ public static String encodeMD5(File f) {
+ if (!f.isFile()) {
+ return null;
+ }
+ MessageDigest digest;
+ byte[] buffer = new byte[1024];
+ int len;
+ try {
+ digest = MessageDigest.getInstance("MD5");
+ FileInputStream in = new FileInputStream(f);
+ while ((len = in.read(buffer, 0, 1024)) != -1) {
+ digest.update(buffer, 0, len);
+ }
+ in.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ BigInteger bigInt = new BigInteger(1, digest.digest());
+ return bigInt.toString(16);
+ }
+
+ /**
+ * MD5鏂囦欢杞瓧绗︿覆
+ */
+ public static String encodeMD5(byte[] f) {
+ MessageDigest digest;
+ try {
+ digest = MessageDigest.getInstance("MD5");
+ digest.update(f);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ BigInteger bigInt = new BigInteger(1, digest.digest());
+ return bigInt.toString(16);
+ }
+
+
+
+ public final static String md5(String plainText) {
+
+// 杩斿洖瀛楃涓�
+
+ String md5Str = null;
+
+ try {
+
+// 鎿嶄綔瀛楃涓�
+
+ StringBuffer buf = new StringBuffer();
+
+ MessageDigest md =
+
+ MessageDigest.getInstance("MD5");
+
+// 娣诲姞瑕佽繘琛岃绠楁憳瑕佺殑淇℃伅,浣跨敤 plainText 鐨� byte
+
+
+ md.update(plainText.getBytes());
+
+// 璁＄畻鍑烘憳瑕�,瀹屾垚鍝堝笇璁＄畻銆�
+
+ byte b[] = md.digest();
+
+ int i;
+
+ for (int offset = 0; offset < b.length; offset++) {
+
+ i = b[offset];
+
+ if (i < 0) {
+
+ i += 256;
+
+ }
+
+ if (i < 16) {
+
+ buf.append("0");
+
+ }
+
+// 灏嗘暣鍨� 鍗佽繘鍒� i
+
+
+ buf.append(Integer.toHexString(i));
+
+ }
+
+// 32浣嶇殑鍔犲瘑
+
+ md5Str = buf.toString();
+
+// 16浣嶇殑鍔犲瘑
+
+// md5Str = buf.toString().md5Strstring(8,24);
+
+ } catch (Exception e) {
+
+ e.printStackTrace();
+
+ }
+
+ return md5Str;
+
+ }
+
+
+}
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java
index 1a698f3..c0e53e0 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.java
@@ -1,11 +1,24 @@
package com.mm.android.deviceaddmodule.openapi;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
import com.mm.android.deviceaddmodule.mobilecommon.utils.LogUtil;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
import javax.net.ssl.HttpsURLConnection;
public class HttpClient {
@@ -85,4 +98,87 @@
}
return resultData;
}
+
+
+ /**
+ * 娣诲姞sign瀛楁
+ */
+ public static JsonObject encrypt(Map<String, Object> map) {
+ final String timestamp = String.valueOf(System.currentTimeMillis());
+ final String appKey = "AppKey";
+ final String appSecret = "AppSecret";
+
+
+ JsonObject json = new JsonObject();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ if (entry.getValue() instanceof String) {
+ json.addProperty(entry.getKey(), (String) entry.getValue());
+ } else if (entry.getValue() instanceof Boolean) {
+ json.addProperty(entry.getKey(), (Boolean) entry.getValue());
+ } else if (entry.getValue() instanceof Number) {
+ json.addProperty(entry.getKey(), (Number) entry.getValue());
+ } else if (entry.getValue() instanceof Character) {
+ json.addProperty(entry.getKey(), (Character) entry.getValue());
+ } else if (entry.getValue() instanceof JsonElement) {
+ json.add(entry.getKey(), (JsonElement) entry);
+ }
+ }
+
+
+ if (json != null) {
+ json.addProperty("appKey", appKey);
+ json.addProperty("timestamp", timestamp);
+ json.addProperty("sign", getSign(map, appSecret));
+ }
+ return json;
+ }
+
+ /**
+ * 闇�瑕佹寜瀛楁瘝鎺掑簭
+ *
+ * @param map 鎵�鏈夊瓧娈典娇鐢╱rlParameter鎷兼帴锛岄櫎浜哸ppSecret
+ */
+ private static String getSign(Map<String, Object> map, String appSecret) {
+ String builder = jsonToUrlParameter(map) +
+ appSecret;
+ return HDLMD5Utils.encodeMD5(builder);
+ }
+
+
+ private static String jsonToUrlParameter(Map<String, Object> map ) {
+ final Uri.Builder builder = new Uri.Builder();
+ List<String> list = new ArrayList<>(map.keySet());
+ Collections.sort(list);
+ for (String key : list) {
+ //鍒ゆ柇褰撳墠鍊兼槸鍚﹂渶瑕佸弬涓庣鍚嶏紝淇濇寔璺熶簯绔竴鑷�
+ if (IfValueNeedSign(map.get(key).toString())) {
+ builder.appendQueryParameter(key, map.get(key).toString());
+// HDLSDKLog.e("瑕佺鍚嶏細" + key + " 锛�" + map.get(key));
+ } else {
+// HDLSDKLog.e("涓嶉渶瑕佺鍚嶏細" + key + " 锛�" + map.get(key));
+ }
+ }
+ return builder.build().getQuery();
+ }
+
+ /**
+ * 鍒ゆ柇褰撳墠鍊兼槸鍚﹂渶瑕佸弬涓庣鍚嶏紝淇濇寔璺熶簯绔竴鑷�
+ * 绌哄瓧绗︿覆涓嶅弬涓�
+ * 鏁扮粍,闆嗗悎,瀵硅薄涓嶅弬涓�
+ *
+ * @param valueStr
+ * @return
+ */
+ private static boolean IfValueNeedSign(String valueStr) {
+ if (TextUtils.isEmpty(valueStr))
+ return false;
+ final char[] strChar = valueStr.substring(0, 1).toCharArray();
+ final char firstChar = strChar[0];
+ //System.out.println("getJSONType firstChar = "+firstChar);
+ if (firstChar != '{' && firstChar != '[')
+ return true;
+
+ return false;
+ }
+
}
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
index e2317b7..84b4eeb 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
@@ -1,6 +1,9 @@
package com.mm.android.deviceaddmodule.openapi;
+import android.text.TextUtils;
+
import com.google.gson.Gson;
+import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.BusinessException;
@@ -12,6 +15,7 @@
import java.io.IOException;
import java.net.SocketException;
import java.net.SocketTimeoutException;
+import java.net.URLDecoder;
import java.net.UnknownHostException;
import java.net.UnknownServiceException;
import java.util.HashMap;
@@ -28,6 +32,7 @@
Map<String, Object> map = paramsInit(paramsMap);
// 杩斿洖json
JsonObject jsonObj = doPost(CONST.HOST + "/openapi/" + method, map,timeOut);
+// JsonObject jsonObj = doPost(CONST.HOST + "/home-wisdom/imou/openapi/" + method, map,timeOut);
LogUtil.debugLog(TAG, "url::"+method+"\n"+"response result锛�" + jsonObj.toString());
if (jsonObj == null) {
throw new BusinessException("openApi response is null");
@@ -84,8 +89,15 @@
private static JsonObject doPost(String url, Map<String, Object> map, int timeOut) throws BusinessException {
Gson gson = new Gson();
+// map.put("homeId","15626203746");
String json = gson.toJson(map);
JsonObject jsonObject = new JsonObject();
+
+// JsonElement parseString = JsonParser.parseString(json);
+// jsonObject = parseString.getAsJsonObject();
+// jsonObject = HttpClient.encrypt(map);
+// json = gson.toJson(jsonObject);
+
try {
LogUtil.debugLog(TAG, "reqest: " + url + " data:" + json.toString());
String openApi = HttpClient.post(url, json, "application/json", "OpenApi",timeOut);
@@ -152,4 +164,27 @@
map.put("id", id);
return map;
}
+
+
+ /**
+ * 鍩烘湰绫诲瀷鍔犲瘑
+ * <p>
+ * 鍒ゆ柇褰撳墠鍊兼槸鍚﹂渶瑕佸弬涓庣鍚嶏紝淇濇寔璺熶簯绔竴鑷�
+ * 绌哄瓧绗︿覆涓嶅弬涓�
+ * 鏁扮粍,闆嗗悎涓嶅弬涓�
+ *
+ * @return ture 闇�瑕佸姞瀵�
+ */
+ private static boolean valueNeedSign(String valueStr) {
+ try {
+ if (TextUtils.isEmpty(valueStr)) return false;
+ final char[] strChar = URLDecoder.decode(valueStr, "utf-8")
+ .substring(0, 1).toCharArray();
+ final char firstChar = strChar[0];
+ return firstChar != '{' && firstChar != '[';
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java b/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java
index 19d3f6d..930fa7f 100644
--- a/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java
+++ b/AndroidOpenDemo/app/src/main/java/com/hdl/HdlToLc.java
@@ -30,7 +30,7 @@
private static Activity mActivity;
- public static void initData(Activity activity, boolean isChina,String subToken){
+ public static void initData(Activity activity, boolean isChina,String subToken) {
mActivity = activity;
mSubToken = subToken;
MediaPlayHelper.initContext(mActivity.getApplication().getApplicationContext());
@@ -38,7 +38,7 @@
if (isChina) {
mAppSecret = "f869433de68a4a06bb8f9bb89118fc";
mAppid = "lc2ea929282d5f4636";
- mUrl = CONST.Envirment.CHINA_PRO.url;
+ mUrl = CONST.Envirment.CHINA_TEST.url;
ProviderManager.getAppProvider().setAppType(0);
} else {
mAppSecret = "017fc27bb987496f9a677e4e6f0c88";
@@ -47,10 +47,9 @@
ProviderManager.getAppProvider().setAppType(1);
}
- }
- public static void openActivity()
- {
+
try {
+
CommonParam commonParam = new CommonParam();
commonParam.setEnvirment(mUrl);//浜戠杩炴帴
commonParam.setContext(mActivity.getApplication());
@@ -58,6 +57,13 @@
commonParam.setAppSecret(mAppSecret);
//SDK淇℃伅鍒濆鍖�
LCDeviceEngine.newInstance().init(commonParam);
+ } catch (Throwable e) {
+ Toast.makeText(mActivity, e.getMessage(), Toast.LENGTH_SHORT).show();
+ }
+ }
+ public static void openActivity()
+ {
+ try {
// getSubAccountToken("827a98c98da7469b8bc19bb6a3c7651906");
String str = "St_00009073b431d8b2490c9df0c5cb0e73";
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
index f593375..294041b 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
@@ -41,7 +41,7 @@
private RelativeLayout rlDeviceDetail;
private RelativeLayout rlDetailVersion;
private RelativeLayout rlDeployment;
- private RelativeLayout rlDetele;
+// private RelativeLayout rlDetele;
private TextView tvDeviceName;
private ImageView ivDevicePic;
private TextView tvDeviceVersion;
@@ -86,7 +86,7 @@
rlDetailVersion = view.findViewById(R.id.rl_detail_version);
rlDeployment = view.findViewById(R.id.rl_deployment);
tvDeploymentTip = view.findViewById(R.id.tv_deployment_tip);
- rlDetele = view.findViewById(R.id.rl_detele);
+// rlDetele = view.findViewById(R.id.rl_detele);
tvDeviceName = view.findViewById(R.id.tv_device_name);
ivDevicePic = view.findViewById(R.id.iv_device_pic);
tvDeviceVersion = view.findViewById(R.id.tv_device_version);
@@ -94,7 +94,7 @@
rlCurWifi = view.findViewById(R.id.rl_cur_wifi);
rlDeployment.setOnClickListener(this);
- rlDetele.setOnClickListener(this);
+// rlDetele.setOnClickListener(this);
rlDeviceDetail.setOnClickListener(this);
rlCurWifi.setOnClickListener(this);
DeviceDetailActivity deviceDetailActivity = (DeviceDetailActivity) getActivity();
@@ -126,7 +126,7 @@
getDeviceLocalCache();
rlDetailVersion.setVisibility(View.GONE);
rlCurWifi.setVisibility(View.GONE);
- rlDetele.setVisibility(View.GONE);
+// rlDetele.setVisibility(View.GONE);
}
} else if (deviceListBean.channels!=null&&deviceListBean.channels.size() == 1) {
//鍗曢�氶亾
@@ -134,7 +134,7 @@
getDeviceLocalCache();
tvDeviceVersion.setText(deviceListBean.version);
if (deviceListBean.deviceSource == 2) {
- rlDetele.setVisibility(View.GONE);
+// rlDetele.setVisibility(View.GONE);
}
rlCurWifi.setVisibility(View.VISIBLE);
//璁惧鎵嶈兘鑾峰彇WIFI
@@ -262,14 +262,14 @@
gotoDeploymentPage(getActivity());
} else if (id == R.id.rl_detail_version) {
gotoUpdatePage(getActivity());
- } else if (id == R.id.rl_detele) {
- //瑙ｇ粦璁惧
- deviceDetailActivity.rlLoading.setVisibility(View.VISIBLE);
- DeviceDetailService deviceDetailService = ClassInstanceManager.newInstance().getDeviceDetailService();
- /* DeviceUnBindData deviceUnBindData = new DeviceUnBindData();
- deviceUnBindData.data.deviceId = deviceListBean.deviceId;
- deviceDetailService.unBindDevice(deviceUnBindData, this);*/
- deviceDetailService.deletePermission(deviceListBean.deviceId,null,this);
+// } else if (id == R.id.rl_detele) {
+// //瑙ｇ粦璁惧
+// deviceDetailActivity.rlLoading.setVisibility(View.VISIBLE);
+// DeviceDetailService deviceDetailService = ClassInstanceManager.newInstance().getDeviceDetailService();
+// /* DeviceUnBindData deviceUnBindData = new DeviceUnBindData();
+// deviceUnBindData.data.deviceId = deviceListBean.deviceId;
+// deviceDetailService.unBindDevice(deviceUnBindData, this);*/
+// deviceDetailService.deletePermission(deviceListBean.deviceId,null,this);
}
}
diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java
index b4e88e6..5574f83 100644
--- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java
+++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java
@@ -39,7 +39,7 @@
private RecyclerView mRecyclerView;
private List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
private DeviceListAdapter deviceListAdapter;
- private LinearLayout llAdd;
+// private LinearLayout llAdd;
private LinearLayout llBack;
private RelativeLayout rlNoDevice;
//涔愭鍒嗛〉index
@@ -57,12 +57,12 @@
}
private void initView() {
- llAdd = findViewById(R.id.ll_add);
+// llAdd = findViewById(R.id.ll_add);
llBack = findViewById(R.id.ll_back);
rlNoDevice = findViewById(R.id.rl_no_device);
deviceList = findViewById(R.id.device_list);
deviceList.setOnRefreshListener(this);
- llAdd.setOnClickListener(this);
+// llAdd.setOnClickListener(this);
llBack.setOnClickListener(this);
refreshState(false);
mRecyclerView = deviceList.getRefreshableView();
@@ -271,12 +271,12 @@
int id = v.getId();
if (id == R.id.ll_back) {
finish();
- } else if (id == R.id.ll_add) {
- try {
- LCDeviceEngine.newInstance().addDevice(this);
- } catch (Exception e) {
- e.printStackTrace();
- }
+// } else if (id == R.id.ll_add) {
+// try {
+// LCDeviceEngine.newInstance().addDevice(this);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
}
}
}
diff --git a/AndroidOpenDemo/app/src/main/res/layout/activity_device_list.xml b/AndroidOpenDemo/app/src/main/res/layout/activity_device_list.xml
index edf5c2a..4ab6a3c 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/activity_device_list.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/activity_device_list.xml
@@ -35,20 +35,20 @@
android:textStyle="bold"
android:text="@string/lc_demo_main_title"></TextView>
- <LinearLayout
- android:id="@+id/ll_add"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentRight="true"
- android:gravity="center"
- android:paddingLeft="@dimen/px_20"
- android:paddingRight="@dimen/px_20">
+<!-- <LinearLayout-->
+<!-- android:id="@+id/ll_add"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="match_parent"-->
+<!-- android:layout_alignParentRight="true"-->
+<!-- android:gravity="center"-->
+<!-- android:paddingLeft="@dimen/px_20"-->
+<!-- android:paddingRight="@dimen/px_20">-->
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@mipmap/lc_demo_nav_add"></ImageView>
- </LinearLayout>
+<!-- <ImageView-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:src="@mipmap/lc_demo_nav_add"></ImageView>-->
+<!-- </LinearLayout>-->
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
diff --git a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
index d9fa747..a867846 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
@@ -159,22 +159,22 @@
android:layout_height="0dp"
android:layout_weight="1"></View>
- <RelativeLayout
- android:id="@+id/rl_detele"
- android:layout_width="match_parent"
- android:layout_height="@dimen/px_110"
- android:layout_gravity="bottom"
- android:layout_marginBottom="@dimen/px_50"
- android:background="@color/lc_demo_color_ffffff"
- android:gravity="center_vertical">
+<!-- <RelativeLayout-->
+<!-- android:id="@+id/rl_detele"-->
+<!-- android:layout_width="match_parent"-->
+<!-- android:layout_height="@dimen/px_110"-->
+<!-- android:layout_gravity="bottom"-->
+<!-- android:layout_marginBottom="@dimen/px_50"-->
+<!-- android:background="@color/lc_demo_color_ffffff"-->
+<!-- android:gravity="center_vertical">-->
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:text="@string/lc_demo_device_delete"
- android:textColor="@color/lc_demo_color_FF4F4F"
- android:textSize="@dimen/px_36"></TextView>
+<!-- <TextView-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:layout_centerInParent="true"-->
+<!-- android:text="@string/lc_demo_device_delete"-->
+<!-- android:textColor="@color/lc_demo_color_FF4F4F"-->
+<!-- android:textSize="@dimen/px_36"></TextView>-->
- </RelativeLayout>
+<!-- </RelativeLayout>-->
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0