AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_imageload4dh_jar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_lechangeSDK_jar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHMobileToolset_1_1_1_aar_f7d8eb2f1804db3345ec5a537e5ec0db.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_DHScanner_1_0_7_aar_0ecd90b9bed2580cb7702e452029b5fe.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle______________gradle_caches_transforms_1_files_1_1_PullToRefreshListView_release_aar_1232b6310601f161610e5eb82d661087.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle____third_zxing_libs_zxing_3_3_0_jar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_annotation_1_0_6.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_alibaba_arouter_api_1_4_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_1.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml
New file @@ -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> AndroidOpenDemo/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__junit_junit_4_12.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
File was deleted 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> 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" /> 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" /> 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" /> 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> 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') Binary files differ
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"); AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HDLMD5Utils.java
New file @@ -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; } } 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 所有字段使用urlParameter拼接，除了appSecret */ 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; } } 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; } } 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"; 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); } }
@@ -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(); // } } } } 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" 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>
