.DS_StoreBinary files differ
.gitignore
@@ -33,6 +33,7 @@ #ignore folder target/ .idea/ .idea/libraries/ uploadLog/ #ignore file AndroidOpenDemo/.DS_StoreBinary files differ
AndroidOpenDemo/.idea/gradle.xml
@@ -7,7 +7,6 @@ <option name="testRunner" value="PLATFORM" /> <option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="gradleJvm" value="1.8" /> <option name="modules"> <set> <option value="$PROJECT_DIR$" /> AndroidOpenDemo/.idea/jarRepositories.xml
@@ -61,25 +61,5 @@ <option name="name" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository" /> <option name="url" value="file:$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository" /> </remote-repository> <remote-repository> <option name="id" value="MavenLocal" /> <option name="name" value="MavenLocal" /> <option name="url" value="file:$USER_HOME$/.m2/repository/" /> </remote-repository> <remote-repository> <option name="id" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository" /> <option name="name" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository" /> <option name="url" value="file:$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/android/m2repository/" /> </remote-repository> <remote-repository> <option name="id" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/m2repository" /> <option name="name" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/m2repository" /> <option name="url" value="file:$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/m2repository/" /> </remote-repository> <remote-repository> <option name="id" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/google/m2repository" /> <option name="name" value="$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/google/m2repository" /> <option name="url" value="file:$USER_HOME$/Library/Developer/Xamarin/android-sdk-macosx/extras/google/m2repository/" /> </remote-repository> </component> </project> AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_DHMobileToolset_1_1_1_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_DHScanner_1_0_7_aar.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle____DeviceAddModule_libs_PullToRefreshListView_release_aar.xml
File was deleted 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____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
File was deleted 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_greenrobot_eventbus_3_0_0.xml
File was deleted AndroidOpenDemo/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.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/modules.xml
File was deleted AndroidOpenDemo/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml
@@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.linked.project.id=":DeviceAddModule" external.linked.project.path="$MODULE_DIR$/../../../DeviceAddModule" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="LCAndroidSDKDemo" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="LCAndroidSDKDemo" externalSystemModuleVersion="unspecified" linkedProjectId=":DeviceAddModule" linkedProjectPath="$MODULE_DIR$/../../../DeviceAddModule" rootProjectPath="$MODULE_DIR$/../../.." /> <module version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -26,83 +25,5 @@ <option name="PROJECT_TYPE" value="1" /> </configuration> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> <output url="file://$MODULE_DIR$/../../../DeviceAddModule/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" /> <output-test url="file://$MODULE_DIR$/../../../DeviceAddModule/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$/../../../DeviceAddModule"> <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/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/src/main/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/anim" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/color" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable-hdpi" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable-xhdpi" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/drawable-xxhdpi" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/layout" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/values" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/src/main/res/lc/values-en" type="java-resource" /> <excludeFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/../../../DeviceAddModule/build" /> </content> <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/imageload4dh.jar" level="project" /> <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.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" /> <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0" level="project" /> <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.0" level="project" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/PullToRefreshListView-release.aar" level="project" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/DHMobileToolset-1.1.1.aar" level="project" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/DHScanner-1.0.7.aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.alibaba:arouter-api:1.4.1@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" /> <orderEntry type="module" module-name="LCAndroidSDKDemo.third-zxing" /> </component> </module> AndroidOpenDemo/.idea/modules/LCAndroidSDKDemo.iml
@@ -1,21 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.linked.project.id="LCAndroidSDKDemo" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="" externalSystemModuleVersion="unspecified" linkedProjectId="LCAndroidSDKDemo" linkedProjectPath="$MODULE_DIR$/../.." rootProjectPath="$MODULE_DIR$/../.." /> <module version="4"> <component name="FacetManager"> <facet type="java-gradle" name="Java-Gradle"> <configuration> <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" /> <option name="BUILDABLE" value="false" /> </configuration> </facet> </component> <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/../.."> <excludeFolder url="file://$MODULE_DIR$/../../.gradle" /> <excludeFolder url="file://$MODULE_DIR$/../../build" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module> AndroidOpenDemo/.idea/modules/app/LCAndroidSDKDemo.app.iml
@@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="LCAndroidSDKDemo" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="LCAndroidSDKDemo" externalSystemModuleVersion="unspecified" linkedProjectId=":app" linkedProjectPath="$MODULE_DIR$/../../../app" rootProjectPath="$MODULE_DIR$/../../.." /> <module version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -23,89 +22,8 @@ <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" /> <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" /> <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> <option name="PROJECT_TYPE" value="1" /> </configuration> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" /> <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$/../../../app"> <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/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/src/androidTest/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/../../../app/build" /> </content> <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/imageload4dh.jar" level="project" /> <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.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" /> <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0" level="project" /> <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.0" level="project" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/PullToRefreshListView-release.aar" level="project" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/DHMobileToolset-1.1.1.aar" level="project" /> <orderEntry type="library" name="Gradle: ./DeviceAddModule/libs/DHScanner-1.0.7.aar" level="project" /> <orderEntry type="library" name="Gradle: com.alibaba:arouter-api:1.4.1@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" /> <orderEntry type="module" module-name="LCAndroidSDKDemo.DeviceAddModule" /> <orderEntry type="module" module-name="LCAndroidSDKDemo.third-zxing" /> </component> </module> AndroidOpenDemo/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml
@@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <<<<<<< HEAD <module version="4"> ======= <module external.linked.project.id=":third-zxing" external.linked.project.path="$MODULE_DIR$/../../../third-zxing" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="LCAndroidSDKDemo" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="LCAndroidSDKDemo" externalSystemModuleVersion="unspecified" linkedProjectId=":third-zxing" linkedProjectPath="$MODULE_DIR$/../../../third-zxing" rootProjectPath="$MODULE_DIR$/../../.." /> >>>>>>> dev <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -27,6 +31,8 @@ </configuration> </facet> </component> <<<<<<< HEAD ======= <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> <output url="file://$MODULE_DIR$/../../../third-zxing/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" /> <output-test url="file://$MODULE_DIR$/../../../third-zxing/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" /> @@ -89,4 +95,5 @@ <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" /> </component> >>>>>>> dev </module> AndroidOpenDemo/.idea/workspace.xml
@@ -15,23 +15,26 @@ </component> <component name="ChangeListManager"> <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/dialog/RecoverSDCardDialog.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_sd_card_reconver.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHMobileToolset_1_1_1_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHScanner_1_0_7_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_PullToRefreshListView_release_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/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$/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/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/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_name.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_name.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/third-zxing/src/main/res/values/colors_ui.xml" beforeDir="false" afterPath="$PROJECT_DIR$/third-zxing/src/main/res/values/colors_ui.xml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[364c4b3158493098]" /> <component name="ExternalProjectsData"> <projectState path="$PROJECT_DIR$"> <ProjectState /> @@ -134,7 +137,7 @@ <property name="cidr.known.project.marker" value="true" /> <property name="dart.analysis.tool.window.visible" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/res/layout" /> <property name="memory.settings.postsync.last.time.stamp" value="1669278541025" /> <property name="memory.settings.postsync.last.time.stamp" value="1670203339524" /> <property name="project.structure.last.edited" value="Dependencies" /> <property name="project.structure.proportion" value="0.17" /> <property name="project.structure.side.proportion" value="0.2" /> @@ -159,7 +162,7 @@ <recent name="com" /> </key> </component> <component name="RunManager" selected="Android App.app"> <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]"> <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> <option name="TEST_OBJECT" value="class" /> <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> @@ -373,14 +376,16 @@ </ignored-roots> </component> <component name="XDebuggerManager"> <breakpoint-manager> <breakpoints> <line-breakpoint enabled="true" suspend="THREAD" type="java-line"> <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java</url> <line>285</line> <option name="timeStamp" value="141" /> </line-breakpoint> </breakpoints> </breakpoint-manager> <watches-manager> <configuration name="app"> <watch expression="openApi" language="JAVA" /> <watch expression="new Gson().fromJson(openApi,JsonObject.class);" language="JAVA" /> <watch expression="e.getMessage()" language="JAVA" /> <watch expression="exception" language="JAVA" /> <watch expression="jsonResult.get("msg").getAsString()" language="JAVA" /> <watch expression="jsonObject" language="JAVA" /> <watch expression="jsonResult.get("code").getAsString()" language="JAVA" /> </configuration> </watches-manager> </component> </project> AndroidOpenDemo/DeviceAddModule/.DS_StoreBinary files differ
AndroidOpenDemo/DeviceAddModule/build.gradle
@@ -50,15 +50,18 @@ dependencies { // api fileTree(include: ['*.jar'], dir: 'libs') api fileTree(include: ['imageload4dh.jar'], dir: 'libs') api fileTree(include: ['imageload4dh.jar','eventbus-3.0.0.jar'], dir: 'libs') // api 'org.greenrobot:eventbus:3.3.1' // compileOnly fileTree(include: ['eventbus:3.0.0.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') api project(':third-zxing') api "org.greenrobot:eventbus:3.0.0" // api "org.greenrobot:eventbus:3.0.0" api 'com.google.code.gson:gson:2.8.1' api "com.android.support:recyclerview-v7:28.0.0" AndroidOpenDemo/DeviceAddModule/libs/.DS_StoreBinary files differ
AndroidOpenDemo/DeviceAddModule/libs/eventbus-3.0.0.jarBinary files differ
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java
@@ -128,7 +128,7 @@ private void initParam(CommonParam commonParam) throws Exception { userId = TextUtils.isEmpty(commonParam.getUserId()) ? commonParam.getAppId() : commonParam.getUserId(); //传入参数 AppId SecretKey 环境切换 CONST.makeEnv(commonParam.getEnvirment(), commonParam.getAppId(), commonParam.getAppSecret()); CONST.makeEnv(commonParam.getEnvirment(), commonParam.getAppId(), commonParam.getAppSecret());// ContextHelper.init(commonParam.getContext()); new EnvironmentConfig.Builder().setContext(commonParam.getContext()).build(); initImageLoader(commonParam.getContext()); AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
@@ -53,8 +53,13 @@ } String code = jsonResult.get("code").getAsString(); if (!"0".equals(code)) { String msg = jsonResult.get("msg").getAsString(); throw new BusinessException(code + msg); try { String msg = jsonResult.get("msg").getAsString(); throw new BusinessException(code + msg); }catch (Exception exception){ String msg = jsonResult.get("message").getAsString(); throw new BusinessException(code + msg); } } JsonObject jsonData = new JsonObject(); @@ -106,7 +111,11 @@ LogUtil.debugLog(TAG, "reqest: " + url + " data:" + json); String openApi = HttpClient.post(url, json, "application/json", "OpenApi",timeOut); LogUtil.debugLog(TAG, "返回结果: \r\n" + openApi); jsonObject = new JsonParser().parse(openApi).getAsJsonObject(); try { jsonObject = new JsonParser().parse(openApi).getAsJsonObject(); }catch (Exception exception){ jsonObject = new Gson().fromJson(openApi,JsonObject.class); } } catch (IOException e) { BusinessException b = new BusinessException(e); if (e instanceof ConnectTimeoutException || e instanceof SocketTimeoutException AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java
@@ -150,8 +150,8 @@ public void completeAction() { //添加结束哪来回哪，把DeviceAddActivity结束掉 EventBus.getDefault().post(new DeviceAddEvent(DeviceAddEvent.DESTROY_ACTION)); //通知主页、我的设备列表自动刷新 EventBus.getDefault().post(new CommonEvent(CommonEvent.DEVICE_ADD_SUCCESS_ACTION)); // //通知主页、我的设备列表自动刷新 跨平台打包，不需要再通知了kaede // EventBus.getDefault().post(new CommonEvent(CommonEvent.DEVICE_ADD_SUCCESS_ACTION)); } @Override AndroidOpenDemo/app/.DS_StoreBinary files differ
AndroidOpenDemo/app/build.gradle
@@ -83,7 +83,7 @@ //// implementation("com.android.support:support-v4:28.0.0") //} apply plugin: 'com.android.application' apply plugin: 'com.android.library' repositories { flatDir { dirs 'libs' AndroidOpenDemo/app/src/main/AndroidManifest.xml
@@ -6,55 +6,63 @@ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <application android:name=".App" android:debuggable="false" android:allowBackup="false" android:icon="@mipmap/sdk_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/sdk_launcher" android:supportsRtl="false" android:theme="@style/AppTheme" tools:replace="android:allowBackup,android:label,android:supportsRtl"> <application> <!-- <application--> <!-- android:name=".App"--> <!-- android:debuggable="false"--> <!-- android:allowBackup="false"--> <!-- android:icon="@mipmap/sdk_launcher"--> <!-- android:label="@string/app_name"--> <!-- android:roundIcon="@mipmap/sdk_launcher"--> <!-- android:supportsRtl="false"--> <!-- android:theme="@style/AppTheme"--> <!-- tools:replace="android:allowBackup,android:label,android:supportsRtl"--> <!-- >--> <activity android:name=".ui.EnvGuideActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:theme="@style/AppTheme" android:screenOrientation="portrait"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> <!-- <intent-filter>--> <!-- <action android:name="android.intent.action.MAIN" />--> <!-- <category android:name="android.intent.category.LAUNCHER" />--> <!-- </intent-filter>--> </activity> <activity android:name=".ui.DeviceListActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:exported="false" android:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> <activity android:name=".ui.DeviceDetailActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:exported="false" android:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> <activity android:name=".ui.DeviceOnlineMediaPlayActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:exported="false" android:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> <activity android:name=".ui.DeviceRecordListActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:exported="false" android:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> <activity android:name=".ui.DeviceRecordPlayActivity" android:configChanges="orientation|keyboardHidden|screenSize|locale" android:launchMode="singleTop" android:exported="false" android:theme="@style/AppTheme" android:screenOrientation="portrait"></activity> </application> </manifest> AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
@@ -68,20 +68,20 @@ } else if (id == R.id.tv_overseas) { } HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com"); HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com"); HdlToLcUtils.getInstance().setHomeId("1547099040465408002"); HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJiZTAzNDE1MTZkMDg0YmNhOGZjM2U5ZTA3OWMzZWY5ZSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2Njk4NzAxNjQsIm5iZiI6MTY2OTg2Mjk2NH0.kCDl6u7hL4bS-tpf5f_jEQ1Hjhj2_65v3cDJBbvVpfOYE8k6NShJjyIVHLUaY0EXWygF6uc-w9izNWksGHWKPOE_7BWnwJrHAJKq6hxbhhJ-9LjU0AG2p9Wxf48CeAyHyT5l71IAoUA_25rZi4GwXB6OkGYbO4-i-L0ZjszJUJU"); HdlToLcUtils.getInstance().setSubAccessToken("St_00009ed748c2b03f4100b6ea97a37466"); HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJhZDVmZjhmMTMzNTc0NzMyOGY0YWJhZWIyZjRkZGM4NCIsImNvbXBhbnlJZCI6IjAiLCJyb2xlIjoiIiwiaGVhZGVyUHJlZml4IjoiQmVhcmVyICIsInVzZXJBY2NvdW50Ijoid3hyIiwidGVuYW50SWQiOiIyMCIsInVzZXJUeXBlIjoiVVNFUl9DIiwidG9rZW5UeXBlIjoiYWNjZXNzX3Rva2VuIiwidXNlck5hbWUiOiJrYWVkZSIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NzAzMTM5NjIsIm5iZiI6MTY3MDMwNjc2Mn0.AuGLiwcFoXhhV9zGhzR50myt-o5k1gFSZ7HzXMt_t9fzEfrByM8OG1tVDOZGbCL36dmN5bQVfgzsWrpImssB4KEybyLvGnJ85qGfXSPEG08S5tMB5eI8j0dRX4LSml-K5ViWMj021oZIG-5_ZwUv6BNasnbFTW6qPh6uy-RF3QU"); HdlToLcUtils.getInstance().setSubAccessToken("St_0000sgfdc5297c88a840e59264b22681"); // HdlToLcUtils.getInstance().openActivity(); // HdlToLcUtils.getInstance().addCamera(new IAddCamera() { // @Override // public void back() { // // } // }); HdlToLcUtils.getInstance().play("8F05F83AAG05B3A","xxxx"); HdlToLcUtils.getInstance().addCamera(new IAddCamera() { @Override public void back() { } }); // HdlToLcUtils.getInstance().play("8F05F83AAG05B3A","xxxx"); }
@@ -102,6 +102,7 @@ } //开启添加页面 activity.startActivity(new Intent(activity.getApplication(), DeviceAddActivity.class)); HdlToLcUtils.getInstance().requestCameraPermissions(); } @@ -173,6 +174,47 @@ }); } public boolean checkCameraPermissions(){ boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; return isGranted; } /** * 请求摄像头全下 */ public void requestCameraPermissions(){ boolean isMinSDKM = Build.VERSION.SDK_INT < 23; boolean isGranted = ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; if (isMinSDKM || isGranted) { return; } requestRecordCameraPermission(); } private void requestRecordCameraPermission() { if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA) || ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) || ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.READ_EXTERNAL_STORAGE)) { ActivityCompat.requestPermissions(activity, new String[]{ Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, 1); } else { ActivityCompat.requestPermissions(activity, new String[]{ Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, 1); } } /** * 请求对讲权限 AndroidOpenDemo/app/src/main/res/values/styles.xml
@@ -1,12 +1,14 @@ <resources> <!-- Base application theme. --> <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppThemeLc" parent="Theme.AppCompat.NoActionBar"> <!-- Customize your theme here. --> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> <item name="background_color">#F2F3F7</item> <item name="android:windowNoTitle">true</item> <item name="android:windowIsTranslucent">false</item> </style> <style name="lc_demo_loading" parent="@android:style/Widget.ProgressBar"> <item name="android:indeterminateOnly">true</item> @@ -46,9 +48,9 @@ <item name="android:textCursorDrawable">@drawable/common_edit_text_cursor_bg</item> <item name="android:textSize">15sp</item> </style> <style name="device_page_style" parent="@style/Theme.AppCompat.NoActionBar"> <item name="background_color">#FF000000</item> <style name="AppTheme" parent="@style/Theme.AppCompat.NoActionBar"> <item name="background_color">#F2F3F7</item> <item name="android:windowIsTranslucent">false</item> <item name="android:statusBarColor">#000000</item> <item name="android:statusBarColor">#232323</item> </style> </resources> AndroidOpenDemo/third-zxing/build.gradle
@@ -33,6 +33,7 @@ dependencies { api fileTree(include: ['*.jar'], dir: 'libs') // compileOnly fileTree(include: ['*.jar'], dir: 'libs') androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) AndroidOpenDemo/third-zxing/src/main/res/values/colors_ui.xml
@@ -30,4 +30,5 @@ <!--新UI规范颜色值统一命名--> <color name="color5">#424243</color> <color name="color9">#cccccc</color> <color name="white">#FFFFFF</color> </resources>
