diff --git a/PushSDK/.classpath b/PushSDK/.classpath deleted file mode 100644 index 7c76757..0000000 --- a/PushSDK/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/PushSDK/.project b/PushSDK/.project deleted file mode 100644 index ad9727b..0000000 --- a/PushSDK/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - PushSDK - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/PushSDK/.settings/org.eclipse.jdt.core.prefs b/PushSDK/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2d..0000000 --- a/PushSDK/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/PushSDK/AndroidManifest.xml b/PushSDK/AndroidManifest.xml deleted file mode 100644 index 7bfdd16..0000000 --- a/PushSDK/AndroidManifest.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PushSDK/bin/AndroidManifest.xml b/PushSDK/bin/AndroidManifest.xml deleted file mode 100644 index c67a642..0000000 --- a/PushSDK/bin/AndroidManifest.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PushSDK/bin/R.txt b/PushSDK/bin/R.txt deleted file mode 100644 index 4ae0fe7..0000000 --- a/PushSDK/bin/R.txt +++ /dev/null @@ -1,7 +0,0 @@ -int id notification_large_icon1 0x7f030001 -int id notification_large_icon2 0x7f030005 -int id notification_text 0x7f030003 -int id notification_title 0x7f030002 -int id upush_notification1 0x7f030000 -int id upush_notification2 0x7f030004 -int layout upush_notification 0x7f020000 diff --git a/PushSDK/bin/classes/com/umeng/message/lib/BuildConfig.class b/PushSDK/bin/classes/com/umeng/message/lib/BuildConfig.class deleted file mode 100644 index 29975a8..0000000 Binary files a/PushSDK/bin/classes/com/umeng/message/lib/BuildConfig.class and /dev/null differ diff --git a/PushSDK/bin/classes/com/umeng/message/lib/R$attr.class b/PushSDK/bin/classes/com/umeng/message/lib/R$attr.class deleted file mode 100644 index a1422e4..0000000 Binary files a/PushSDK/bin/classes/com/umeng/message/lib/R$attr.class and /dev/null differ diff --git a/PushSDK/bin/classes/com/umeng/message/lib/R$id.class b/PushSDK/bin/classes/com/umeng/message/lib/R$id.class deleted file mode 100644 index 9c72cbb..0000000 Binary files a/PushSDK/bin/classes/com/umeng/message/lib/R$id.class and /dev/null differ diff --git a/PushSDK/bin/classes/com/umeng/message/lib/R$layout.class b/PushSDK/bin/classes/com/umeng/message/lib/R$layout.class deleted file mode 100644 index 6f8c458..0000000 Binary files a/PushSDK/bin/classes/com/umeng/message/lib/R$layout.class and /dev/null differ diff --git a/PushSDK/bin/classes/com/umeng/message/lib/R.class b/PushSDK/bin/classes/com/umeng/message/lib/R.class deleted file mode 100644 index 510c24f..0000000 Binary files a/PushSDK/bin/classes/com/umeng/message/lib/R.class and /dev/null differ diff --git a/PushSDK/bin/jarlist.cache b/PushSDK/bin/jarlist.cache deleted file mode 100644 index 0565465..0000000 --- a/PushSDK/bin/jarlist.cache +++ /dev/null @@ -1,3 +0,0 @@ -# cache for current jar dependency. DO NOT EDIT. -# format is -# Encoding is UTF-8 diff --git a/PushSDK/bin/pushsdk.jar b/PushSDK/bin/pushsdk.jar deleted file mode 100644 index 13c1d01..0000000 Binary files a/PushSDK/bin/pushsdk.jar and /dev/null differ diff --git a/PushSDK/build.gradle b/PushSDK/build.gradle deleted file mode 100644 index 8e1afd6..0000000 --- a/PushSDK/build.gradle +++ /dev/null @@ -1,32 +0,0 @@ -apply plugin: 'android-library' - -dependencies { - compile fileTree(dir: 'libs', include: '*.jar') -} - -android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" - defaultConfig { - minSdkVersion 9 - targetSdkVersion 26 - } - lintOptions { - abortOnError false - } - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - jniLibs.srcDirs = ['libs'] - java.srcDirs = [] - resources.srcDirs = [] - aidl.srcDirs = [] - renderscript.srcDirs = [] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - // Move the tests to tests/java, tests/res, etc... - androidTest.setRoot('tests') - } -} diff --git a/PushSDK/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/umeng/message/com/zbar/lib/R.java b/PushSDK/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/umeng/message/com/zbar/lib/R.java deleted file mode 100644 index a547c83..0000000 --- a/PushSDK/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/com/umeng/message/com/zbar/lib/R.java +++ /dev/null @@ -1,27 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * gradle plugin from the resource data it found. It - * should not be modified by hand. - */ -package com.umeng.message.com.zbar.lib; - -public final class R { - private R() {} - - public static final class id { - private id() {} - - public static int notification_large_icon1 = 0x7f0c0001; - public static int notification_large_icon2 = 0x7f0c0002; - public static int notification_text = 0x7f0c0003; - public static int notification_title = 0x7f0c0004; - public static int upush_notification1 = 0x7f0c0005; - public static int upush_notification2 = 0x7f0c0006; - } - public static final class layout { - private layout() {} - - public static int upush_notification = 0x7f0f0001; - } -} diff --git a/PushSDK/build/generated/not_namespaced_r_class_sources/release/generateReleaseRFile/out/com/umeng/message/com/zbar/lib/R.java b/PushSDK/build/generated/not_namespaced_r_class_sources/release/generateReleaseRFile/out/com/umeng/message/com/zbar/lib/R.java deleted file mode 100644 index a547c83..0000000 --- a/PushSDK/build/generated/not_namespaced_r_class_sources/release/generateReleaseRFile/out/com/umeng/message/com/zbar/lib/R.java +++ /dev/null @@ -1,27 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * gradle plugin from the resource data it found. It - * should not be modified by hand. - */ -package com.umeng.message.com.zbar.lib; - -public final class R { - private R() {} - - public static final class id { - private id() {} - - public static int notification_large_icon1 = 0x7f0c0001; - public static int notification_large_icon2 = 0x7f0c0002; - public static int notification_text = 0x7f0c0003; - public static int notification_title = 0x7f0c0004; - public static int upush_notification1 = 0x7f0c0005; - public static int upush_notification2 = 0x7f0c0006; - } - public static final class layout { - private layout() {} - - public static int upush_notification = 0x7f0f0001; - } -} diff --git a/PushSDK/build/generated/source/buildConfig/debug/com/umeng/message/com/zbar/lib/BuildConfig.java b/PushSDK/build/generated/source/buildConfig/debug/com/umeng/message/com/zbar/lib/BuildConfig.java deleted file mode 100644 index eefed5c..0000000 --- a/PushSDK/build/generated/source/buildConfig/debug/com/umeng/message/com/zbar/lib/BuildConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.umeng.message.com.zbar.lib; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String APPLICATION_ID = "com.umeng.message.com.zbar.lib"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "1.0"; -} diff --git a/PushSDK/build/generated/source/buildConfig/release/com/umeng/message/com/zbar/lib/BuildConfig.java b/PushSDK/build/generated/source/buildConfig/release/com/umeng/message/com/zbar/lib/BuildConfig.java deleted file mode 100644 index 71b0cd4..0000000 --- a/PushSDK/build/generated/source/buildConfig/release/com/umeng/message/com/zbar/lib/BuildConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.umeng.message.com.zbar.lib; - -public final class BuildConfig { - public static final boolean DEBUG = false; - public static final String APPLICATION_ID = "com.umeng.message.com.zbar.lib"; - public static final String BUILD_TYPE = "release"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "1.0"; -} diff --git a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml b/PushSDK/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml deleted file mode 100644 index 579fd91..0000000 --- a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output.json b/PushSDK/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output.json deleted file mode 100644 index 0f6abd2..0000000 --- a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"PushSDK-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.umeng.message.com.zbar.lib","split":""}}] \ No newline at end of file diff --git a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/AndroidManifest.xml b/PushSDK/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/AndroidManifest.xml deleted file mode 100644 index 579fd91..0000000 --- a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/output.json b/PushSDK/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/output.json deleted file mode 100644 index ba4e3d0..0000000 --- a/PushSDK/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"PushSDK-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.umeng.message.com.zbar.lib","split":""}}] \ No newline at end of file diff --git a/PushSDK/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json b/PushSDK/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json deleted file mode 100644 index 0637a08..0000000 --- a/PushSDK/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/PushSDK/build/intermediates/annotation_processor_list/release/javaPreCompileRelease/annotationProcessors.json b/PushSDK/build/intermediates/annotation_processor_list/release/javaPreCompileRelease/annotationProcessors.json deleted file mode 100644 index 0637a08..0000000 --- a/PushSDK/build/intermediates/annotation_processor_list/release/javaPreCompileRelease/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/debug-mergeJniLibs/merge-state b/PushSDK/build/intermediates/incremental/debug-mergeJniLibs/merge-state deleted file mode 100644 index 1f5504e..0000000 Binary files a/PushSDK/build/intermediates/incremental/debug-mergeJniLibs/merge-state and /dev/null differ diff --git a/PushSDK/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/PushSDK/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index 97008dc..0000000 --- a/PushSDK/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/mergeDebugShaders/merger.xml b/PushSDK/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 4f87516..0000000 --- a/PushSDK/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/PushSDK/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml deleted file mode 100644 index 27f01f8..0000000 --- a/PushSDK/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/PushSDK/build/intermediates/incremental/mergeReleaseShaders/merger.xml deleted file mode 100644 index 1afbffc..0000000 --- a/PushSDK/build/intermediates/incremental/mergeReleaseShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/packageDebugAssets/merger.xml b/PushSDK/build/intermediates/incremental/packageDebugAssets/merger.xml deleted file mode 100644 index 8d1b47e..0000000 --- a/PushSDK/build/intermediates/incremental/packageDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/PushSDK/build/intermediates/incremental/packageDebugResources/compile-file-map.properties deleted file mode 100644 index ae6d328..0000000 --- a/PushSDK/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Fri May 21 11:21:45 CST 2021 -F\:\\202076work\\ApplicationPatient\\PushSDK\\res\\layout\\upush_notification.xml=F\:\\202076work\\ApplicationPatient\\PushSDK\\build\\intermediates\\packaged_res\\debug\\layout\\upush_notification.xml diff --git a/PushSDK/build/intermediates/incremental/packageDebugResources/merger.xml b/PushSDK/build/intermediates/incremental/packageDebugResources/merger.xml deleted file mode 100644 index 554f6cf..0000000 --- a/PushSDK/build/intermediates/incremental/packageDebugResources/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/packageReleaseAssets/merger.xml b/PushSDK/build/intermediates/incremental/packageReleaseAssets/merger.xml deleted file mode 100644 index e4114e2..0000000 --- a/PushSDK/build/intermediates/incremental/packageReleaseAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/PushSDK/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties deleted file mode 100644 index 0d9dd28..0000000 --- a/PushSDK/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Fri May 21 14:47:48 CST 2021 -F\:\\202076work\\ApplicationPatient\\PushSDK\\res\\layout\\upush_notification.xml=F\:\\202076work\\ApplicationPatient\\PushSDK\\build\\intermediates\\packaged_res\\release\\layout\\upush_notification.xml diff --git a/PushSDK/build/intermediates/incremental/packageReleaseResources/merger.xml b/PushSDK/build/intermediates/incremental/packageReleaseResources/merger.xml deleted file mode 100644 index a8734e9..0000000 --- a/PushSDK/build/intermediates/incremental/packageReleaseResources/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/incremental/release-mergeJniLibs/merge-state b/PushSDK/build/intermediates/incremental/release-mergeJniLibs/merge-state deleted file mode 100644 index 92bff39..0000000 Binary files a/PushSDK/build/intermediates/incremental/release-mergeJniLibs/merge-state and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/debug/classes.jar b/PushSDK/build/intermediates/intermediate-jars/debug/classes.jar deleted file mode 100644 index 4ac6f52..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/debug/classes.jar and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/debug/jni/armeabi/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/intermediate-jars/debug/jni/armeabi/libcocklogic-1.1.3.so deleted file mode 100644 index 0f5fdf7..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/debug/jni/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/debug/jni/armeabi/libtnet-3.1.11.so b/PushSDK/build/intermediates/intermediate-jars/debug/jni/armeabi/libtnet-3.1.11.so deleted file mode 100644 index 64c082a..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/debug/jni/armeabi/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/debug/jni/x86/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/intermediate-jars/debug/jni/x86/libcocklogic-1.1.3.so deleted file mode 100644 index 4800df9..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/debug/jni/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/debug/jni/x86/libtnet-3.1.11.so b/PushSDK/build/intermediates/intermediate-jars/debug/jni/x86/libtnet-3.1.11.so deleted file mode 100644 index c65faf9..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/debug/jni/x86/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/debug/res.jar b/PushSDK/build/intermediates/intermediate-jars/debug/res.jar deleted file mode 100644 index 15cb0ec..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/debug/res.jar and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/release/classes.jar b/PushSDK/build/intermediates/intermediate-jars/release/classes.jar deleted file mode 100644 index 2414597..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/release/classes.jar and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/release/jni/armeabi/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/intermediate-jars/release/jni/armeabi/libcocklogic-1.1.3.so deleted file mode 100644 index 0f5fdf7..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/release/jni/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/release/jni/armeabi/libtnet-3.1.11.so b/PushSDK/build/intermediates/intermediate-jars/release/jni/armeabi/libtnet-3.1.11.so deleted file mode 100644 index 64c082a..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/release/jni/armeabi/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/release/jni/x86/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/intermediate-jars/release/jni/x86/libcocklogic-1.1.3.so deleted file mode 100644 index 4800df9..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/release/jni/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/release/jni/x86/libtnet-3.1.11.so b/PushSDK/build/intermediates/intermediate-jars/release/jni/x86/libtnet-3.1.11.so deleted file mode 100644 index c65faf9..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/release/jni/x86/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/intermediate-jars/release/res.jar b/PushSDK/build/intermediates/intermediate-jars/release/res.jar deleted file mode 100644 index 15cb0ec..0000000 Binary files a/PushSDK/build/intermediates/intermediate-jars/release/res.jar and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/BuildConfig.class b/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/BuildConfig.class deleted file mode 100644 index 7b63842..0000000 Binary files a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/BuildConfig.class and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$id.class b/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$id.class deleted file mode 100644 index dae2e9a..0000000 Binary files a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$id.class and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$layout.class b/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$layout.class deleted file mode 100644 index b2eace9..0000000 Binary files a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$layout.class and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R.class b/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R.class deleted file mode 100644 index ef13d32..0000000 Binary files a/PushSDK/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R.class and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/BuildConfig.class b/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/BuildConfig.class deleted file mode 100644 index 5938b6b..0000000 Binary files a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/BuildConfig.class and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$id.class b/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$id.class deleted file mode 100644 index dae2e9a..0000000 Binary files a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$id.class and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$layout.class b/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$layout.class deleted file mode 100644 index b2eace9..0000000 Binary files a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R$layout.class and /dev/null differ diff --git a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R.class b/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R.class deleted file mode 100644 index ef13d32..0000000 Binary files a/PushSDK/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/umeng/message/com/zbar/lib/R.class and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/debug/armeabi/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/jniLibs/debug/armeabi/libcocklogic-1.1.3.so deleted file mode 100644 index 0f5fdf7..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/debug/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/debug/armeabi/libtnet-3.1.11.so b/PushSDK/build/intermediates/jniLibs/debug/armeabi/libtnet-3.1.11.so deleted file mode 100644 index 64c082a..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/debug/armeabi/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/debug/com.umeng.message_3.1.1a.jar b/PushSDK/build/intermediates/jniLibs/debug/com.umeng.message_3.1.1a.jar deleted file mode 100644 index 7a05a3e..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/debug/com.umeng.message_3.1.1a.jar and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/debug/x86/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/jniLibs/debug/x86/libcocklogic-1.1.3.so deleted file mode 100644 index 4800df9..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/debug/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/debug/x86/libtnet-3.1.11.so b/PushSDK/build/intermediates/jniLibs/debug/x86/libtnet-3.1.11.so deleted file mode 100644 index c65faf9..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/debug/x86/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/release/armeabi/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/jniLibs/release/armeabi/libcocklogic-1.1.3.so deleted file mode 100644 index 0f5fdf7..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/release/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/release/armeabi/libtnet-3.1.11.so b/PushSDK/build/intermediates/jniLibs/release/armeabi/libtnet-3.1.11.so deleted file mode 100644 index 64c082a..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/release/armeabi/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/release/com.umeng.message_3.1.1a.jar b/PushSDK/build/intermediates/jniLibs/release/com.umeng.message_3.1.1a.jar deleted file mode 100644 index 7a05a3e..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/release/com.umeng.message_3.1.1a.jar and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/release/x86/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/jniLibs/release/x86/libcocklogic-1.1.3.so deleted file mode 100644 index 4800df9..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/release/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/jniLibs/release/x86/libtnet-3.1.11.so b/PushSDK/build/intermediates/jniLibs/release/x86/libtnet-3.1.11.so deleted file mode 100644 index c65faf9..0000000 Binary files a/PushSDK/build/intermediates/jniLibs/release/x86/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/merged_manifests/debug/processDebugManifest/merged/AndroidManifest.xml b/PushSDK/build/intermediates/merged_manifests/debug/processDebugManifest/merged/AndroidManifest.xml deleted file mode 100644 index 579fd91..0000000 --- a/PushSDK/build/intermediates/merged_manifests/debug/processDebugManifest/merged/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/merged_manifests/debug/processDebugManifest/merged/output.json b/PushSDK/build/intermediates/merged_manifests/debug/processDebugManifest/merged/output.json deleted file mode 100644 index 9b40a03..0000000 --- a/PushSDK/build/intermediates/merged_manifests/debug/processDebugManifest/merged/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"PushSDK-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.umeng.message.com.zbar.lib","split":""}}] \ No newline at end of file diff --git a/PushSDK/build/intermediates/merged_manifests/release/processReleaseManifest/merged/AndroidManifest.xml b/PushSDK/build/intermediates/merged_manifests/release/processReleaseManifest/merged/AndroidManifest.xml deleted file mode 100644 index 579fd91..0000000 --- a/PushSDK/build/intermediates/merged_manifests/release/processReleaseManifest/merged/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/merged_manifests/release/processReleaseManifest/merged/output.json b/PushSDK/build/intermediates/merged_manifests/release/processReleaseManifest/merged/output.json deleted file mode 100644 index 0758680..0000000 --- a/PushSDK/build/intermediates/merged_manifests/release/processReleaseManifest/merged/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"PushSDK-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.umeng.message.com.zbar.lib","split":""}}] \ No newline at end of file diff --git a/PushSDK/build/intermediates/packaged_res/debug/layout/upush_notification.xml b/PushSDK/build/intermediates/packaged_res/debug/layout/upush_notification.xml deleted file mode 100644 index 79a9ade..0000000 --- a/PushSDK/build/intermediates/packaged_res/debug/layout/upush_notification.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/packaged_res/release/layout/upush_notification.xml b/PushSDK/build/intermediates/packaged_res/release/layout/upush_notification.xml deleted file mode 100644 index 79a9ade..0000000 --- a/PushSDK/build/intermediates/packaged_res/release/layout/upush_notification.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PushSDK/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/PushSDK/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt deleted file mode 100644 index b9eda47..0000000 --- a/PushSDK/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt +++ /dev/null @@ -1,8 +0,0 @@ -com.umeng.message.com.zbar.lib -id notification_large_icon1 -id notification_large_icon2 -id notification_text -id notification_title -id upush_notification1 -id upush_notification2 -layout upush_notification diff --git a/PushSDK/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt b/PushSDK/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt deleted file mode 100644 index b9eda47..0000000 --- a/PushSDK/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt +++ /dev/null @@ -1,8 +0,0 @@ -com.umeng.message.com.zbar.lib -id notification_large_icon1 -id notification_large_icon2 -id notification_text -id notification_title -id upush_notification1 -id upush_notification2 -layout upush_notification diff --git a/PushSDK/build/intermediates/symbols/debug/R.txt b/PushSDK/build/intermediates/symbols/debug/R.txt deleted file mode 100644 index c4418df..0000000 --- a/PushSDK/build/intermediates/symbols/debug/R.txt +++ /dev/null @@ -1,7 +0,0 @@ -int id notification_large_icon1 0x7f0c0001 -int id notification_large_icon2 0x7f0c0002 -int id notification_text 0x7f0c0003 -int id notification_title 0x7f0c0004 -int id upush_notification1 0x7f0c0005 -int id upush_notification2 0x7f0c0006 -int layout upush_notification 0x7f0f0001 diff --git a/PushSDK/build/intermediates/symbols/release/R.txt b/PushSDK/build/intermediates/symbols/release/R.txt deleted file mode 100644 index c4418df..0000000 --- a/PushSDK/build/intermediates/symbols/release/R.txt +++ /dev/null @@ -1,7 +0,0 @@ -int id notification_large_icon1 0x7f0c0001 -int id notification_large_icon2 0x7f0c0002 -int id notification_text 0x7f0c0003 -int id notification_title 0x7f0c0004 -int id upush_notification1 0x7f0c0005 -int id upush_notification2 0x7f0c0006 -int layout upush_notification 0x7f0f0001 diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi/libcocklogic-1.1.3.so deleted file mode 100644 index 0f5fdf7..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi/libtnet-3.1.11.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi/libtnet-3.1.11.so deleted file mode 100644 index 64c082a..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/armeabi/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/x86/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/x86/libcocklogic-1.1.3.so deleted file mode 100644 index 4800df9..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/x86/libtnet-3.1.11.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/x86/libtnet-3.1.11.so deleted file mode 100644 index c65faf9..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/0/lib/x86/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/__content__.json b/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/__content__.json deleted file mode 100644 index 0a6aa0f..0000000 --- a/PushSDK/build/intermediates/transforms/mergeJniLibs/debug/__content__.json +++ /dev/null @@ -1 +0,0 @@ -[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":true}] \ No newline at end of file diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi/libcocklogic-1.1.3.so deleted file mode 100644 index 0f5fdf7..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi/libtnet-3.1.11.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi/libtnet-3.1.11.so deleted file mode 100644 index 64c082a..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/armeabi/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libcocklogic-1.1.3.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libcocklogic-1.1.3.so deleted file mode 100644 index 4800df9..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libtnet-3.1.11.so b/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libtnet-3.1.11.so deleted file mode 100644 index c65faf9..0000000 Binary files a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/0/lib/x86/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/__content__.json b/PushSDK/build/intermediates/transforms/mergeJniLibs/release/__content__.json deleted file mode 100644 index 0a6aa0f..0000000 --- a/PushSDK/build/intermediates/transforms/mergeJniLibs/release/__content__.json +++ /dev/null @@ -1 +0,0 @@ -[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":true}] \ No newline at end of file diff --git a/PushSDK/build/outputs/logs/manifest-merger-debug-report.txt b/PushSDK/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index aec60f2..0000000 --- a/PushSDK/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,299 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 - package - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:3:5-45 - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - android:versionName - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:5:5-30 - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - xmlns:android - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:11-69 - android:versionCode - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:4:5-28 - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -uses-permission#android.permission.INTERNET -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:8:5-67 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:8:22-64 -uses-permission#android.permission.ACCESS_NETWORK_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:9:5-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:9:22-76 -uses-permission#android.permission.ACCESS_WIFI_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:10:5-76 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:10:22-73 -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:11:5-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:11:22-78 -uses-permission#android.permission.WAKE_LOCK -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:12:5-68 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:12:22-65 -uses-permission#android.permission.READ_PHONE_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:13:5-75 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:13:22-72 -uses-permission#android.permission.BROADCAST_PACKAGE_ADDED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:14:5-82 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:14:22-79 -uses-permission#android.permission.BROADCAST_PACKAGE_CHANGED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:15:5-84 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:15:22-81 -uses-permission#android.permission.BROADCAST_PACKAGE_INSTALL -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:16:5-84 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:16:22-81 -uses-permission#android.permission.BROADCAST_PACKAGE_REPLACED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:17:5-85 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:17:22-82 -uses-permission#android.permission.RESTART_PACKAGES -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:18:5-75 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:18:22-72 -uses-permission#android.permission.GET_TASKS -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:19:5-68 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:19:22-65 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:20:5-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:20:22-78 -uses-permission#android.permission.CHANGE_NETWORK_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:21:5-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:21:22-76 -uses-permission#android.permission.CHANGE_WIFI_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:22:5-76 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:22:22-73 -application -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:24:5-159:19 -service#com.taobao.accs.ChannelService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:26:9-36:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:29:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:28:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:27:13-58 -intent-filter#action:name:com.taobao.accs.intent.action.SERVICE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:30:13-32:29 -action#com.taobao.accs.intent.action.SERVICE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:31:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:31:25-77 -intent-filter#action:name:com.taobao.accs.intent.action.ELECTION -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:33:13-35:29 -action#com.taobao.accs.intent.action.ELECTION -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:34:17-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:34:25-78 -service#com.taobao.accs.data.MsgDistributeService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:38:9-44:19 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:40:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:39:13-69 -intent-filter#action:name:com.taobao.accs.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:41:13-43:29 -action#com.taobao.accs.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:42:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:42:25-77 -receiver#com.taobao.accs.EventReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:46:9-62:20 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:48:13-39 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:47:13-57 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:49:13-51:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:50:17-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:50:25-76 -intent-filter#action:name:android.net.conn.CONNECTIVITY_CHANGE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:52:13-54:29 -action#android.net.conn.CONNECTIVITY_CHANGE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:53:17-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:53:25-76 -intent-filter#action:name:android.intent.action.PACKAGE_REMOVED+data:scheme:package -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:55:13-58:29 -action#android.intent.action.PACKAGE_REMOVED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:56:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:56:25-77 -data -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:57:17-50 - android:scheme - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:57:23-47 -intent-filter#action:name:android.intent.action.USER_PRESENT -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:59:13-61:29 -action#android.intent.action.USER_PRESENT -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:60:17-77 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:60:25-74 -receiver#com.taobao.accs.ServiceReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:64:9-73:20 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:66:13-39 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:65:13-59 -intent-filter#action:name:com.taobao.accs.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:67:13-69:29 -action#com.taobao.accs.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:68:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:68:25-77 -intent-filter#action:name:com.taobao.accs.intent.action.START_FROM_AGOO -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:70:13-72:29 -action#com.taobao.accs.intent.action.START_FROM_AGOO -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:71:17-88 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:71:25-85 -service#com.taobao.accs.ChannelService$KernelService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:75:9-77:42 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:77:13-39 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:76:13-72 -service#org.android.agoo.accs.AgooService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:79:9-85:19 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:81:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:80:13-61 -service#com.umeng.message.UmengIntentService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:87:9-94:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:90:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:89:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:88:13-64 -intent-filter#action:name:org.agoo.android.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:91:13-93:29 -action#org.agoo.android.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:92:17-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:92:25-78 -service#com.umeng.message.XiaomiIntentService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:96:9-103:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:99:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:98:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:97:13-65 -receiver#com.taobao.agoo.AgooCommondReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:105:9-116:20 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:108:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:107:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:106:13-63 -intent-filter#action:name:cn.shangyu.gdxzPatient.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:109:13-111:29 -action#cn.shangyu.gdxzPatient.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:110:17-87 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:110:25-84 -service#com.umeng.message.UmengMessageIntentReceiverService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:118:9-125:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:121:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:120:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:119:13-79 -intent-filter#action:name:org.android.agoo.client.MessageReceiverService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:122:13-124:29 -action#org.android.agoo.client.MessageReceiverService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:123:17-89 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:123:25-86 -receiver#com.umeng.message.NotificationProxyBroadcastReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:127:9-129:40 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:129:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:128:13-80 -service#com.umeng.message.UmengMessageCallbackHandlerService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:131:9-146:19 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:133:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:132:13-80 -intent-filter#action:name:com.umeng.messge.registercallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:134:13-136:29 -action#com.umeng.messge.registercallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:135:17-83 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:135:25-80 -intent-filter#action:name:com.umeng.message.enablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:137:13-139:29 -action#com.umeng.message.enablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:138:17-82 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:138:25-79 -intent-filter#action:name:com.umeng.message.disablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:140:13-142:29 -action#com.umeng.message.disablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:141:17-83 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:141:25-80 -intent-filter#action:name:com.umeng.message.message.handler.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:143:13-145:29 -action#com.umeng.message.message.handler.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:144:17-83 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:144:25-80 -service#com.umeng.message.UmengDownloadResourceService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:148:9-150:40 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:150:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:149:13-74 -provider#com.umeng.message.provider.MessageProvider -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:152:9-157:20 - android:authorities - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:154:13-71 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:155:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:153:13-70 -grant-uri-permission -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:156:13-62 - android:pathPattern - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:156:35-59 -uses-sdk -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - android:targetSdkVersion - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - android:minSdkVersion - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml diff --git a/PushSDK/build/outputs/logs/manifest-merger-release-report.txt b/PushSDK/build/outputs/logs/manifest-merger-release-report.txt deleted file mode 100644 index aec60f2..0000000 --- a/PushSDK/build/outputs/logs/manifest-merger-release-report.txt +++ /dev/null @@ -1,299 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:1-161:12 - package - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:3:5-45 - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - android:versionName - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:5:5-30 - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - xmlns:android - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:2:11-69 - android:versionCode - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:4:5-28 - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -uses-permission#android.permission.INTERNET -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:8:5-67 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:8:22-64 -uses-permission#android.permission.ACCESS_NETWORK_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:9:5-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:9:22-76 -uses-permission#android.permission.ACCESS_WIFI_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:10:5-76 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:10:22-73 -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:11:5-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:11:22-78 -uses-permission#android.permission.WAKE_LOCK -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:12:5-68 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:12:22-65 -uses-permission#android.permission.READ_PHONE_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:13:5-75 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:13:22-72 -uses-permission#android.permission.BROADCAST_PACKAGE_ADDED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:14:5-82 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:14:22-79 -uses-permission#android.permission.BROADCAST_PACKAGE_CHANGED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:15:5-84 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:15:22-81 -uses-permission#android.permission.BROADCAST_PACKAGE_INSTALL -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:16:5-84 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:16:22-81 -uses-permission#android.permission.BROADCAST_PACKAGE_REPLACED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:17:5-85 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:17:22-82 -uses-permission#android.permission.RESTART_PACKAGES -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:18:5-75 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:18:22-72 -uses-permission#android.permission.GET_TASKS -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:19:5-68 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:19:22-65 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:20:5-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:20:22-78 -uses-permission#android.permission.CHANGE_NETWORK_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:21:5-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:21:22-76 -uses-permission#android.permission.CHANGE_WIFI_STATE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:22:5-76 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:22:22-73 -application -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:24:5-159:19 -service#com.taobao.accs.ChannelService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:26:9-36:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:29:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:28:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:27:13-58 -intent-filter#action:name:com.taobao.accs.intent.action.SERVICE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:30:13-32:29 -action#com.taobao.accs.intent.action.SERVICE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:31:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:31:25-77 -intent-filter#action:name:com.taobao.accs.intent.action.ELECTION -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:33:13-35:29 -action#com.taobao.accs.intent.action.ELECTION -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:34:17-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:34:25-78 -service#com.taobao.accs.data.MsgDistributeService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:38:9-44:19 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:40:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:39:13-69 -intent-filter#action:name:com.taobao.accs.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:41:13-43:29 -action#com.taobao.accs.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:42:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:42:25-77 -receiver#com.taobao.accs.EventReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:46:9-62:20 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:48:13-39 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:47:13-57 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:49:13-51:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:50:17-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:50:25-76 -intent-filter#action:name:android.net.conn.CONNECTIVITY_CHANGE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:52:13-54:29 -action#android.net.conn.CONNECTIVITY_CHANGE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:53:17-79 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:53:25-76 -intent-filter#action:name:android.intent.action.PACKAGE_REMOVED+data:scheme:package -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:55:13-58:29 -action#android.intent.action.PACKAGE_REMOVED -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:56:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:56:25-77 -data -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:57:17-50 - android:scheme - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:57:23-47 -intent-filter#action:name:android.intent.action.USER_PRESENT -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:59:13-61:29 -action#android.intent.action.USER_PRESENT -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:60:17-77 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:60:25-74 -receiver#com.taobao.accs.ServiceReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:64:9-73:20 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:66:13-39 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:65:13-59 -intent-filter#action:name:com.taobao.accs.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:67:13-69:29 -action#com.taobao.accs.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:68:17-80 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:68:25-77 -intent-filter#action:name:com.taobao.accs.intent.action.START_FROM_AGOO -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:70:13-72:29 -action#com.taobao.accs.intent.action.START_FROM_AGOO -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:71:17-88 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:71:25-85 -service#com.taobao.accs.ChannelService$KernelService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:75:9-77:42 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:77:13-39 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:76:13-72 -service#org.android.agoo.accs.AgooService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:79:9-85:19 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:81:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:80:13-61 -service#com.umeng.message.UmengIntentService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:87:9-94:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:90:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:89:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:88:13-64 -intent-filter#action:name:org.agoo.android.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:91:13-93:29 -action#org.agoo.android.intent.action.RECEIVE -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:92:17-81 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:92:25-78 -service#com.umeng.message.XiaomiIntentService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:96:9-103:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:99:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:98:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:97:13-65 -receiver#com.taobao.agoo.AgooCommondReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:105:9-116:20 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:108:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:107:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:106:13-63 -intent-filter#action:name:cn.shangyu.gdxzPatient.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:109:13-111:29 -action#cn.shangyu.gdxzPatient.intent.action.COMMAND -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:110:17-87 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:110:25-84 -service#com.umeng.message.UmengMessageIntentReceiverService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:118:9-125:19 - android:process - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:121:13-39 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:120:13-36 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:119:13-79 -intent-filter#action:name:org.android.agoo.client.MessageReceiverService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:122:13-124:29 -action#org.android.agoo.client.MessageReceiverService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:123:17-89 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:123:25-86 -receiver#com.umeng.message.NotificationProxyBroadcastReceiver -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:127:9-129:40 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:129:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:128:13-80 -service#com.umeng.message.UmengMessageCallbackHandlerService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:131:9-146:19 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:133:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:132:13-80 -intent-filter#action:name:com.umeng.messge.registercallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:134:13-136:29 -action#com.umeng.messge.registercallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:135:17-83 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:135:25-80 -intent-filter#action:name:com.umeng.message.enablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:137:13-139:29 -action#com.umeng.message.enablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:138:17-82 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:138:25-79 -intent-filter#action:name:com.umeng.message.disablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:140:13-142:29 -action#com.umeng.message.disablecallback.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:141:17-83 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:141:25-80 -intent-filter#action:name:com.umeng.message.message.handler.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:143:13-145:29 -action#com.umeng.message.message.handler.action -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:144:17-83 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:144:25-80 -service#com.umeng.message.UmengDownloadResourceService -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:148:9-150:40 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:150:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:149:13-74 -provider#com.umeng.message.provider.MessageProvider -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:152:9-157:20 - android:authorities - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:154:13-71 - android:exported - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:155:13-37 - android:name - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:153:13-70 -grant-uri-permission -ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:156:13-62 - android:pathPattern - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml:156:35-59 -uses-sdk -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml -INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - android:targetSdkVersion - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - android:minSdkVersion - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - ADDED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml - INJECTED from F:\202076work\ApplicationPatient\PushSDK\AndroidManifest.xml diff --git a/PushSDK/gen/com/umeng/message/lib/BuildConfig.java b/PushSDK/gen/com/umeng/message/lib/BuildConfig.java deleted file mode 100644 index 592414e..0000000 --- a/PushSDK/gen/com/umeng/message/lib/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package com.umeng.message.lib; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/PushSDK/gen/com/umeng/message/lib/R.java b/PushSDK/gen/com/umeng/message/lib/R.java deleted file mode 100644 index 7ee2028..0000000 --- a/PushSDK/gen/com/umeng/message/lib/R.java +++ /dev/null @@ -1,24 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.umeng.message.lib; - -public final class R { - public static final class attr { - } - public static final class id { - public static int notification_large_icon1=0x7f030001; - public static int notification_large_icon2=0x7f030005; - public static int notification_text=0x7f030003; - public static int notification_title=0x7f030002; - public static int upush_notification1=0x7f030000; - public static int upush_notification2=0x7f030004; - } - public static final class layout { - public static int upush_notification=0x7f020000; - } -} diff --git a/PushSDK/libs/armeabi/libcocklogic-1.1.3.so b/PushSDK/libs/armeabi/libcocklogic-1.1.3.so deleted file mode 100644 index 0f5fdf7..0000000 Binary files a/PushSDK/libs/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/libs/armeabi/libtnet-3.1.11.so b/PushSDK/libs/armeabi/libtnet-3.1.11.so deleted file mode 100644 index 64c082a..0000000 Binary files a/PushSDK/libs/armeabi/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/libs/com.umeng.message_3.1.1a.jar b/PushSDK/libs/com.umeng.message_3.1.1a.jar deleted file mode 100644 index 7a05a3e..0000000 Binary files a/PushSDK/libs/com.umeng.message_3.1.1a.jar and /dev/null differ diff --git a/PushSDK/libs/x86/libcocklogic-1.1.3.so b/PushSDK/libs/x86/libcocklogic-1.1.3.so deleted file mode 100644 index 4800df9..0000000 Binary files a/PushSDK/libs/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/PushSDK/libs/x86/libtnet-3.1.11.so b/PushSDK/libs/x86/libtnet-3.1.11.so deleted file mode 100644 index c65faf9..0000000 Binary files a/PushSDK/libs/x86/libtnet-3.1.11.so and /dev/null differ diff --git a/PushSDK/project.properties b/PushSDK/project.properties deleted file mode 100644 index 3ee93d3..0000000 --- a/PushSDK/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. - -target=android-19 -android.library=true -android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file diff --git a/PushSDK/res/layout/upush_notification.xml b/PushSDK/res/layout/upush_notification.xml deleted file mode 100644 index 79a9ade..0000000 --- a/PushSDK/res/layout/upush_notification.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PushSDK/res/values/string.xml b/PushSDK/res/values/string.xml deleted file mode 100644 index 045e125..0000000 --- a/PushSDK/res/values/string.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/build.gradle b/app/build.gradle index b6b71ec..a6142e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,14 +20,15 @@ android { applicationId "cn.shangyu.gdxzPatient" minSdkVersion 19 targetSdkVersion 29 - versionCode 77 - versionName "3.7.7" + versionCode 78 + versionName "3.7.8" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' multiDexEnabled true // signingConfig signingConfigs.config signingConfig signingConfigs.release ndk { - abiFilters "armeabi", "armeabi-v7a", "x86" + abiFilters "armeabi", "armeabi-v7a", "x86","arm64-v8a" +// abiFilters "arm64-v8a" } } lintOptions { @@ -83,6 +84,7 @@ afterEvaluate { dependencies { implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs') implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation project(path: ':zbarlibary') testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { @@ -90,7 +92,7 @@ dependencies { }) implementation files('libs/source-lecast-release.aar') // implementation project(':pingpp') - implementation project(':PushSDK') +// implementation project(':PushSDK') implementation project(path: ':uikit') implementation project(':TimeLib') implementation project(':library_pullToRefresh') @@ -99,15 +101,15 @@ dependencies { implementation files('libs/commons-lang-2.6.jar') // implementation files('libs/glide-3.6.0.jar') implementation files('libs/pinyin4j-2.5.0.jar') - implementation files('libs/SocialSDK_Sina_Simplify.jar') - implementation files('libs/SocialSDK_WeChat_Simplify.jar') +// implementation files('libs/SocialSDK_Sina_Simplify.jar') +// implementation files('libs/SocialSDK_WeChat_Simplify.jar') implementation files('libs/Sunflower.jar') - implementation files('libs/umeng-update-v2.6.0.1.jar') - implementation files('libs/umeng_social_api.jar') - implementation files('libs/umeng_social_net.jar') - implementation files('libs/umeng_social_shareboard.jar') - implementation files('libs/umeng_social_shareview.jar') - implementation files('libs/umeng_social_tool.jar') +// implementation files('libs/umeng-update-v2.6.0.1.jar') +// implementation files('libs/umeng_social_api.jar') +// implementation files('libs/umeng_social_net.jar') +// implementation files('libs/umeng_social_shareboard.jar') +// implementation files('libs/umeng_social_shareview.jar') +// implementation files('libs/umeng_social_tool.jar') implementation files('libs/universal-image-loader-1.9.4-with-sources.jar') implementation files('libs/xUtils-2.6.14.jar') implementation 'androidx.multidex:multidex:2.0.0' @@ -153,4 +155,22 @@ dependencies { implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.5.8' // 使用微信支付时添加,具体版本参考微信官方文档或者 jcenter implementation 'com.pingxx:pingpp-android-alipay:15.7.4' // 使用支付宝时添加(bu包含 UTDID) + // 基础依赖包,必须要依赖 + implementation 'com.gyf.immersionbar:immersionbar:3.0.0' + + // 友盟SDK + implementation 'com.umeng.umsdk:common:9.4.4'// 必选 + implementation 'com.umeng.umsdk:asms:1.4.1'// 必选 + implementation 'com.umeng.umsdk:share-core:7.1.6'//分享核心库,必选 + implementation 'com.umeng.umsdk:share-board:7.1.6'//分享面板功能,可选 + + implementation 'com.umeng.umsdk:share-wx:7.1.6' //微信完整版 + implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.9'//微信官方依赖库,必选 + +// implementation 'com.umeng.umsdk:share-qq:7.1.6'//QQ完整版 +// implementation 'com.tencent.tauth:qqopensdk:3.53.0'//QQ官方依赖库,必选 +// implementation 'com.squareup.okhttp3:okhttp:3.12.12'//QQ SDK在3.53.0版本及以上时需要集成okhttp官方依赖库,必选 + + implementation 'com.umeng.umsdk:share-sina:7.1.6'//新浪微博完整版 +// implementation 'com.sina.weibo.sdk:core:10.10.0:openDefaultRelease@aar'//新浪微博官方SDK依赖库,必选 } diff --git a/app/libs/SocialSDK_Sina_Simplify.jar b/app/libs/SocialSDK_Sina_Simplify.jar deleted file mode 100644 index 8b70917..0000000 Binary files a/app/libs/SocialSDK_Sina_Simplify.jar and /dev/null differ diff --git a/app/libs/SocialSDK_WeChat_Simplify.jar b/app/libs/SocialSDK_WeChat_Simplify.jar deleted file mode 100644 index 7a22206..0000000 Binary files a/app/libs/SocialSDK_WeChat_Simplify.jar and /dev/null differ diff --git a/app/libs/arm64-v8a/libiconv.so b/app/libs/arm64-v8a/libiconv.so new file mode 100644 index 0000000..7b3c8ef Binary files /dev/null and b/app/libs/arm64-v8a/libiconv.so differ diff --git a/app/libs/arm64-v8a/libzbar.so b/app/libs/arm64-v8a/libzbar.so new file mode 100644 index 0000000..7661add Binary files /dev/null and b/app/libs/arm64-v8a/libzbar.so differ diff --git a/app/libs/armeabi-v7a/libiconv.so b/app/libs/armeabi-v7a/libiconv.so new file mode 100644 index 0000000..9c9adbc Binary files /dev/null and b/app/libs/armeabi-v7a/libiconv.so differ diff --git a/app/libs/armeabi-v7a/libzbar.so b/app/libs/armeabi-v7a/libzbar.so index 3bff8fc..998ef38 100644 Binary files a/app/libs/armeabi-v7a/libzbar.so and b/app/libs/armeabi-v7a/libzbar.so differ diff --git a/app/libs/openDefault-10.10.0.aar b/app/libs/openDefault-10.10.0.aar new file mode 100644 index 0000000..b3b2c11 Binary files /dev/null and b/app/libs/openDefault-10.10.0.aar differ diff --git a/app/libs/umeng-update-v2.6.0.1.jar b/app/libs/umeng-update-v2.6.0.1.jar deleted file mode 100644 index 068606d..0000000 Binary files a/app/libs/umeng-update-v2.6.0.1.jar and /dev/null differ diff --git a/app/libs/umeng_social_api.jar b/app/libs/umeng_social_api.jar deleted file mode 100644 index fb3c39f..0000000 Binary files a/app/libs/umeng_social_api.jar and /dev/null differ diff --git a/app/libs/umeng_social_net.jar b/app/libs/umeng_social_net.jar deleted file mode 100644 index f109188..0000000 Binary files a/app/libs/umeng_social_net.jar and /dev/null differ diff --git a/app/libs/umeng_social_shareboard.jar b/app/libs/umeng_social_shareboard.jar deleted file mode 100644 index 327ee56..0000000 Binary files a/app/libs/umeng_social_shareboard.jar and /dev/null differ diff --git a/app/libs/umeng_social_shareview.jar b/app/libs/umeng_social_shareview.jar deleted file mode 100644 index 8b353d5..0000000 Binary files a/app/libs/umeng_social_shareview.jar and /dev/null differ diff --git a/app/libs/umeng_social_tool.jar b/app/libs/umeng_social_tool.jar deleted file mode 100644 index 46bd612..0000000 Binary files a/app/libs/umeng_social_tool.jar and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3466664..cfde056 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="78" + android:versionName="3.7.8"> - + + + + @@ -135,9 +144,9 @@ - + + + @@ -262,25 +271,25 @@ android:exported="true" android:screenOrientation="portrait" android:theme="@android:style/Theme.Translucent.NoTitleBar" /> - - + + + + + + + - - - + + + + + + - - - + + + @@ -1052,8 +1061,10 @@ + android:screenOrientation="portrait" + > @@ -1354,13 +1365,16 @@ android:name="UMENG_APPKEY" android:value="566fb983e0f55a12cd001b84" > - - + + + + + + + + android:value="eaeaa9e296ee10cebee1552ba830a3fe" /> @@ -1644,6 +1658,7 @@ android:exported="false" android:grantUriPermissions="true"> diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/WBShareActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/WBShareActivity.java deleted file mode 100644 index ede70cc..0000000 --- a/app/src/main/java/cn/shangyu/gdxzPatient/WBShareActivity.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.shangyu.gdxzPatient; - -//import com.umeng.socialize.media.WBShareCallBackActivity; - -import com.umeng.socialize.media.WBShareCallBackActivity; - -/** - * Created by wangfei on 15/12/3. - */ -public class WBShareActivity extends WBShareCallBackActivity { -} diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/WXEntryActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/WXEntryActivity.java index 96fa84d..2cc9433 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/WXEntryActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/WXEntryActivity.java @@ -1,6 +1,7 @@ package cn.shangyu.gdxzPatient; -import com.umeng.weixin.callback.WXCallbackActivity; + +import com.umeng.socialize.weixin.view.WXCallbackActivity; public class WXEntryActivity extends WXCallbackActivity { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java index 5200923..1851aad 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddBankCardActivity.java @@ -18,6 +18,7 @@ import org.json.JSONObject; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; @@ -282,9 +283,19 @@ public class AddBankCardActivity extends BaseActivity implements // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.btn_next: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } bankCard = et_bank_number.getText().toString().trim() .replace(" ", ""); phoneNumber = et_phone_number.getText().toString().trim(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddCaseActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddCaseActivity.java index 3709f2a..42e2c72 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddCaseActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddCaseActivity.java @@ -17,12 +17,14 @@ import org.json.JSONObject; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; @@ -46,6 +48,7 @@ import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemSelectedListener; @@ -54,6 +57,7 @@ import android.widget.BaseAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.GridView; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.PopupWindow; @@ -76,6 +80,7 @@ import cn.shangyu.gdxzPatient.http.HttpHelper.HttpResult; import cn.shangyu.gdxzPatient.utils.Base64Util; import cn.shangyu.gdxzPatient.utils.CustomToast; import cn.shangyu.gdxzPatient.utils.HttpMD5SendInfoUtil; +import cn.shangyu.gdxzPatient.utils.KeDaXunFeiUtil; import cn.shangyu.gdxzPatient.utils.LogUtils; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; import cn.shangyu.gdxzPatient.utils.StringUtil; @@ -127,7 +132,8 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, private int poisition;// private GridView gv_add_case;// gridview - + private ImageButton ib_voice; + KeDaXunFeiUtil VoiceUtil; /** * 处理网路请求结果 */ @@ -330,6 +336,9 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, tv_case_name = (TextView) mView.findViewById(R.id.tv_case_name); gv_add_case = (GridView) mView.findViewById(R.id.gv_add_case);// gridView tv_casename = (TextView) mView.findViewById(R.id.tv_casename); + ib_voice = (ImageButton) mView.findViewById(R.id.ib_voice); + ib_voice.setVisibility(View.VISIBLE); + ib_voice.setOnClickListener(this); // 获取资源图片加号 bmp = BitmapFactory.decodeResource(getResources(), R.drawable.new_selected); @@ -488,7 +497,40 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, @Override public void onClick(View v) { switch (v.getId()) { + case R.id.ib_voice:// 语音识别 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + + if (PermissionsUtil.hasPermission(this, Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS + //有访问录音 + VoiceUtil= new KeDaXunFeiUtil(AddCaseActivity.this, mDescQuest); + } else { + PermissionsUtil.requestPermission(this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + //用户授予了访问录音的权限 + VoiceUtil=new KeDaXunFeiUtil(AddCaseActivity.this, mDescQuest); + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问录音的申请 +// finish(); + } + + }, new String[]{Manifest.permission.RECORD_AUDIO});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS + } + + }else { + VoiceUtil=new KeDaXunFeiUtil(AddCaseActivity.this, mDescQuest); + } + + break; case R.id.top_back_layout:// 返回 + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } BaseApplication.setAddCount(0); if (TextUtils.isEmpty(mDescQuest.getText().toString())) { finish(); @@ -517,6 +559,12 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, break; case R.id.btn_submit: + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } // 提交 submitQuestion(); // AlbumPhotoActivity.mSelectedImg.clear(); @@ -573,11 +621,11 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, getResources(), (Bitmap) null)); // 触摸popupwindow外部,popupwindow消失。 mPopupWindowDialog.setOutsideTouchable(true); - + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { // 设置弹出位置 mPopupWindowDialog.showAtLocation(mView, Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } } @@ -593,7 +641,7 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, public void onClick(View v) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(AddCaseActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(AddCaseActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); } else { @@ -609,7 +657,7 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -625,12 +673,51 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, @Override public void onClick(View v) { - // 从相册获取 - pickPhoto(); - if (mPopupWindowDialog != null - && mPopupWindowDialog.isShowing()) { - mPopupWindowDialog.dismiss();// 消失 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(AddCaseActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } else { + PermissionsUtil.requestPermission(AddCaseActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } } + } }); tv_cancel.setOnClickListener(new OnClickListener() { @@ -646,6 +733,13 @@ public class AddCaseActivity extends BaseActivity implements OnClickListener, }); } + @Override + protected void onDestroy() { + super.onDestroy(); + if (VoiceUtil != null) { + VoiceUtil.dissDialog(); + } + } /** * 拍照获取图片 diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddExpertActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddExpertActivity.java index 2e3a642..e94db6e 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddExpertActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddExpertActivity.java @@ -7,18 +7,22 @@ import org.apache.http.message.BasicNameValuePair; import org.json.JSONException; import org.json.JSONObject; +import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.Message; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; +import com.nostra13.universalimageloader.utils.L; + import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; import cn.shangyu.gdxzPatient.ecdemo.ui.SDKCoreHelper; @@ -180,18 +184,26 @@ public class AddExpertActivity extends BaseActivity implements OnClickListener { // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: - LogUtils.v("返回"); + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; case R.id.tv_time2: - LogUtils.v("时间按钮2"); + // selectTime(tv_time2); break; /* * case R.id.tv_time3: LogUtils.v("时间按钮3"); selectTime(tv_time3); break; */ case R.id.bt_submit: - LogUtils.v("确认提交按钮"); + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } submitAdd(); // finish(); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddHospitalScoreActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddHospitalScoreActivity.java index 19d20ed..3d63707 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddHospitalScoreActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AddHospitalScoreActivity.java @@ -15,12 +15,14 @@ import org.json.JSONObject; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -37,6 +39,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; @@ -114,6 +117,11 @@ public class AddHospitalScoreActivity extends BaseActivity implements @Override public void onClick(View v) { + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); } }); @@ -202,11 +210,11 @@ public class AddHospitalScoreActivity extends BaseActivity implements getResources(), (Bitmap) null)); // 触摸popupwindow外部,popupwindow消失。 mPopupWindowDialog.setOutsideTouchable(true); - + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { // 设置弹出位置 mPopupWindowDialog.showAtLocation(view, Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } } @@ -223,7 +231,7 @@ public class AddHospitalScoreActivity extends BaseActivity implements // 拍照获取照片 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(AddHospitalScoreActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(AddHospitalScoreActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); mPopupWindowDialog.dismiss(); @@ -241,7 +249,7 @@ public class AddHospitalScoreActivity extends BaseActivity implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -256,9 +264,48 @@ public class AddHospitalScoreActivity extends BaseActivity implements @Override public void onClick(View v) { - // 从相册获取 - pickPhoto(); - mPopupWindowDialog.dismiss(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(AddHospitalScoreActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } else { + PermissionsUtil.requestPermission(AddHospitalScoreActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + // 从相册获取 + pickPhoto(); + mPopupWindowDialog.dismiss(); + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { @@ -735,6 +782,11 @@ public class AddHospitalScoreActivity extends BaseActivity implements getTitleScore(); break; case R.id.btn_submit: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } getAddScore(); break; default: diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/Album6Activity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/Album6Activity.java index 468efff..cb89a2a 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/Album6Activity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/Album6Activity.java @@ -34,6 +34,8 @@ import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gyf.immersionbar.ImmersionBar; + public class Album6Activity extends Activity implements OnClickListener { /** @@ -74,6 +76,8 @@ public class Album6Activity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_album); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); lv_list_dir = (GridView) findViewById(R.id.lv_list_dir); top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); top_back_layout.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumActivity.java index a177f60..3396057 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumActivity.java @@ -34,6 +34,8 @@ import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gyf.immersionbar.ImmersionBar; + public class AlbumActivity extends Activity implements OnClickListener { /** @@ -73,6 +75,8 @@ public class AlbumActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_album); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); lv_list_dir = (GridView) findViewById(R.id.lv_list_dir); top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); top_back_layout.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumPhotoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumPhotoActivity.java index 2033147..1c8d6b4 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumPhotoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AlbumPhotoActivity.java @@ -3,6 +3,7 @@ package cn.shangyu.gdxzPatient.activity; import java.util.ArrayList; import java.util.List; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.DisplayImageOptions; @@ -119,7 +120,8 @@ public class AlbumPhotoActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.my_photo_activity); - + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); BaseApplication.addActivity(this);// huoqu handler // ToastUtil.showMessage(BaseApplication.activityList.size()); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreIllnessActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreIllnessActivity.java index 536520f..88ff29c 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreIllnessActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreIllnessActivity.java @@ -2,6 +2,7 @@ package cn.shangyu.gdxzPatient.activity; import android.Manifest; import android.app.Activity; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; @@ -19,11 +20,13 @@ import android.view.Gravity; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.GridView; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.PopupWindow; @@ -32,6 +35,7 @@ import android.widget.Toast; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; @@ -58,6 +62,7 @@ import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; import cn.shangyu.gdxzPatient.http.OnCallBackFromNet; import cn.shangyu.gdxzPatient.utils.Base64Util; import cn.shangyu.gdxzPatient.utils.Constant; +import cn.shangyu.gdxzPatient.utils.KeDaXunFeiUtil; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; import cn.shangyu.gdxzPatient.utils.StringUtil; import cn.shangyu.gdxzPatient.utils.UIUtils; @@ -80,6 +85,8 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic public static int isTopic = 0; private String step1_uuid; public static final int ADDINTERROGATIONSTEP2=200; + private Button ib_voice,ib_voice1; + KeDaXunFeiUtil VoiceUtil; private Handler handler1 = new Handler() { public void handleMessage(Message msg) { if (msg.what == 88) { @@ -126,6 +133,10 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic bt_next.setOnClickListener(this); et_question = view.findViewById(R.id.et_question); et_question2 = view.findViewById(R.id.et_question2); + ib_voice = view.findViewById(R.id.bt_get_voice); + ib_voice1 = view.findViewById(R.id.bt_get_voice1); + ib_voice.setOnClickListener(this); + ib_voice1.setOnClickListener(this); bmp = BitmapFactory.decodeResource(getResources(),R.drawable.new_selected); addBipmap = new AddBitmaps(true, bmp, null); mBitmaps = new ArrayList<>(); @@ -155,6 +166,60 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic @Override public void onClick(View v) { switch (v.getId()){ + case R.id.bt_get_voice1:// 语音识别 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + + if (PermissionsUtil.hasPermission(this, Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS + //有访问录音 + VoiceUtil= new KeDaXunFeiUtil(AskAMoreIllnessActivity.this, et_question); + } else { + PermissionsUtil.requestPermission(this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + //用户授予了访问录音的权限 + VoiceUtil=new KeDaXunFeiUtil(AskAMoreIllnessActivity.this, et_question); + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问录音的申请 +// finish(); + } + + }, new String[]{Manifest.permission.RECORD_AUDIO});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS + } + + }else { + VoiceUtil=new KeDaXunFeiUtil(AskAMoreIllnessActivity.this, et_question); + } + + break; + case R.id.bt_get_voice:// 语音识别 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + + if (PermissionsUtil.hasPermission(this, Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS + //有访问录音 + VoiceUtil= new KeDaXunFeiUtil(AskAMoreIllnessActivity.this, et_question2); + } else { + PermissionsUtil.requestPermission(this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + //用户授予了访问录音的权限 + VoiceUtil=new KeDaXunFeiUtil(AskAMoreIllnessActivity.this, et_question2); + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问录音的申请 +// finish(); + } + + }, new String[]{Manifest.permission.RECORD_AUDIO});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS + } + + }else { + VoiceUtil=new KeDaXunFeiUtil(AskAMoreIllnessActivity.this, et_question2); + } + + break; case R.id.top_right_text: Intent broadc = new Intent(AskAMoreIllnessActivity.this, NewsDetailActivity.class); broadc.putExtra("content", Constant.wendaguize); @@ -163,6 +228,11 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic startActivity(broadc); break; case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if (TextUtils.isEmpty(et_question.getText().toString())) { finish(); }else { @@ -189,7 +259,11 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic } break; case R.id.bt_next: - + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } String s = et_question.getText().toString(); if (StringUtil.isEmpty(s)||s.length()<20){ ToastUtil.showMessage("病情描述至少20个字"); @@ -297,6 +371,9 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic @Override protected void onDestroy() { super.onDestroy(); + if (VoiceUtil != null) { + VoiceUtil.dissDialog(); + } AppManager.getAppManager().finishActivity2(this); } @@ -385,10 +462,10 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic getResources(), (Bitmap) null)); // 触摸popupwindow外部,popupwindow消失。 mPopupWindowDialog.setOutsideTouchable(true); - + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { // 设置弹出位置 - mPopupWindowDialog.showAtLocation(view, Gravity.BOTTOM, 0, 0); + mPopupWindowDialog.showAtLocation(view, Gravity.BOTTOM, 0, ImmersionBar.getNavigationBarHeight(this)); } } @@ -406,7 +483,7 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic // 拍照获取照片 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(AskAMoreIllnessActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(AskAMoreIllnessActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限 takePhoto(); } else { @@ -422,7 +499,7 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -439,12 +516,51 @@ public class AskAMoreIllnessActivity extends BaseActivity implements View.OnClic @Override public void onClick(View v) { - // 从相册获取 - pickPhoto(); - if (mPopupWindowDialog != null - && mPopupWindowDialog.isShowing()) { - mPopupWindowDialog.dismiss();// 消失 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(AskAMoreIllnessActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } else { + PermissionsUtil.requestPermission(AskAMoreIllnessActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + } + else + { + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } + } }); tv_cancel.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreInfoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreInfoActivity.java index 90c1a15..5f7ef38 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreInfoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/AskAMoreInfoActivity.java @@ -1,11 +1,13 @@ package cn.shangyu.gdxzPatient.activity; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -342,6 +344,11 @@ public class AskAMoreInfoActivity extends BaseActivity implements View.OnClickLi public void onClick(View v) { switch (v.getId()){ case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; case R.id.rl_timelong: @@ -378,6 +385,11 @@ public class AskAMoreInfoActivity extends BaseActivity implements View.OnClickLi startActivity(broadc); break; case R.id.bt_next: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } disease_date = tv_timelong.getText().toString(); if ("请选择时长".equals(disease_date)){ ToastUtil.showMessage("请选择时长"); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaseActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaseActivity.java index cf97fde..79feb7d 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaseActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/BaseActivity.java @@ -13,6 +13,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import android.app.Activity; import android.content.BroadcastReceiver; @@ -90,6 +91,8 @@ public abstract class BaseActivity extends FragmentActivity { setContentView(R.layout.activity_base); // ButterKnife.bind(this); top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); + layout_top = (LinearLayout) findViewById(R.id.layout_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(layout_top).init(); top_title = (TextView) findViewById(R.id.top_title); tv_top_search = (TextView) findViewById(R.id.tv_top_search); top_title_end = (TextView) findViewById(R.id.top_title_end); @@ -97,7 +100,7 @@ public abstract class BaseActivity extends FragmentActivity { top_right = (ImageView) findViewById(R.id.top_right); top_right_text = (TextView) findViewById(R.id.top_right_text); top_back_text = (TextView) findViewById(R.id.top_back_text); - layout_top = (LinearLayout) findViewById(R.id.layout_top); + top_right_location = (ImageView) findViewById(R.id.top_right_location); top_right_message = (ImageView) findViewById(R.id.top_right_message); top_right_location_city = (TextView) findViewById(R.id.top_right_location_city); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/BillDetialsActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/BillDetialsActivity.java index 3609e90..cd39abe 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/BillDetialsActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/BillDetialsActivity.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -138,6 +139,9 @@ public class BillDetialsActivity extends Activity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_bill_detials); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); + balance = getIntent().getStringExtra("balance"); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryActivity.java index b8e44ee..8d2d683 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryActivity.java @@ -15,6 +15,7 @@ import pickerview.TimePopupWindow.OnTimeSelectListener; import pickerview.TimePopupWindow.Type; import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -22,6 +23,7 @@ import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; @@ -196,10 +198,19 @@ public class CaseHistoryActivity extends BaseActivity implements OnClickListener public void onClick(View v) { switch (v.getId()) { case R.id.top_back_layout://返回 + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.btn_submit://提交 - + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } selectedSingleFiveSixSeven(); submitQuestion(); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryDetailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryDetailActivity.java index fbc412e..e7ed918 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryDetailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/CaseHistoryDetailActivity.java @@ -6,11 +6,13 @@ import org.apache.http.message.BasicNameValuePair; import org.json.JSONException; import org.json.JSONObject; import android.annotation.SuppressLint; +import android.content.Context; import android.os.Handler; import android.os.Message; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -193,10 +195,19 @@ public class CaseHistoryDetailActivity extends BaseActivity implements OnClickLi public void onClick(View v) { switch (v.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.btn_submit: - + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } selectedSingleFiveSixSeven(); //submitQuestion(); modifyMedicalHistory(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalActivity.java index afb602b..2d1adeb 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalActivity.java @@ -7,6 +7,7 @@ import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -147,7 +148,8 @@ public class ClinicalActivity extends Activity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_new_lesson); - + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalDetailsActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalDetailsActivity.java index 5700a35..b271404 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalDetailsActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ClinicalDetailsActivity.java @@ -17,6 +17,7 @@ import org.json.JSONObject; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.umeng.socialize.ShareAction; import com.umeng.socialize.UMShareAPI; @@ -200,6 +201,9 @@ public class ClinicalDetailsActivity extends Activity implements // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_gd_detail); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); + //topView = UIUtils.inflate(R.layout.gd_detail_top); X5WebView.initHardwareAccelerate(this); mWebView = (X5WebView) findViewById(R.id.news_detail_wv); @@ -618,6 +622,12 @@ public class ClinicalDetailsActivity extends Activity implements // TODO Auto-generated method stub switch (arg0.getId()) { case R.id.bt_add_pinglun: + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } String comment = mEt_AddPL.getText().toString().trim(); if (TextUtils.isEmpty(comment)) { ToastUtil.showMessage("请输入回复的内容"); @@ -627,6 +637,12 @@ public class ClinicalDetailsActivity extends Activity implements } break; case R.id.top_back_layout: + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConslutActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConslutActivity.java index e1f233e..4f04c57 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConslutActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConslutActivity.java @@ -16,6 +16,8 @@ import android.view.View.OnClickListener; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gyf.immersionbar.ImmersionBar; + public class ConslutActivity extends FragmentActivity { private FragmentManager fm; @@ -30,6 +32,8 @@ public class ConslutActivity extends FragmentActivity { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_cons); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); top_title = (TextView) findViewById(R.id.top_title); top_title.setText("免费咨询"); top_right_text = (TextView) findViewById(R.id.top_right_text); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConsultDetailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConsultDetailActivity.java index b21b1ae..4b16a1f 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConsultDetailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ConsultDetailActivity.java @@ -7,6 +7,7 @@ import org.apache.http.message.BasicNameValuePair; import org.json.JSONException; import org.json.JSONObject; import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Handler; @@ -344,7 +345,12 @@ public class ConsultDetailActivity extends BaseActivity implements switch (v.getId()) { case R.id.top_back_layout: // 返回按键 - LogUtils.v("返回按键"); + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.ll_look_photo:// 查看图片 diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/DiseaseBaseActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/DiseaseBaseActivity.java index fa47f09..6aff61f 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/DiseaseBaseActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/DiseaseBaseActivity.java @@ -20,6 +20,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.View.OnClickListener; import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.ImageView; @@ -75,6 +76,11 @@ public class DiseaseBaseActivity extends BaseActivity implements @Override public void onClick(View v) { // TODO Auto-generated method stub + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } DiseaseBaseActivity.this.finish(); } @@ -228,6 +234,11 @@ public class DiseaseBaseActivity extends BaseActivity implements @Override public void onClick(View v) { + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } // TODO Auto-generated method stub // if(!"".equals(mEt_search.getText().toString())||null!=mEt_search.getText().toString()){ requestData(1, false); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/EditNameActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/EditNameActivity.java index 0453f62..2084719 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/EditNameActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/EditNameActivity.java @@ -1,10 +1,12 @@ package cn.shangyu.gdxzPatient.activity; +import android.content.Context; import android.content.Intent; import android.text.InputFilter; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.utils.UIUtils; @@ -63,7 +65,11 @@ public class EditNameActivity extends BaseActivity implements OnClickListener { switch (v.getId()) { case R.id.top_back_layout://返回 - + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } if(intent.getType().equals("1")){ Intent intent1 = new Intent(); intent1.putExtra("name", et_name.getText().toString().trim()); @@ -78,7 +84,11 @@ public class EditNameActivity extends BaseActivity implements OnClickListener { break; case R.id.top_right_text://保存 - + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if(intent.getType().equals("1")){ Intent intent = new Intent(); intent.putExtra("name", et_name.getText().toString().trim()); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ExitDialog.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ExitDialog.java index 0a75454..d65c6c6 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ExitDialog.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ExitDialog.java @@ -3,6 +3,9 @@ package cn.shangyu.gdxzPatient.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; + +import com.gyf.immersionbar.ImmersionBar; + import androidx.annotation.Nullable; import cn.shangyu.gdxzPatient.R; @@ -23,7 +26,8 @@ public class ExitDialog extends Activity{ @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - this.getWindow().setFlags(FLAG_HOMEKEY_DISPATCHED, FLAG_HOMEKEY_DISPATCHED); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).init(); +// this.getWindow().setFlags(FLAG_HOMEKEY_DISPATCHED, FLAG_HOMEKEY_DISPATCHED); setContentView(R.layout.dialog_activity); LogUtil.i("强制退出"); SharePrefUtil.clear(ExitDialog.this, "isLogin"); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/FastNavigationActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/FastNavigationActivity.java index c1d927e..7742493 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/FastNavigationActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/FastNavigationActivity.java @@ -8,14 +8,19 @@ import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; import com.zbar.lib.CaptureActivity; + import android.Manifest; import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; import android.os.Build; import androidx.annotation.NonNull; import androidx.localbroadcastmanager.content.LocalBroadcastManager; + +import android.os.Handler; +import android.os.Message; import android.view.View; import android.view.View.OnClickListener; import android.view.LayoutInflater; @@ -23,9 +28,18 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; + +import cn.bertsir.zbar.Qr.ScanResult; +import cn.bertsir.zbar.QrConfig; +import cn.bertsir.zbar.QrManager; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.bean.AddBonusPointsSuccessBean; import cn.shangyu.gdxzPatient.ecdemo.common.dialog.ECAlertDialog; +import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; import cn.shangyu.gdxzPatient.fragment.HomeFragment; import cn.shangyu.gdxzPatient.http.OnCallBackFromNet; @@ -33,11 +47,16 @@ import cn.shangyu.gdxzPatient.pointsmall.PointsMallActivity; import cn.shangyu.gdxzPatient.utils.Constant; import cn.shangyu.gdxzPatient.utils.LogUtils; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; +import cn.shangyu.gdxzPatient.utils.StreamTool; import cn.shangyu.gdxzPatient.utils.UIUtils; import cn.shangyu.gdxzPatient.utils.Url; import cn.shangyu.gdxzPatient.widget.CustomProgressDialog; import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState; +import static cn.bertsir.zbar.QrConfig.SCANVIEW_TYPE_QRCODE; +import static cn.bertsir.zbar.QrConfig.SCREEN_PORTRAIT; +import static cn.bertsir.zbar.QrConfig.TYPE_QRCODE; +import static cn.bertsir.zbar.view.ScanLineView.style_line; import static cn.shangyu.gdxzPatient.utils.Constant.Changjianwenti; /** @@ -281,17 +300,19 @@ public class FastNavigationActivity extends BaseActivity implements case R.id.ll_scan: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(FastNavigationActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(FastNavigationActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 - Intent scan = new Intent(FastNavigationActivity.this, CaptureActivity.class); - startActivity(scan); +// Intent scan = new Intent(FastNavigationActivity.this, CaptureActivity.class); +// startActivity(scan); + start(); } else { PermissionsUtil.requestPermission(FastNavigationActivity.this, new PermissionListener() { @Override public void permissionGranted(@NonNull String[] permissions) { //用户授予了访问读取短信的权限 - Intent scan = new Intent(FastNavigationActivity.this, CaptureActivity.class); - startActivity(scan); +// Intent scan = new Intent(FastNavigationActivity.this, CaptureActivity.class); +// startActivity(scan); + start(); } @Override public void permissionDenied(@NonNull String[] permissions) { @@ -299,12 +320,13 @@ public class FastNavigationActivity extends BaseActivity implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { - Intent scan = new Intent(FastNavigationActivity.this, CaptureActivity.class); - startActivity(scan); + start(); +// Intent scan = new Intent(FastNavigationActivity.this, CaptureActivity.class); +// startActivity(scan); } break; // 快速导航第3栏 @@ -512,4 +534,140 @@ public class FastNavigationActivity extends BaseActivity implements } }); } + private String expertUuid; + private void start() { + + QrConfig qrConfig = new QrConfig.Builder() + .setDesText("请将医生二维码放入框内")//扫描框下文字 + .setShowDes(true)//是否显示扫描框下面文字 + .setShowLight(true)//显示手电筒按钮 + .setShowTitle(true)//显示Title + .setShowAlbum(false)//显示从相册选择按钮 + .setNeedCrop(false)//是否从相册选择后裁剪图片 +// .setCornerColor(Color.parseColor("#E42E30"))//设置扫描框颜色 + .setLineColor(Color.parseColor("#08C8FF"))//设置扫描线颜色 + .setLineSpeed(QrConfig.LINE_MEDIUM)//设置扫描线速度 + .setScanType(TYPE_QRCODE)//设置扫码类型(二维码,条形码,全部,自定义,默认为二维码) + .setScanViewType(SCANVIEW_TYPE_QRCODE)//设置扫描框类型(二维码还是条形码,默认为二维码) + .setCustombarcodeformat(QrConfig.BARCODE_PDF417)//此项只有在扫码类型为TYPE_CUSTOM时才有效 + .setPlaySound(true)//是否扫描成功后bi~的声音 +// .setDingPath(cb_show_custom_ding.isChecked() ? R.raw.test : R.raw.qrcode)//设置提示音(不设置为默认的Ding~) + .setIsOnlyCenter(false)//是否只识别框中内容(默认为全屏识别) +// .setTitleText(et_qr_title.getText().toString())//设置Tilte文字 + .setTitleBackgroudColor(Color.parseColor("#3cc9c0"))//设置状态栏颜色 + .setTitleTextColor(Color.WHITE)//设置Title文字颜色 +// .setShowZoom(cb_show_zoom.isChecked())//是否开始滑块的缩放 +// .setAutoZoom(cb_auto_zoom.isChecked())//是否开启自动缩放(实验性功能,不建议使用) +// .setFingerZoom(cb_finger_zoom.isChecked())//是否开始双指缩放 +// .setDoubleEngine(cb_double_engine.isChecked())//是否开启双引擎识别(仅对识别二维码有效,并且开启后只识别框内功能将失效) + .setScreenOrientation(SCREEN_PORTRAIT)//设置屏幕方式 + .setOpenAlbumText("选择要识别的图片")//打开相册的文字 + .setLooperScan(false)//是否连续扫描二维码 +// .setLooperWaitTime(Integer.parseInt(et_loop_scan_time.getText().toString()) * 1000)//连续扫描间隔时间 + .setScanLineStyle(style_line)//扫描线样式 +// .setAutoLight(cb_auto_light.isChecked())//自动灯光 + .setShowVibrator(true)//是否震动提醒 + .create(); + QrManager.getInstance().init(qrConfig).startScan(FastNavigationActivity.this, new QrManager.OnScanResultCallback() { + @Override + public void onScanSuccess(ScanResult result) { +// Log.e(TAG, "onScanSuccess: " + result); + expertUuid=result.getContent(); + new Thread(networkTask2).start(); +// Toast.makeText(getActivity(), "内容:" + result.getContent() +// + " 类型:" + result.getType(), Toast.LENGTH_SHORT).show(); + } + }); + } + Runnable networkTask2 = new Runnable() { + + + @Override + public void run() { + // TODO + String url = null; + url = Url.isExpert + "?expertUuid=" + expertUuid; + getTooken1(url); + + } + + private void getTooken1(String urlStringUtil) { + // TODO Auto-generated method stub + LogUtil.i("urlStringUtil = " + urlStringUtil); + try { + URL url = new URL(urlStringUtil); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + conn.setDoOutput(true); + conn.setConnectTimeout(5 * 1000); + OutputStream outStream = conn.getOutputStream(); + outStream.flush(); + outStream.close(); + if (conn.getResponseCode() == 200) { + InputStream inStream = conn.getInputStream(); + String result = new String( + StreamTool.readInputStream(inStream), "UTF-8"); + Message message = new Message(); + message.what = 102; + message.obj = new String(result); + handler1.sendMessage(message); + } else { + Message message = new Message(); + message.what = 105; + handler1.sendMessage(message); + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + ToastUtil.showMessage("请求失败,请稍后重试"); + } + + } + }; + public Handler handler1 = new Handler() { + @Override + public void handleMessage(Message msg) { + // TODO Auto-generated method stub + switch (msg.what) { + case 102: + + try { + String str = (String) msg.obj; + LogUtils.d("onSuccess resultJson = " + str); + JSONObject objs = new JSONObject(str); + String retcode = objs.getString("code"); + String expertuuid = objs.getString("expertUuid"); + String message = objs.getString("message"); + if (retcode.equals(String.valueOf(1))) { + String isExpert = objs.getString("data"); + if ("1".equals(isExpert)) { + Intent intent = new Intent( + FastNavigationActivity.this, + ExpertDetailActivity.class); + + intent.putExtra("uuid", expertuuid); + startActivity(intent); + + } else { + ToastUtil.showMessage( + "您扫描的二维码不是有效的肝胆相照专家二维码。", 1); + + } + } else { + ToastUtil.showMessage(message); + } + } catch (JSONException e) { + e.printStackTrace(); + // ToastUtil.showMessage("服务器异常!"); + ToastUtil.showMessage("您扫描的二维码不是有效的肝胆相照专家二维码。", 1); + + } + break; + + + } + + } + + }; } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/FindDoctorActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/FindDoctorActivity.java index 83f17af..1ef444d 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/FindDoctorActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/FindDoctorActivity.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.graphics.Color; import android.os.AsyncTask; import android.os.Handler; import android.os.Message; @@ -170,10 +171,35 @@ public class FindDoctorActivity extends BaseActivity implements // } } + ArrayAdapter dataAdapter = new ArrayAdapter(FindDoctorActivity.this, android.R.layout.simple_spinner_item, datas) + { + @Override + public View getView(int position, View convertView, ViewGroup parent) + { + return setCentered(super.getView(position, convertView, parent)); + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) + { + return setCentered(super.getDropDownView(position, convertView, parent)); + } + + private View setCentered(View view) + { + TextView textView = (TextView)view.findViewById(android.R.id.text1); + textView.setPadding(0,30,0,30); + textView.setTextColor(Color.parseColor("#808080")); +// textView.setHeight(45); + textView.setGravity(Gravity.CENTER); + return view; + } + }; + sp_illness_type.setAdapter(dataAdapter); - sp_illness_type.setAdapter(new ArrayAdapter( - FindDoctorActivity.this, - R.layout.drop_down_layout, datas)); +// sp_illness_type.setAdapter(new ArrayAdapter( +// FindDoctorActivity.this, +// R.layout.simple_spinner_item,R.id.text1, datas)); } catch (JSONException e) { e.printStackTrace(); } @@ -952,10 +978,19 @@ public class FindDoctorActivity extends BaseActivity implements GanDanHospitalActivity.class));// break; case R.id.top_back_layout: - LogUtils.v("返回"); + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; case R.id.iv_search: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } page = 1; searchDocotor(1, false);//不变 break; @@ -1209,7 +1244,7 @@ public class FindDoctorActivity extends BaseActivity implements R.color.top_color)); // 设置颜色 tv.setTextSize(16.0f); // 设置大小 tv.setGravity(Gravity.CENTER); // 设置居中 - + tv.setPadding(0,0,0,0); diseaseUuid = datas.get(position).getId(); page = 1; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ForgetRestPwdActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ForgetRestPwdActivity.java index 0b04a48..67203fb 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ForgetRestPwdActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ForgetRestPwdActivity.java @@ -20,6 +20,7 @@ import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -35,6 +36,7 @@ import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -633,9 +635,19 @@ public class ForgetRestPwdActivity extends BaseActivity implements public void onClick(View v) { switch (v.getId()) { case R.id.restpwdok:// 提交 + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } restpwdok(); break; case R.id.top_back_layout:// 返回 + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; case R.id.img_ver_code: diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/FriendApplyActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/FriendApplyActivity.java index fcbd540..c839321 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/FriendApplyActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/FriendApplyActivity.java @@ -10,6 +10,7 @@ import org.json.JSONObject; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -141,6 +142,8 @@ public class FriendApplyActivity extends Activity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_friend_apply); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); top_title = (TextView) findViewById(R.id.top_title); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GDLiveBroadcastActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GDLiveBroadcastActivity.java index 6a03913..18b2c8a 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GDLiveBroadcastActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GDLiveBroadcastActivity.java @@ -7,6 +7,7 @@ import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -153,7 +154,8 @@ public class GDLiveBroadcastActivity extends Activity implements protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_new_lesson); - + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanActisActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanActisActivity.java index 77ee732..d02f076 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanActisActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanActisActivity.java @@ -7,6 +7,7 @@ import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -134,7 +135,8 @@ public class GanDanActisActivity extends Activity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_new_lesson); - + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanDetailsActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanDetailsActivity.java index 8f19c01..f157cb6 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanDetailsActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanDetailsActivity.java @@ -78,6 +78,7 @@ import cn.shangyu.gdxzPatient.widget.CommentExpandableListView; import cn.shangyu.gdxzPatient.widget.CustomProgressDialog; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener2; @@ -251,6 +252,9 @@ public class GanDanDetailsActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_gd_detail); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); + //topView = findViewById(R.layout.gd_detail_top); X5WebView.initHardwareAccelerate(this); mWebView = findViewById(R.id.news_detail_wv); @@ -744,6 +748,11 @@ public class GanDanDetailsActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub switch (arg0.getId()) { case R.id.bt_add_pinglun: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } String comment = mEt_AddPL.getText().toString().trim(); if (TextUtils.isEmpty(comment)) { ToastUtil.showMessage("请输入回复的内容"); @@ -753,6 +762,11 @@ public class GanDanDetailsActivity extends Activity implements OnClickListener { } break; case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanHouseDetialActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanHouseDetialActivity.java index fa78795..d3bd397 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanHouseDetialActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanHouseDetialActivity.java @@ -17,6 +17,7 @@ import org.json.JSONObject; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -106,6 +107,9 @@ public class GanDanHouseDetialActivity extends Activity implements super.onCreate(savedInstanceState); // ganDanDetailsActivity = new GanDanDetailsActivity(); setContentView(R.layout.activity_house_detial); + + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); //top_view = findViewById(R.layout.activity_house_top); //mLv_PL = (PullToRefreshListView) findViewById(R.id.lv_house_com); ll_emptys = (RelativeLayout) findViewById(R.id.ll_empty); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanTvsActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanTvsActivity.java index fbb4591..6deefa7 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanTvsActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/GanDanTvsActivity.java @@ -10,6 +10,7 @@ import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener2; import com.handmark.pulltorefresh.library.PullToRefreshBase; @@ -200,6 +201,9 @@ public class GanDanTvsActivity extends BaseActivity implements OnClickListener , protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_gandan_tv); + + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); dialog = new CustomProgressDialog(GanDanTvsActivity.this, "请稍候"); dialog.show(); BaseApplication.videoMap.clear(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java index 65ae8ab..9b42c33 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/HcvVideoActivity.java @@ -6,6 +6,7 @@ import java.util.List; import org.apache.http.message.BasicNameValuePair; import android.app.Activity; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -18,6 +19,7 @@ import android.os.Message; import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.util.DisplayMetrics; +import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -27,6 +29,7 @@ import android.view.View.OnTouchListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; import android.webkit.SslErrorHandler; import android.webkit.WebChromeClient; import android.webkit.WebSettings; @@ -44,6 +47,9 @@ import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.bean.VideoCommentListBean; import cn.shangyu.gdxzPatient.bean.VideoReadBean; @@ -61,6 +67,7 @@ import cn.shangyu.gdxzPatient.utils.X5WebView; import cn.shangyu.gdxzPatient.widget.CustomProgressDialog; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener2; @@ -81,7 +88,7 @@ import com.umeng.socialize.media.UMWeb; //import com.umeng.socialize.weixin.media.CircleShareContent; //import com.umeng.socialize.weixin.media.WeiXinShareContent; -public class HcvVideoActivity extends Activity implements OnClickListener { +public class HcvVideoActivity extends AppCompatActivity implements OnClickListener { private View view; private X5WebView mWebView; @@ -215,6 +222,9 @@ public class HcvVideoActivity extends Activity implements OnClickListener { super.onCreate(savedInstanceState); mActivity = this; setContentView(R.layout.activity_hvc_video); +// View toolbar_top=findViewById(R.id.toolbar_top); + Toolbar toolbar=findViewById(R.id.toolbar); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar).init(); url = getIntent().getStringExtra("patientmoocurlStr"); type = getIntent().getStringExtra("type"); titlefromjson = getIntent().getStringExtra("title"); @@ -661,6 +671,11 @@ public class HcvVideoActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.bt_add_pinglun: @@ -867,6 +882,12 @@ public class HcvVideoActivity extends Activity implements OnClickListener { @Override public void onClick(View v) { + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } popupWindow.dismiss(); } }); @@ -874,6 +895,11 @@ public class HcvVideoActivity extends Activity implements OnClickListener { @Override public void onClick(View v) { + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } // TODO Auto-generated method stub if (mEt_add != null) { mEt_add.setText(mEt_adds.getText().toString()); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/HospitalDetialActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/HospitalDetialActivity.java index c0112f3..fe6cdcd 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/HospitalDetialActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/HospitalDetialActivity.java @@ -34,7 +34,6 @@ import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; import com.nostra13.universalimageloader.core.ImageLoader; -import com.umeng.socialize.utils.Log; import android.Manifest; import android.content.DialogInterface; @@ -102,7 +101,7 @@ public class HospitalDetialActivity extends BaseActivity implements // TODO Auto-generated method stub mTopView = UIUtils.inflate(R.layout.activity_hospital_top); hospitalUuid = getIntent().getStringExtra("hospital_uuid"); - Log.e("TGGG","hospitalUuid = "+hospitalUuid); + mgg = (DrawableCenterButton) mTopView.findViewById(R.id.db_gg); dcb_video = (DrawableCenterButton) mTopView.findViewById(R.id.dcb_video); dcb_dt = (DrawableCenterButton) mTopView.findViewById(R.id.dcb_dt); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/IWantDonateActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/IWantDonateActivity.java index 2279b75..18e473c 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/IWantDonateActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/IWantDonateActivity.java @@ -9,6 +9,7 @@ import org.apache.http.message.BasicNameValuePair; import org.json.JSONException; import org.json.JSONObject; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; @@ -19,6 +20,7 @@ import android.view.Gravity; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; @@ -86,9 +88,21 @@ public class IWantDonateActivity extends BaseActivity implements OnClickListener public void onClick(View v) { switch (v.getId()) { case R.id.iwant:// 提交 + + View view2 = getWindow().peekDecorView(); + if (view2 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view2.getWindowToken(), 0); + } iwant(); break; case R.id.top_back_layout:// 返回 + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; case R.id.ll_name://编辑姓名 diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java index 064e526..3cade46 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java @@ -444,8 +444,8 @@ public class LoginActivity extends BaseActivity implements OnClickListener, OnCa break; case R.id.tv_doctor: Uri uri = Uri - .parse("http://android.myapp.com/myapp/detail.htm?apkName=cn.shangyu.gdxzExpert");//应用宝 -// .parse("http://appstore.huawei.com/app/C10526652");//华为 +// .parse("http://android.myapp.com/myapp/detail.htm?apkName=cn.shangyu.gdxzExpert");//应用宝 + .parse("http://appstore.huawei.com/app/C10526652");//华为 // .parse("https://h5coml.vivo.com.cn/h5coml/appdetail_h5/browser_v2/index.html?appId=892989&resource=301&source=1");//vivo Intent intent = new Intent(Intent.ACTION_VIEW, uri); startActivity(intent); @@ -457,31 +457,31 @@ public class LoginActivity extends BaseActivity implements OnClickListener, OnCa InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS - //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 - login(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读写的权限 - login(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读写的申请 -// finish(); - - } - - }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS - } - - }else { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// +// if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS +// //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 +// login(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读写的权限 +// login(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读写的申请 +//// finish(); +// +// } +// +// }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS +// } +// +// }else { login(); - } +// } // login(); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveContentEditActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveContentEditActivity.java index e93ed06..f92d12b 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveContentEditActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveContentEditActivity.java @@ -3,6 +3,8 @@ package cn.shangyu.gdxzPatient.activity; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.utils.UIUtils; import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState; + +import android.content.Context; import android.content.Intent; import android.text.Editable; import android.text.InputFilter; @@ -10,6 +12,7 @@ import android.text.TextWatcher; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; @@ -29,6 +32,12 @@ public class LoveContentEditActivity extends BaseActivity implements OnClickList public void onClick(View v) { switch (v.getId()) { case R.id.top_back_layout: + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } intent = getIntent(); if(intent.getType().equals("3")){ Intent intent1=new Intent(); @@ -43,6 +52,12 @@ public class LoveContentEditActivity extends BaseActivity implements OnClickList break; case R.id.top_right_text: + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } intent = getIntent(); if(intent.getType().equals("3")){ Intent intent=new Intent(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveEditName.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveEditName.java index 86f180b..83d497f 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveEditName.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoveEditName.java @@ -1,11 +1,13 @@ package cn.shangyu.gdxzPatient.activity; +import android.content.Context; import android.content.Intent; import android.text.InputFilter; import android.text.InputType; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.utils.UIUtils; @@ -72,7 +74,12 @@ public class LoveEditName extends BaseActivity implements OnClickListener { intent = getIntent(); switch (v.getId()) { case R.id.top_back_layout: - + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } if(intent.getType().equals("1")){ Intent intent1=new Intent(); intent1.putExtra("name",et_name.getText().toString().trim()); @@ -91,6 +98,12 @@ public class LoveEditName extends BaseActivity implements OnClickListener { break; case R.id.top_right_text: + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if(intent.getType().equals("1")){ Intent intent=new Intent(); intent.putExtra("name",et_name.getText().toString().trim()); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java index 473dc2c..da70861 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MainActivity.java @@ -15,6 +15,8 @@ import org.json.JSONException; import org.json.JSONObject; import com.easefun.polyvsdk.PolyvSDKClient; +import com.github.dfqin.grantor.PermissionListener; +import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.ToastHelper; @@ -32,9 +34,9 @@ import com.netease.nimlib.sdk.msg.MsgServiceObserve; import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.umeng.message.PushAgent; +import android.Manifest; import android.annotation.SuppressLint; import android.app.ActivityManager; import android.app.AlertDialog; @@ -288,24 +290,135 @@ public class MainActivity extends BaseActivity implements public void onClick(View v) { // TODO Auto-generated method stub dialog.dismiss(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + if (Build.VERSION.SDK_INT>26){ + boolean b = getPackageManager().canRequestPackageInstalls(); + if (b){ + if (!isServiceRunning()){ + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + }else { + ToastUtil.showMessage("后台正在更新"); + } - // File apkPath = new File(Environment - // .getExternalStorageDirectory(), "app/download/"); - // File apk = new File(apkPath.getPath(), "肝胆相照" - // + SharePrefUtil.getString(MainActivity.this, - // "new_version_code", "") + ".apk"); - // LogUtils.e(apk.getAbsolutePath()); - // if (apk.exists()) { - // Intent i = new Intent(); - // i.setAction(Intent.ACTION_VIEW); - // i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - // i.setDataAndType(Uri.fromFile(apk), - // "application/vnd.android.package-archive"); - // startActivity(i); - // } else { - if (Build.VERSION.SDK_INT>26){ - boolean b = getPackageManager().canRequestPackageInstalls(); - if (b){ + }else { + //请求安装未知应用来源的权限   + Uri packageURI = Uri.parse("package:" + getPackageName()); + Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); + startActivityForResult(intent, 10086); + + } + }else { + if (!isServiceRunning()){ + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + }else { + ToastUtil.showMessage("后台正在更新"); + } + } + } else { + PermissionsUtil.requestPermission(MainActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // 下载 + if (Build.VERSION.SDK_INT>26){ + boolean b = getPackageManager().canRequestPackageInstalls(); + if (b){ + if (!isServiceRunning()){ + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + }else { + ToastUtil.showMessage("后台正在更新"); + } + + }else { + //请求安装未知应用来源的权限   + Uri packageURI = Uri.parse("package:" + getPackageName()); + Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); + startActivityForResult(intent, 10086); + + } + }else { + if (!isServiceRunning()){ + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + }else { + ToastUtil.showMessage("后台正在更新"); + } + } + } + + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + if (Build.VERSION.SDK_INT>26){ + boolean b = getPackageManager().canRequestPackageInstalls(); + if (b){ + if (!isServiceRunning()){ + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + }else { + ToastUtil.showMessage("后台正在更新"); + } + + }else { + //请求安装未知应用来源的权限   + Uri packageURI = Uri.parse("package:" + getPackageName()); + Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); + startActivityForResult(intent, 10086); + + } + }else { if (!isServiceRunning()){ deleteDirWihtFile(new File(Environment .getExternalStorageDirectory(), "app/download/")); @@ -320,30 +433,23 @@ public class MainActivity extends BaseActivity implements }else { ToastUtil.showMessage("后台正在更新"); } - - }else { - //请求安装未知应用来源的权限   - Uri packageURI = Uri.parse("package:" + getPackageName()); - Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); - startActivityForResult(intent, 10086); - - } - }else { - if (!isServiceRunning()){ - deleteDirWihtFile(new File(Environment - .getExternalStorageDirectory(), "app/download/")); - // 启动服务 - serviceIntent = new Intent(MainActivity.this, - UpdateService.class); - // intent.putExtra("appVersion", newVewsion); - serviceIntent.putExtra("titleId", R.string.app_name); - serviceIntent.putExtra("url", dowmLoadPath); - ToastUtil.showMessage("开始后台下载"); - startService(serviceIntent); - }else { - ToastUtil.showMessage("后台正在更新"); } } + // File apkPath = new File(Environment + // .getExternalStorageDirectory(), "app/download/"); + // File apk = new File(apkPath.getPath(), "肝胆相照" + // + SharePrefUtil.getString(MainActivity.this, + // "new_version_code", "") + ".apk"); + // LogUtils.e(apk.getAbsolutePath()); + // if (apk.exists()) { + // Intent i = new Intent(); + // i.setAction(Intent.ACTION_VIEW); + // i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + // i.setDataAndType(Uri.fromFile(apk), + // "application/vnd.android.package-archive"); + // startActivity(i); + // } else { + // } @@ -591,14 +697,52 @@ public class MainActivity extends BaseActivity implements // startActivity(i); // } else { // 启动服务 - deleteDirWihtFile(new File(Environment - .getExternalStorageDirectory(), "app/download/")); - Intent intent = new Intent(MainActivity.this,UpdateService.class); - // intent.putExtra("appVersion", newVewsion); - intent.putExtra("titleId", R.string.app_name); - intent.putExtra("url", dowmLoadPath); - ToastUtil.showMessage("开始后台下载"); - startService(intent); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + Intent intent = new Intent(MainActivity.this,UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + intent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + PermissionsUtil.requestPermission(MainActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + Intent intent = new Intent(MainActivity.this,UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + intent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } + + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } else + { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + Intent intent = new Intent(MainActivity.this,UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + intent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } + + // } @@ -707,7 +851,7 @@ public class MainActivity extends BaseActivity implements // if (connectState == null) { // SDKCoreHelper.init(sInstance); // } - PushAgent.getInstance(MainActivity.this).onAppStart(); +// PushAgent.getInstance(MainActivity.this).onAppStart(); /** * 创建消息渠道 @@ -754,8 +898,8 @@ public class MainActivity extends BaseActivity implements String yx_token = SharePrefUtil.getString(MainActivity.this, Constant.yx_token, ""); if(StringUtil.isEmpty(yx_accid)|| StringUtil.isEmpty(yx_token)) { Map param = new HashMap<>(); - param.put("accid", yx_accid); - sendJsonPostParamtoNetSignMD5(yxrefresh, param, YXREGISTER, this); +// param.put("accid", yx_accid); + sendJsonPostParamtoNetSignMD5(yxregist, param, YXREGISTER, this); } else { @@ -939,6 +1083,7 @@ Observer customNotificationObserver = (Observer customNotificationObserver = (Observer= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + } else { + PermissionsUtil.requestPermission(MainActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // 下载 + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + } + + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } else + { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + // 启动服务 + serviceIntent = new Intent(MainActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + serviceIntent.putExtra("titleId", R.string.app_name); + serviceIntent.putExtra("url", dowmLoadPath); + ToastUtil.showMessage("开始后台下载"); + startService(serviceIntent); + } + }else { ToastUtil.showMessage("请允许来自此来源的应用安装"); } @@ -2168,7 +2355,13 @@ Observer customNotificationObserver = (Observer param = new HashMap<>(); + param.put("accid", yx_accid); + sendJsonPostParamtoNetSignMD5(yxrefresh,param,YXREF,this); + } @Override public void onCallbackFromThread(String resultJson) { @@ -2206,6 +2399,54 @@ Observer customNotificationObserver = (Observer() { + + @Override + public void onSuccess(LoginInfo param) { +// + DemoCache.setAccount(yx_accid); + saveLoginInfo(yx_accid, yx_token); + // 初始化消息提醒配置 + initNotificationConfig(); +// registerObservers(true); + + } + + @Override + public void onFailed(int code) { + + ToastHelper.showToast(MainActivity.this, + "云信登录失败: " + code); + + + } + + @Override + public void onException(Throwable exception) { +// + } + }); + } + } catch (JSONException e) { + e.printStackTrace(); + } break; case YXREGISTER: try { @@ -2216,7 +2457,7 @@ Observer customNotificationObserver = (Observer customNotificationObserver = (Observer customNotificationObserver = (Observer= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(ModifyCaseActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(ModifyCaseActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); } else { @@ -783,7 +796,7 @@ public class ModifyCaseActivity extends BaseActivity implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -798,7 +811,40 @@ public class ModifyCaseActivity extends BaseActivity implements @Override public void onClick(View v) { // TODO Auto-generated method stub - pickPhoto(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(ModifyCaseActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + + } else { + PermissionsUtil.requestPermission(ModifyCaseActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + pickPhoto(); + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyDataActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyDataActivity.java index 5ebf185..6e002d9 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyDataActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyDataActivity.java @@ -23,6 +23,7 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; @@ -46,6 +47,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; +import android.view.inputmethod.InputMethodManager; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; @@ -88,6 +90,7 @@ import cn.shangyu.gdxzPatient.widget.time.WheelMain; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; @@ -956,6 +959,12 @@ public class ModifyMyDataActivity extends BaseActivity implements // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout:// 返回 + + View view2 = getWindow().peekDecorView(); + if (view2 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view2.getWindowToken(), 0); + } finish(); break; case R.id.ll_modify_case:// 诊断 @@ -971,9 +980,15 @@ public class ModifyMyDataActivity extends BaseActivity implements case R.id.ib_select1: - LogUtils.v("第一张图片"); + break; case R.id.bt_submit_myinfo:// 提交修改 + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } // submit(); if (et_name.getText().toString() != null && !("").equals(et_name.getText().toString())) { @@ -999,7 +1014,7 @@ public class ModifyMyDataActivity extends BaseActivity implements initSelectedHeadPopupwindow(); if (mPopupWindowDialog != null) { mPopupWindowDialog.showAtLocation(view, Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } selectedPhoto(); @@ -1121,7 +1136,7 @@ public class ModifyMyDataActivity extends BaseActivity implements if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(ModifyMyDataActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(ModifyMyDataActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); } else { @@ -1137,7 +1152,7 @@ public class ModifyMyDataActivity extends BaseActivity implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -1152,7 +1167,40 @@ public class ModifyMyDataActivity extends BaseActivity implements @Override public void onClick(View v) { // TODO Auto-generated method stub - pickPhoto(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(ModifyMyDataActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + + } else { + PermissionsUtil.requestPermission(ModifyMyDataActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + pickPhoto(); + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { @@ -1395,6 +1443,8 @@ public class ModifyMyDataActivity extends BaseActivity implements mPopupWindowDialog.setBackgroundDrawable(new BitmapDrawable( getResources(), (Bitmap) null)); mPopupWindowDialog.setOutsideTouchable(true); + mPopupWindowDialog.setClippingEnabled(false); + } /** diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyMedicalRecordActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyMedicalRecordActivity.java index 8e29c8b..cd198cc 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyMedicalRecordActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ModifyMyMedicalRecordActivity.java @@ -17,6 +17,7 @@ import org.json.JSONObject; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; @@ -24,6 +25,7 @@ import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListene import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; @@ -46,6 +48,7 @@ import android.view.View.OnFocusChangeListener; import android.view.View.OnLongClickListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemSelectedListener; @@ -646,6 +649,11 @@ public class ModifyMyMedicalRecordActivity extends BaseActivity implements public void onClick(View v) { switch (v.getId()) { case R.id.top_back_layout:// 返回 + View view1= getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } BaseApplication.setAddCount(0); finish(); @@ -705,6 +713,11 @@ public class ModifyMyMedicalRecordActivity extends BaseActivity implements // // selectedPhoto(poisition); // break; case R.id.btn_submit: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } // 提交 modify(); // AlbumPhotoActivity.mSelectedImg.clear(); @@ -830,11 +843,11 @@ public class ModifyMyMedicalRecordActivity extends BaseActivity implements getResources(), (Bitmap) null)); // 触摸popupwindow外部,popupwindow消失。 mPopupWindowDialog.setOutsideTouchable(true); - + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { // 设置弹出位置 mPopupWindowDialog.showAtLocation(mView, Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } } @@ -851,7 +864,7 @@ public class ModifyMyMedicalRecordActivity extends BaseActivity implements // 拍照获取照片 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(ModifyMyMedicalRecordActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(ModifyMyMedicalRecordActivity.this,Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); if (mPopupWindowDialog != null @@ -875,7 +888,7 @@ public class ModifyMyMedicalRecordActivity extends BaseActivity implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -894,12 +907,51 @@ public class ModifyMyMedicalRecordActivity extends BaseActivity implements @Override public void onClick(View v) { - // 从相册获取 - pickPhoto(); - if (mPopupWindowDialog != null - && mPopupWindowDialog.isShowing()) { - mPopupWindowDialog.dismiss();// 消失 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(ModifyMyMedicalRecordActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } else { + PermissionsUtil.requestPermission(ModifyMyMedicalRecordActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + } + else + { + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCardManageActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCardManageActivity.java index 7a1a1e7..da6a421 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCardManageActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCardManageActivity.java @@ -10,12 +10,14 @@ import org.apache.http.message.BasicNameValuePair; import org.json.JSONException; import org.json.JSONObject; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.Message; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.RelativeLayout; import android.widget.TextView; @@ -58,7 +60,12 @@ public class MyCardManageActivity extends BaseActivity implements OnClickListene public void onClick(View v) { switch (v.getId()) { case R.id.top_back_layout: - LogUtils.v("返回"); + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.rl_card_3://选择银行卡 @@ -66,6 +73,12 @@ public class MyCardManageActivity extends BaseActivity implements OnClickListene startActivityForResult(intent, 1); break; case R.id.top_right_text://提交 + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } save(); break; default: diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCaseDetailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCaseDetailActivity.java index ec34e51..47d3ddc 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCaseDetailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyCaseDetailActivity.java @@ -6,6 +6,7 @@ import org.apache.http.message.BasicNameValuePair; import org.json.JSONException; import org.json.JSONObject; import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; @@ -17,6 +18,7 @@ import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; import android.widget.RelativeLayout; @@ -363,11 +365,20 @@ public class MyCaseDetailActivity extends BaseActivity implements public void onClick(View v) { switch (v.getId()) { case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; case R.id.top_right_text: - + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } Intent goModifyIntent = new Intent(MyCaseDetailActivity.this, ModifyMyMedicalRecordActivity.class); Bundle bundle = new Bundle(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditNameActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditNameActivity.java index aeb5bc8..b6d153c 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditNameActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditNameActivity.java @@ -1,9 +1,11 @@ package cn.shangyu.gdxzPatient.activity; +import android.content.Context; import android.content.Intent; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.utils.UIUtils; @@ -55,6 +57,11 @@ public class MyEditNameActivity extends BaseActivity implements OnClickListener // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if("1".equals(intent.getType())){ Intent intent1=new Intent(); intent1.putExtra("name",et_name.getText().toString().trim()); @@ -69,6 +76,11 @@ public class MyEditNameActivity extends BaseActivity implements OnClickListener break; case R.id.top_right_text: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } if("1".equals(intent.getType())){ Intent intent1=new Intent(); intent1.putExtra("name",et_name.getText().toString().trim()); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java index fe473a6..d8d7245 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyEditPhoneActivity.java @@ -20,6 +20,7 @@ import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import android.Manifest; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -33,6 +34,7 @@ import android.text.method.PasswordTransformationMethod; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; @@ -425,6 +427,11 @@ public class MyEditPhoneActivity extends BaseActivity implements top_back_layout.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } Intent intent = new Intent(); intent.putExtra("phone", ""); setResult(522, intent); @@ -617,6 +624,11 @@ public class MyEditPhoneActivity extends BaseActivity implements startActivity(intent); break; case R.id.btn_regist:// 注册 + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } initRegist(); break; case R.id.img_ver_code: diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyExpertActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyExpertActivity.java index 98860b5..b03e2dd 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyExpertActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyExpertActivity.java @@ -1,5 +1,9 @@ package cn.shangyu.gdxzPatient.activity; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -8,6 +12,7 @@ import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.Observer; import com.netease.nimlib.sdk.StatusCode; @@ -15,10 +20,12 @@ import com.netease.nimlib.sdk.auth.AuthService; import com.netease.nimlib.sdk.auth.AuthServiceObserver; import com.zbar.lib.CaptureActivity; + import android.Manifest; import android.annotation.SuppressLint; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -45,11 +52,15 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import cn.bertsir.zbar.Qr.ScanResult; +import cn.bertsir.zbar.QrConfig; +import cn.bertsir.zbar.QrManager; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.adapter.MyExpertPageAdapter; import cn.shangyu.gdxzPatient.bean.MyExpertListBean; import cn.shangyu.gdxzPatient.bean.PatientUsers; import cn.shangyu.gdxzPatient.ecdemo.common.dialog.ECAlertDialog; +import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; import cn.shangyu.gdxzPatient.ecdemo.storage.ConversationSqlManager; @@ -63,9 +74,15 @@ import cn.shangyu.gdxzPatient.utils.CommonUtil; import cn.shangyu.gdxzPatient.utils.Constant; import cn.shangyu.gdxzPatient.utils.LogUtils; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; +import cn.shangyu.gdxzPatient.utils.StreamTool; import cn.shangyu.gdxzPatient.utils.Url; import cn.shangyu.gdxzPatient.view.IndexViewPager; +import static cn.bertsir.zbar.QrConfig.SCANVIEW_TYPE_QRCODE; +import static cn.bertsir.zbar.QrConfig.SCREEN_PORTRAIT; +import static cn.bertsir.zbar.QrConfig.TYPE_QRCODE; +import static cn.bertsir.zbar.view.ScanLineView.style_line; + /** * MyExpertActivity.java * @@ -106,6 +123,8 @@ public class MyExpertActivity extends FragmentActivity implements // TODO Auto-generated method stub super.onCreate(arg0); setContentView(R.layout.activity_my_expert); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); initView(); // android.permission.CAMERA setTitle(); @@ -304,7 +323,7 @@ public class MyExpertActivity extends FragmentActivity implements if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(MyExpertActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(MyExpertActivity.this,Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 startToCapture(); } else { @@ -320,7 +339,7 @@ public class MyExpertActivity extends FragmentActivity implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -335,9 +354,10 @@ public class MyExpertActivity extends FragmentActivity implements } private void startToCapture() { - Intent intent = new Intent(MyExpertActivity.this, - CaptureActivity.class); - startActivity(intent); +// Intent intent = new Intent(MyExpertActivity.this, +// CaptureActivity.class); +// startActivity(intent); + start(); } @Override @@ -526,5 +546,141 @@ public class MyExpertActivity extends FragmentActivity implements }; }; + private String expertUuid; + private void start() { + + QrConfig qrConfig = new QrConfig.Builder() + .setDesText("请将医生二维码放入框内")//扫描框下文字 + .setShowDes(true)//是否显示扫描框下面文字 + .setShowLight(true)//显示手电筒按钮 + .setShowTitle(true)//显示Title + .setShowAlbum(false)//显示从相册选择按钮 + .setNeedCrop(false)//是否从相册选择后裁剪图片 +// .setCornerColor(Color.parseColor("#E42E30"))//设置扫描框颜色 + .setLineColor(Color.parseColor("#08C8FF"))//设置扫描线颜色 + .setLineSpeed(QrConfig.LINE_MEDIUM)//设置扫描线速度 + .setScanType(TYPE_QRCODE)//设置扫码类型(二维码,条形码,全部,自定义,默认为二维码) + .setScanViewType(SCANVIEW_TYPE_QRCODE)//设置扫描框类型(二维码还是条形码,默认为二维码) + .setCustombarcodeformat(QrConfig.BARCODE_PDF417)//此项只有在扫码类型为TYPE_CUSTOM时才有效 + .setPlaySound(true)//是否扫描成功后bi~的声音 +// .setDingPath(cb_show_custom_ding.isChecked() ? R.raw.test : R.raw.qrcode)//设置提示音(不设置为默认的Ding~) + .setIsOnlyCenter(false)//是否只识别框中内容(默认为全屏识别) +// .setTitleText(et_qr_title.getText().toString())//设置Tilte文字 + .setTitleBackgroudColor(Color.parseColor("#3cc9c0"))//设置状态栏颜色 + .setTitleTextColor(Color.WHITE)//设置Title文字颜色 +// .setShowZoom(cb_show_zoom.isChecked())//是否开始滑块的缩放 +// .setAutoZoom(cb_auto_zoom.isChecked())//是否开启自动缩放(实验性功能,不建议使用) +// .setFingerZoom(cb_finger_zoom.isChecked())//是否开始双指缩放 +// .setDoubleEngine(cb_double_engine.isChecked())//是否开启双引擎识别(仅对识别二维码有效,并且开启后只识别框内功能将失效) + .setScreenOrientation(SCREEN_PORTRAIT)//设置屏幕方式 + .setOpenAlbumText("选择要识别的图片")//打开相册的文字 + .setLooperScan(false)//是否连续扫描二维码 +// .setLooperWaitTime(Integer.parseInt(et_loop_scan_time.getText().toString()) * 1000)//连续扫描间隔时间 + .setScanLineStyle(style_line)//扫描线样式 +// .setAutoLight(cb_auto_light.isChecked())//自动灯光 + .setShowVibrator(true)//是否震动提醒 + .create(); + QrManager.getInstance().init(qrConfig).startScan(MyExpertActivity.this, new QrManager.OnScanResultCallback() { + @Override + public void onScanSuccess(ScanResult result) { +// Log.e(TAG, "onScanSuccess: " + result); + expertUuid=result.getContent(); + new Thread(networkTask2).start(); +// Toast.makeText(getActivity(), "内容:" + result.getContent() +// + " 类型:" + result.getType(), Toast.LENGTH_SHORT).show(); + } + }); + } + Runnable networkTask2 = new Runnable() { + + + @Override + public void run() { + // TODO + String url = null; + url = Url.isExpert + "?expertUuid=" + expertUuid; + getTooken1(url); + + } + + private void getTooken1(String urlStringUtil) { + // TODO Auto-generated method stub + LogUtil.i("urlStringUtil = " + urlStringUtil); + try { + URL url = new URL(urlStringUtil); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + conn.setDoOutput(true); + conn.setConnectTimeout(5 * 1000); + OutputStream outStream = conn.getOutputStream(); + outStream.flush(); + outStream.close(); + if (conn.getResponseCode() == 200) { + InputStream inStream = conn.getInputStream(); + String result = new String( + StreamTool.readInputStream(inStream), "UTF-8"); + Message message = new Message(); + message.what = 102; + message.obj = new String(result); + handler1.sendMessage(message); + } else { + Message message = new Message(); + message.what = 105; + handler1.sendMessage(message); + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + ToastUtil.showMessage("请求失败,请稍后重试"); + } + + } + }; + public Handler handler1 = new Handler() { + @Override + public void handleMessage(Message msg) { + // TODO Auto-generated method stub + switch (msg.what) { + case 102: + + try { + String str = (String) msg.obj; + LogUtils.d("onSuccess resultJson = " + str); + JSONObject objs = new JSONObject(str); + String retcode = objs.getString("code"); + String expertuuid = objs.getString("expertUuid"); + String message = objs.getString("message"); + if (retcode.equals(String.valueOf(1))) { + String isExpert = objs.getString("data"); + if ("1".equals(isExpert)) { + Intent intent = new Intent( + MyExpertActivity.this, + ExpertDetailActivity.class); + + intent.putExtra("uuid", expertuuid); + startActivity(intent); + + } else { + ToastUtil.showMessage( + "您扫描的二维码不是有效的肝胆相照专家二维码。", 1); + + } + } else { + ToastUtil.showMessage(message); + } + } catch (JSONException e) { + e.printStackTrace(); + // ToastUtil.showMessage("服务器异常!"); + ToastUtil.showMessage("您扫描的二维码不是有效的肝胆相照专家二维码。", 1); + + } + break; + + + } + + } + + }; } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFeedbookActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFeedbookActivity.java index c2da68e..6babb61 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFeedbookActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFeedbookActivity.java @@ -22,6 +22,7 @@ import com.iflytek.cloud.ui.RecognizerDialogListener; import android.Manifest; import android.app.AlertDialog; import android.app.Dialog; +import android.content.Context; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -36,6 +37,7 @@ import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; @@ -207,6 +209,12 @@ public class MyFeedbookActivity extends BaseActivity implements OnClickListener public void onClick(View v) { switch (v.getId()) { case R.id.bt_submit: // 提交 + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if ("zhuxiao".equals(getIntent().getType())){ isEdit(); }else { @@ -214,6 +222,12 @@ public class MyFeedbookActivity extends BaseActivity implements OnClickListener } break; case R.id.top_back_layout: + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.ib_voice:// 语音识别 diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFlowerActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFlowerActivity.java index da65462..96a03b1 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFlowerActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFlowerActivity.java @@ -7,6 +7,7 @@ import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -152,6 +153,8 @@ public class MyFlowerActivity extends Activity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_my_flo); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); balance = getIntent().getStringExtra("balance"); rl_back = (RelativeLayout) findViewById(R.id.top_back_layout); rl_back.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFriendActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFriendActivity.java index 1ede99a..00e2c61 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFriendActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/MyFriendActivity.java @@ -27,7 +27,6 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.nostra13.universalimageloader.core.ImageLoader; -import com.zbar.lib.CaptureActivity; import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java index 95f9759..f492ecc 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/NewsDetailActivity.java @@ -8,6 +8,8 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import com.github.dfqin.grantor.PermissionListener; +import com.github.dfqin.grantor.PermissionsUtil; import com.nostra13.universalimageloader.core.ImageLoader; import com.umeng.socialize.ShareAction; import com.umeng.socialize.UMShareAPI; @@ -16,6 +18,7 @@ import com.umeng.socialize.bean.SHARE_MEDIA; import com.umeng.socialize.media.UMImage; import com.umeng.socialize.media.UMWeb; +import android.Manifest; import android.annotation.SuppressLint; import android.content.Intent; import android.graphics.Bitmap; @@ -40,11 +43,14 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; + +import androidx.annotation.NonNull; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.application.BaseApplication; import cn.shangyu.gdxzPatient.ecdemo.common.CCPAppManager; import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; +import cn.shangyu.gdxzPatient.ecdemo.ui.chatting.ImageGralleryPagerActivity; import cn.shangyu.gdxzPatient.ecdemo.ui.chatting.ViewImageInfo; import cn.shangyu.gdxzPatient.http.OnCallBackFromNet; import cn.shangyu.gdxzPatient.utils.Constant; @@ -415,9 +421,38 @@ public class NewsDetailActivity extends BaseActivity implements // 下载 itemLongClickedPopWindow.dismiss(); // 点击图片后将图片保存到SD卡跟目录下的Test文件夹内 - new DownLoadUrlImage(imgurl, ctx); - Toast.makeText(getBaseContext(), "图片保存", - Toast.LENGTH_SHORT).show(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(NewsDetailActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + new DownLoadUrlImage(imgurl, ctx); + Toast.makeText(getBaseContext(), "图片保存", + Toast.LENGTH_SHORT).show(); + } + else + { + PermissionsUtil.requestPermission(NewsDetailActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + new DownLoadUrlImage(imgurl, ctx); + Toast.makeText(getBaseContext(), "图片保存", + Toast.LENGTH_SHORT).show(); + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + + } + } + else + { + new DownLoadUrlImage(imgurl, ctx); + Toast.makeText(getBaseContext(), "图片保存", + Toast.LENGTH_SHORT).show(); + } + } }); return true; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/OnlinePayActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/OnlinePayActivity.java index 7f4e9bd..0f1a336 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/OnlinePayActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/OnlinePayActivity.java @@ -8,6 +8,7 @@ import org.apache.http.message.BasicNameValuePair; import android.app.Activity; import android.app.AlertDialog.Builder; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Color; @@ -150,9 +151,21 @@ public class OnlinePayActivity extends BaseActivity implements OnClickListener{ // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.btn_pay: + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } matchPayWay(rg_pay.getCheckedRadioButtonId()); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PatientDetailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PatientDetailActivity.java index 6193af4..13a1d78 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PatientDetailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PatientDetailActivity.java @@ -2,7 +2,6 @@ package cn.shangyu.gdxzPatient.activity; import android.view.View; -import com.umeng.socialize.media.Base; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.utils.UIUtils; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonDataActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonDataActivity.java index 5c05911..7991bfc 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonDataActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonDataActivity.java @@ -1,9 +1,11 @@ package cn.shangyu.gdxzPatient.activity; +import android.content.Context; import android.content.Intent; import android.text.TextUtils; import android.view.KeyEvent; import android.view.View; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import cn.shangyu.gdxzPatient.R; @@ -61,9 +63,19 @@ public class PersonDataActivity extends BaseActivity implements View.OnClickList public void onClick(View v) { switch (v.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.top_right_text: + View view1 = getWindow().peekDecorView(); + if (view1!= null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if("height".equals(intent.getType())){ String trim = et_name.getText().toString().trim(); if (!"".equals(trim)){ diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonInfoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonInfoActivity.java index 2dbace4..c4c5e9e 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonInfoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PersonInfoActivity.java @@ -95,6 +95,7 @@ import cn.shangyu.gdxzPatient.widget.time.WheelMain; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; @@ -1170,9 +1171,10 @@ public class PersonInfoActivity extends BaseFragment implements tv_cancel = (TextView) selectedPhotoView .findViewById(R.id.tv_cancel); initSelectedHeadPopupwindow(); + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { mPopupWindowDialog.showAtLocation(view, Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } selectedPhoto(); @@ -1531,7 +1533,7 @@ public class PersonInfoActivity extends BaseFragment implements if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(ctx, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(ctx, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); } else { @@ -1547,7 +1549,7 @@ public class PersonInfoActivity extends BaseFragment implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -1562,7 +1564,40 @@ public class PersonInfoActivity extends BaseFragment implements @Override public void onClick(View v) { // TODO Auto-generated method stub - pickPhoto(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + + } else { + PermissionsUtil.requestPermission(getActivity(), new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + pickPhoto(); + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PhotoSelectActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PhotoSelectActivity.java index 1107323..9302845 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PhotoSelectActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PhotoSelectActivity.java @@ -34,6 +34,8 @@ import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gyf.immersionbar.ImmersionBar; + public class PhotoSelectActivity extends Activity implements OnClickListener { /** @@ -74,6 +76,8 @@ public class PhotoSelectActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_album); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); lv_list_dir = (GridView) findViewById(R.id.lv_list_dir); top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); top_back_layout.setOnClickListener(this); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ProblemComplementActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ProblemComplementActivity.java index e3d48e5..b68d0c0 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ProblemComplementActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ProblemComplementActivity.java @@ -2,6 +2,7 @@ package cn.shangyu.gdxzPatient.activity; import android.Manifest; import android.app.Activity; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; @@ -19,6 +20,7 @@ import android.view.Gravity; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; @@ -32,6 +34,7 @@ import android.widget.Toast; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; @@ -168,6 +171,11 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl break; case R.id.top_back_layout: if (TextUtils.isEmpty(et_describe.getText().toString())) { + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); }else { dilaog2 = ECAlertDialog.buildAlert(ProblemComplementActivity.this, @@ -387,10 +395,10 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl getResources(), (Bitmap) null)); // 触摸popupwindow外部,popupwindow消失。 mPopupWindowDialog.setOutsideTouchable(true); - + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { // 设置弹出位置 - mPopupWindowDialog.showAtLocation(view, Gravity.BOTTOM, 0, 0); + mPopupWindowDialog.showAtLocation(view, Gravity.BOTTOM, 0, ImmersionBar.getNavigationBarHeight(this)); } } @@ -408,7 +416,7 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl // 拍照获取照片 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(ProblemComplementActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(ProblemComplementActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限 takePhoto(); } else { @@ -424,7 +432,7 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -441,12 +449,51 @@ public class ProblemComplementActivity extends BaseActivity implements View.OnCl @Override public void onClick(View v) { - // 从相册获取 - pickPhoto(); - if (mPopupWindowDialog != null - && mPopupWindowDialog.isShowing()) { - mPopupWindowDialog.dismiss();// 消失 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(ProblemComplementActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } else { + PermissionsUtil.requestPermission(ProblemComplementActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + } + else + { + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } + } }); tv_cancel.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PublicSearchActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PublicSearchActivity.java index 02cc4d9..6047f26 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/PublicSearchActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/PublicSearchActivity.java @@ -10,6 +10,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.EditText; @@ -18,6 +19,9 @@ import android.widget.TextView; import android.widget.AdapterView.OnItemClickListener; import android.widget.GridView; import android.widget.TextView.OnEditorActionListener; + +import com.gyf.immersionbar.ImmersionBar; + import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; @@ -47,6 +51,8 @@ public class PublicSearchActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_public_search); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); init(); initClick(); } @@ -252,9 +258,19 @@ public class PublicSearchActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub switch (v.getId()) { case R.id.iv_back: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } this.finish(); break; case R.id.tv_public_ser: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } if (TextUtils.isEmpty(tv_top_search.getText().toString().trim()) && choicePos != 4) { ToastUtil.showMessage("请输入搜索内容"); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/QuestionListActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/QuestionListActivity.java index cd4fcbb..361301f 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/QuestionListActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/QuestionListActivity.java @@ -1,5 +1,6 @@ package cn.shangyu.gdxzPatient.activity; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Color; @@ -9,6 +10,7 @@ import android.text.style.ForegroundColorSpan; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; @@ -212,6 +214,11 @@ public class QuestionListActivity extends BaseActivity implements View.OnClickLi startActivity(broadc); break; case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.bt_next: diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java index fa86882..95c9d27 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/RegistActivity.java @@ -22,6 +22,7 @@ import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import android.Manifest; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -36,6 +37,7 @@ import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -239,13 +241,13 @@ public class RegistActivity extends BaseActivity implements OnClickListener, OnC @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (!isChecked) { - btn_regist.setEnabled(false); - btn_regist.setClickable(false); - } else { +// if (!isChecked) { +// btn_regist.setEnabled(false); +// btn_regist.setClickable(false); +// } else { btn_regist.setEnabled(true); btn_regist.setClickable(true); - } +// } } }); @@ -509,6 +511,17 @@ public class RegistActivity extends BaseActivity implements OnClickListener, OnC startActivity(intent); break; case R.id.btn_regist:// 注册 + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + if(!cb_ok.isChecked()) + { + ToastUtil.showMessage("请先阅读并同意协议"); + return; + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ReplyFeedbackActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ReplyFeedbackActivity.java index 0a88e57..e4cceec 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ReplyFeedbackActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ReplyFeedbackActivity.java @@ -6,6 +6,7 @@ import cn.shangyu.gdxzPatient.utils.KeDaXunFeiUtil; import android.Manifest; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -13,6 +14,7 @@ import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageButton; import android.widget.RelativeLayout; @@ -20,6 +22,7 @@ import android.widget.TextView; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; public class ReplyFeedbackActivity extends Activity implements OnClickListener { private EditText mName; @@ -35,6 +38,8 @@ public class ReplyFeedbackActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.settting_feed_bac_activity); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); top_back_layout.setOnClickListener(this); top_title = (TextView) findViewById(R.id.top_title); @@ -85,12 +90,22 @@ public class ReplyFeedbackActivity extends Activity implements OnClickListener { break; case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } // Intent intent = new Intent(); // intent.putExtra("reply", mName.getText().toString().trim()); // ReplyFeedbackActivity.this.setResult(FEED_BACK, intent); finish(); break; case R.id.top_right_text: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } if (TextUtils.isEmpty(mName.getText().toString().trim())) { ToastUtil.showMessage("您还未输入回复内容"); return; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SendFlowerNewActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SendFlowerNewActivity.java index f207518..20a4449 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SendFlowerNewActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SendFlowerNewActivity.java @@ -13,6 +13,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener2; import com.nostra13.universalimageloader.core.ImageLoader; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Handler; @@ -23,6 +24,7 @@ import android.text.format.DateUtils; import android.view.Gravity; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; @@ -413,10 +415,19 @@ public class SendFlowerNewActivity extends BaseActivity implements // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; case R.id.btn_send_flower: - + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } buildAlert1 = ECAlertDialog.buildAlert(SendFlowerNewActivity.this, "您确定是否送出?", "否", "是", new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java index a566e8d..db87fb6 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ServiceEvaluationActivity.java @@ -1,6 +1,8 @@ package cn.shangyu.gdxzPatient.activity; +import android.content.Context; import android.view.View; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; @@ -72,6 +74,11 @@ public class ServiceEvaluationActivity extends BaseActivity implements View.OnCl public void onClick(View v) { switch (v.getId()){ case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.iv_score1_1: @@ -120,6 +127,11 @@ public class ServiceEvaluationActivity extends BaseActivity implements View.OnCl ToastUtil.showMessage("至少输入5个字"); return; } + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if (pd==null){ pd = new CustomProgressDialog(ServiceEvaluationActivity.this, "请稍候"); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationActivity.java index 4f9b609..342a58c 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationActivity.java @@ -21,11 +21,13 @@ import pickerview.TimePopupWindow.Type; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; @@ -47,6 +49,7 @@ import android.view.Gravity; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; @@ -807,6 +810,11 @@ public class SetInformationActivity extends BaseActivity implements switch (v.getId()) { case R.id.top_back_layout:// 返回 // AppManager.getAppManager().AppExit(ctx); + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } BaseApplication.showRegistName = true; this.finish(); @@ -816,6 +824,11 @@ public class SetInformationActivity extends BaseActivity implements // ToastUtil.showMessage("请切换密码登录并完善您的资料"); // return; // } + View view2 = getWindow().peekDecorView(); + if (view2 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view2.getWindowToken(), 0); + } final String myName = et_my_name.getText().toString().trim();// 姓名 if (TextUtils.isEmpty(myName)) { CustomToast.show(ctx, "真实姓名 不能为空", 0); @@ -867,7 +880,7 @@ public class SetInformationActivity extends BaseActivity implements if (mPopupWindowDialog != null) { mPopupWindowDialog.showAtLocation( findViewById(R.id.tv_select_birthday), Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } selectedPhoto(); @@ -1208,7 +1221,7 @@ public class SetInformationActivity extends BaseActivity implements // TODO Auto-generated method stub if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(SetInformationActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(SetInformationActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); } else { @@ -1224,7 +1237,7 @@ public class SetInformationActivity extends BaseActivity implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -1239,7 +1252,40 @@ public class SetInformationActivity extends BaseActivity implements @Override public void onClick(View v) { // TODO Auto-generated method stub - pickPhoto();// 相册选择 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(SetInformationActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + + } else { + PermissionsUtil.requestPermission(SetInformationActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + pickPhoto();// 相册选择 + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { @@ -1476,6 +1522,7 @@ public class SetInformationActivity extends BaseActivity implements mPopupWindowDialog.setBackgroundDrawable(new BitmapDrawable( getResources(), (Bitmap) null)); mPopupWindowDialog.setOutsideTouchable(true); + mPopupWindowDialog.setClippingEnabled(false); } /** diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationNewActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationNewActivity.java index 4421c03..c237a91 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationNewActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SetInformationNewActivity.java @@ -33,6 +33,7 @@ import android.widget.Toast; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.ToastHelper; import com.netease.nimlib.sdk.RequestCallback; @@ -631,7 +632,7 @@ public class SetInformationNewActivity extends BaseActivity implements View.OnCl initSelectedHeadPopupwindow(); if (mPopupWindowDialog != null) { mPopupWindowDialog.showAtLocation(findViewById(R.id.tv_address), Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } selectedPhoto(); @@ -1237,6 +1238,7 @@ public class SetInformationNewActivity extends BaseActivity implements View.OnCl mPopupWindowDialog.setBackgroundDrawable(new BitmapDrawable( getResources(), (Bitmap) null)); mPopupWindowDialog.setOutsideTouchable(true); + mPopupWindowDialog.setClippingEnabled(false); } /** * 选择图片 @@ -1251,7 +1253,7 @@ public class SetInformationNewActivity extends BaseActivity implements View.OnCl // TODO Auto-generated method stub if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { // 拍照获取照片 - if (PermissionsUtil.hasPermission(ctx, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(ctx, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 takePhoto(); } else { @@ -1267,7 +1269,7 @@ public class SetInformationNewActivity extends BaseActivity implements View.OnCl } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -1282,7 +1284,40 @@ public class SetInformationNewActivity extends BaseActivity implements View.OnCl @Override public void onClick(View v) { // TODO Auto-generated method stub - pickPhoto();// 相册选择 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(SetInformationNewActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + + } else { + PermissionsUtil.requestPermission(SetInformationNewActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + pickPhoto();// 相册选择 + } + } }); tv_cancel.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java index 4eaa5ba..d822b97 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java @@ -1,16 +1,23 @@ package cn.shangyu.gdxzPatient.activity; import java.io.InvalidClassException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import android.Manifest; +import android.app.AppOpsManager; import android.app.Dialog; +import android.app.NotificationManager; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.pm.ApplicationInfo; import android.net.Uri; import android.os.Build; import androidx.annotation.NonNull; + +import android.provider.Settings; import android.view.View; import android.view.View.OnClickListener; import android.widget.RelativeLayout; @@ -67,7 +74,7 @@ public class SettingAndHelpActivity extends BaseActivity implements private RelativeLayout m_changepsw,rl_change_iphone; private RelativeLayout m_help,rl_shareapp; private RelativeLayout m_out, m_aboutus,rl_patgroup; - private TextView tv_settings_update, tv_new_version; + private TextView tv_settings_update, tv_new_version,tv_send; private TextView call_servie;// 拨打客服电话; private String aboutUrl = "http://doc.igandan.com/app/html/about/2017/about2.html"; @@ -76,7 +83,7 @@ public class SettingAndHelpActivity extends BaseActivity implements * 当前MainActivity 实例 */ public static MainActivity mMainActivity; - + private RelativeLayout ll_dynamic; @Override public void setTitle() { ctx = this; @@ -144,6 +151,23 @@ public class SettingAndHelpActivity extends BaseActivity implements return view; } + @Override + protected void onResume() { + super.onResume(); + if(tv_send!=null) + { + if(isNotificationEnabled()) + { + tv_send.setText("已开启"); + } + else + { + tv_send.setText("已关闭"); + + } + } + } + private void initView() { // TODO Auto-generated method stub m_group_notif = (SettingItem) view @@ -164,7 +188,8 @@ public class SettingAndHelpActivity extends BaseActivity implements m_out = (RelativeLayout) view.findViewById(R.id.rl_setting_out);// 退出 rl_patgroup = (RelativeLayout) view.findViewById(R.id.rl_patgroup);// 退出 tv_new_version = (TextView) view.findViewById(R.id.tv_new_version);// 清除缓存 - + ll_dynamic=view.findViewById(R.id.ll_dynamic); + ll_dynamic.setOnClickListener(this); // 是否显示更新新版本 if (SharePrefUtil.getBoolean(this, "mIsNewVersion", false)) { tv_new_version.setVisibility(View.VISIBLE); @@ -176,6 +201,16 @@ public class SettingAndHelpActivity extends BaseActivity implements tv_settings_update = (TextView) view .findViewById(R.id.tv_settings_update); call_servie = (TextView) view.findViewById(R.id.tv_call_service); + tv_send=view.findViewById(R.id.tv_send); + if(isNotificationEnabled()) + { + tv_send.setText("已开启"); + } + else + { + tv_send.setText("已关闭"); + + } } @Override @@ -212,7 +247,41 @@ public class SettingAndHelpActivity extends BaseActivity implements e.printStackTrace(); } } + private boolean isNotificationEnabled() { + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + //8.0手机以上 + if (((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).getImportance() == NotificationManager.IMPORTANCE_NONE) { + + + return false; + } + } + + String CHECK_OP_NO_THROW = "checkOpNoThrow"; + String OP_POST_NOTIFICATION = "OP_POST_NOTIFICATION"; + + AppOpsManager mAppOps = (AppOpsManager)getSystemService(Context.APP_OPS_SERVICE); + ApplicationInfo appInfo = getApplicationInfo(); + String pkg = getApplicationContext().getPackageName(); + int uid = appInfo.uid; + Class appOpsClass = null; + + try { + appOpsClass = Class.forName(AppOpsManager.class.getName()); + Method checkOpNoThrowMethod = appOpsClass.getMethod(CHECK_OP_NO_THROW, Integer.TYPE, Integer.TYPE, + String.class); + Field opPostNotificationValue = appOpsClass.getDeclaredField(OP_POST_NOTIFICATION); + + int value = (Integer) opPostNotificationValue.get(Integer.class); + return ((Integer) checkOpNoThrowMethod.invoke(mAppOps, value, uid, pkg) == AppOpsManager.MODE_ALLOWED); + + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } private int mExitType = 0; private SettingAndHelpActivity ctx; @@ -326,6 +395,9 @@ public class SettingAndHelpActivity extends BaseActivity implements @Override public void onClick(View v) { switch (v.getId()) { + case R.id.ll_dynamic: + goToNotificationSetting(); + break; case R.id.top_back_layout:// 返回 finish(); break; @@ -428,7 +500,37 @@ public class SettingAndHelpActivity extends BaseActivity implements } } + /** + * 打开允许通知的设置页 + */ + private void goToNotificationSetting() { + Intent intent = new Intent(); + if (Build.VERSION.SDK_INT >= 26) { + intent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS"); + intent.setData(Uri.fromParts("package", getPackageName(), null)); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); +// intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS); +// intent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName()); +//// intent.putExtra(Settings.EXTRA_CHANNEL_ID, "随访消息"); +// startActivity(intent); + } else if (Build.VERSION.SDK_INT >= 21) { + // android 5.0-7.0 + intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS"); + intent.putExtra("app_package",getPackageName()); + intent.putExtra("app_uid", getApplicationInfo().uid); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } else { + // 其他 + intent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS"); + intent.setData(Uri.fromParts("package", getPackageName(), null)); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } + + } private void network() { buildAlert = ECAlertDialog.buildAlert(ctx, "客服电话 400-175-6866 \n工作时间 8:30 - 21:00", "取消", "确定", diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndModifyPwdActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndModifyPwdActivity.java index 45f932c..d316754 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndModifyPwdActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndModifyPwdActivity.java @@ -7,6 +7,7 @@ import org.apache.http.message.BasicNameValuePair; import org.json.JSONException; import org.json.JSONObject; import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.Message; @@ -15,6 +16,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; import android.widget.TextView; @@ -56,14 +58,32 @@ public class SettingAndModifyPwdActivity extends BaseActivity implements OnClick public void onClick(View v) { switch (v.getId()) { case R.id.changepwdok:// 提交 + + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } changepwdok(); break; case R.id.tv_forget: + + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } Intent intent = new Intent(this, ForgetRestPwdActivity.class); intent.putExtra("from","SettingAndModifyPwdActivity"); startActivityForResult(intent,101); break; case R.id.top_back_layout:// 反回 + + View view2 = getWindow().peekDecorView(); + if (view2 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view2.getWindowToken(), 0); + } finish(); break; } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingFeedbackActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingFeedbackActivity.java index 874c2cf..6c595af 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingFeedbackActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingFeedbackActivity.java @@ -7,6 +7,7 @@ import cn.shangyu.gdxzPatient.utils.StringUtil; import android.Manifest; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -15,6 +16,7 @@ import android.text.TextUtils; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageButton; import android.widget.RelativeLayout; @@ -22,6 +24,7 @@ import android.widget.TextView; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; public class SettingFeedbackActivity extends Activity implements OnClickListener { @@ -38,6 +41,8 @@ public class SettingFeedbackActivity extends Activity implements // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.settting_feed_bac_activity); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); top_back_layout.setOnClickListener(this); top_title = (TextView) findViewById(R.id.top_title); @@ -61,12 +66,22 @@ public class SettingFeedbackActivity extends Activity implements switch (arg0.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } Intent intent = new Intent(); intent.putExtra("reply", mName.getText().toString().trim()); SettingFeedbackActivity.this.setResult(FEED_BACK, intent); finish(); break; case R.id.top_right_text: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if (TextUtils.isEmpty(mName.getText().toString().trim())) { ToastUtil.showMessage("您还未输入回复内容"); return; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java index 0d4d7df..387f916 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingVersionActivity.java @@ -6,8 +6,11 @@ import java.util.List; import org.apache.http.message.BasicNameValuePair; +import com.github.dfqin.grantor.PermissionListener; +import com.github.dfqin.grantor.PermissionsUtil; import com.google.gson.Gson; +import android.Manifest; import android.app.ActivityManager; import android.app.AlertDialog; import android.app.Dialog; @@ -18,6 +21,8 @@ import android.os.Environment; import android.os.Handler; import android.os.Message; import android.provider.Settings; + +import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; import android.text.TextUtils; import android.view.LayoutInflater; @@ -234,9 +239,138 @@ public class SettingVersionActivity extends BaseActivity implements // "application/vnd.android.package-archive"); // startActivity(i); // } else { - if (Build.VERSION.SDK_INT>26){ - boolean b = getPackageManager().canRequestPackageInstalls(); - if (b){ + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(SettingVersionActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + // 下载 + if (Build.VERSION.SDK_INT>26){ + boolean b = getPackageManager().canRequestPackageInstalls(); + if (b){ + if (intent == null) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } + }else { + //请求安装未知应用来源的权限   +// + Uri packageURI = Uri.parse("package:" + getPackageName()); + Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); + startActivityForResult(intent, 10086); + } + }else { + if (intent == null) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } + } + + } else { + PermissionsUtil.requestPermission(SettingVersionActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + if (Build.VERSION.SDK_INT>26){ + boolean b = getPackageManager().canRequestPackageInstalls(); + if (b){ + if (intent == null) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } + }else { + //请求安装未知应用来源的权限   +// + Uri packageURI = Uri.parse("package:" + getPackageName()); + Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); + startActivityForResult(intent, 10086); + } + }else { + if (intent == null) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } + } + + } + + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } else + { + if (Build.VERSION.SDK_INT>26){ + boolean b = getPackageManager().canRequestPackageInstalls(); + if (b){ + if (intent == null) { + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } + }else { + //请求安装未知应用来源的权限   +// + Uri packageURI = Uri.parse("package:" + getPackageName()); + Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); + startActivityForResult(intent, 10086); + } + }else { if (intent == null) { deleteDirWihtFile(new File(Environment .getExternalStorageDirectory(), "app/download/")); @@ -252,29 +386,8 @@ public class SettingVersionActivity extends BaseActivity implements } else { ToastUtil.showMessage("正在下載中"); } - }else { - //请求安装未知应用来源的权限   -// - Uri packageURI = Uri.parse("package:" + getPackageName()); - Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); - startActivityForResult(intent, 10086); } - }else { - if (intent == null) { - deleteDirWihtFile(new File(Environment - .getExternalStorageDirectory(), "app/download/")); - intent = new Intent(SettingVersionActivity.this, - UpdateService.class); - // intent.putExtra("appVersion", newVewsion); - intent.putExtra("titleId", R.string.app_name); - intent.putExtra("url", dowmLoadPath); - - ToastUtil.showMessage("开始后台下载"); - startService(intent); - } else { - ToastUtil.showMessage("正在下載中"); - } } @@ -295,21 +408,76 @@ public class SettingVersionActivity extends BaseActivity implements super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK && requestCode == 10086) { - if (intent == null) { - deleteDirWihtFile(new File(Environment - .getExternalStorageDirectory(), "app/download/")); - intent = new Intent(SettingVersionActivity.this, - UpdateService.class); - // intent.putExtra("appVersion", newVewsion); - intent.putExtra("titleId", R.string.app_name); - - intent.putExtra("url", dowmLoadPath); - - ToastUtil.showMessage("开始后台下载"); - startService(intent); - } else { - ToastUtil.showMessage("正在下載中"); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(SettingVersionActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + // 下载 + if (intent == null) { + + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } + } else { + PermissionsUtil.requestPermission(SettingVersionActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + if (intent == null) { + + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } + } + + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } else + { + if (intent == null) { + + deleteDirWihtFile(new File(Environment + .getExternalStorageDirectory(), "app/download/")); + intent = new Intent(SettingVersionActivity.this, + UpdateService.class); + // intent.putExtra("appVersion", newVewsion); + intent.putExtra("titleId", R.string.app_name); + + intent.putExtra("url", dowmLoadPath); + + ToastUtil.showMessage("开始后台下载"); + startService(intent); + } else { + ToastUtil.showMessage("正在下載中"); + } } + }else { ToastUtil.showMessage("请允许来自此来源的应用安装"); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SinceHomeActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SinceHomeActivity.java index 2725ff1..3c4c84d 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SinceHomeActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SinceHomeActivity.java @@ -7,6 +7,9 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.RelativeLayout; import android.widget.TextView; + +import com.gyf.immersionbar.ImmersionBar; + import cn.shangyu.gdxzPatient.R; public class SinceHomeActivity extends Activity implements OnClickListener { @@ -19,6 +22,8 @@ public class SinceHomeActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_since_home); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); // 初始化控件 top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); rl_sience = (RelativeLayout) findViewById(R.id.rl_sience); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/StarDoctorActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/StarDoctorActivity.java index 5cc557a..9c718d0 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/StarDoctorActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/StarDoctorActivity.java @@ -9,6 +9,8 @@ import android.view.View.OnClickListener; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gyf.immersionbar.ImmersionBar; + public class StarDoctorActivity extends Activity implements OnClickListener { private RelativeLayout top_back_layout; private TextView top_title; @@ -17,6 +19,8 @@ public class StarDoctorActivity extends Activity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_star_doctor); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); top_title = (TextView) findViewById(R.id.top_title); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java index f878274..bab5597 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/StratConActivity.java @@ -17,6 +17,7 @@ import org.json.JSONObject; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; @@ -60,6 +61,7 @@ import android.widget.BaseAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.GridView; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.PopupWindow; @@ -82,6 +84,7 @@ import cn.shangyu.gdxzPatient.utils.ActivityCollector; import cn.shangyu.gdxzPatient.utils.Base64Util; import cn.shangyu.gdxzPatient.utils.CustomToast; import cn.shangyu.gdxzPatient.utils.HttpMD5SendInfoUtil; +import cn.shangyu.gdxzPatient.utils.KeDaXunFeiUtil; import cn.shangyu.gdxzPatient.utils.LogUtils; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; import cn.shangyu.gdxzPatient.utils.StringUtil; @@ -130,7 +133,8 @@ public class StratConActivity extends BaseActivity implements OnClickListener, private int poisition;// private GridView gv_add_case;// gridview - + private ImageButton ib_voice; + KeDaXunFeiUtil VoiceUtil; // SDSD private ArrayList mBitmaps; /** @@ -325,6 +329,9 @@ public class StratConActivity extends BaseActivity implements OnClickListener, tv_sug.setVisibility(View.VISIBLE); tv_casename = (TextView) mView.findViewById(R.id.tv_casename); gv_add_case = (GridView) mView.findViewById(R.id.gv_add_case);// gridView + ib_voice = (ImageButton) mView.findViewById(R.id.ib_voice); + ib_voice.setVisibility(View.VISIBLE); + ib_voice.setOnClickListener(this); // 获取资源图片加号 bmp = BitmapFactory.decodeResource(getResources(), R.drawable.new_selected); @@ -556,8 +563,39 @@ public class StratConActivity extends BaseActivity implements OnClickListener, @Override public void onClick(View v) { switch (v.getId()) { - case R.id.top_back_layout:// 返回 + case R.id.ib_voice:// 语音识别 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + + if (PermissionsUtil.hasPermission(this, Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS + //有访问录音 + VoiceUtil= new KeDaXunFeiUtil(StratConActivity.this, mDescQuest); + } else { + PermissionsUtil.requestPermission(this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + //用户授予了访问录音的权限 + VoiceUtil=new KeDaXunFeiUtil(StratConActivity.this, mDescQuest); + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问录音的申请 +// finish(); + } + + }, new String[]{Manifest.permission.RECORD_AUDIO});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS + } + + }else { + VoiceUtil=new KeDaXunFeiUtil(StratConActivity.this, mDescQuest); + } + break; + case R.id.top_back_layout:// 返回 + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if (StringUtil.isEmpty(mDescQuest.getText().toString().trim())){ finish(); }else { @@ -642,6 +680,11 @@ public class StratConActivity extends BaseActivity implements OnClickListener, break; case R.id.btn_submit: // 提交 + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } submitQuestion(); break; @@ -736,11 +779,11 @@ public class StratConActivity extends BaseActivity implements OnClickListener, getResources(), (Bitmap) null)); // 触摸popupwindow外部,popupwindow消失。 mPopupWindowDialog.setOutsideTouchable(true); - + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { // 设置弹出位置 mPopupWindowDialog.showAtLocation(mView, Gravity.BOTTOM - | Gravity.CENTER_HORIZONTAL, 0, 0); + | Gravity.CENTER_HORIZONTAL, 0, ImmersionBar.getNavigationBarHeight(this)); } } @@ -757,7 +800,7 @@ public class StratConActivity extends BaseActivity implements OnClickListener, // 拍照获取照片 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(StratConActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(StratConActivity.this,Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA)) { //有访问摄像头的权限 takePhoto(); } else { @@ -773,7 +816,7 @@ public class StratConActivity extends BaseActivity implements OnClickListener, } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -787,9 +830,48 @@ public class StratConActivity extends BaseActivity implements OnClickListener, @Override public void onClick(View v) { - // 从相册获取 - pickPhoto(); - mPopupWindowDialog.dismiss(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(StratConActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } else { + PermissionsUtil.requestPermission(StratConActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + // 从相册获取 + pickPhoto(); + mPopupWindowDialog.dismiss(); + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { @@ -831,6 +913,14 @@ public class StratConActivity extends BaseActivity implements OnClickListener, // AlbumPhotoActivity.mSelectedImg.clear(); // } + @Override + protected void onDestroy() { + super.onDestroy(); + if (VoiceUtil != null) { + VoiceUtil.dissDialog(); + } + } + /** * 拍照获取图片 */ diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/TopicAcitivty.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/TopicAcitivty.java index 00946c6..231017b 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/TopicAcitivty.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/TopicAcitivty.java @@ -6,6 +6,7 @@ import java.util.List; import org.apache.http.message.BasicNameValuePair; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.ILoadingLayout; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; @@ -49,6 +50,8 @@ public class TopicAcitivty extends Activity { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.activity_topic); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); lv_visit = (PullToRefreshListView) findViewById(R.id.lv_item_case); top_title = (TextView) findViewById(R.id.top_title); top_back = (ImageView) findViewById(R.id.top_back); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VerificationActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VerificationActivity.java index 74cde52..0dbff55 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VerificationActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VerificationActivity.java @@ -4,6 +4,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.text.InputFilter; @@ -11,6 +12,7 @@ import android.text.Spanned; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import cn.shangyu.gdxzPatient.IEditTextChangeListener; import cn.shangyu.gdxzPatient.R; @@ -134,9 +136,19 @@ public class VerificationActivity extends BaseActivity implements // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.btn_ver_next:// 點擊下一步 + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } // goAddBank(); checkWords();// 檢查姓名跟身份证号时候符合规范 break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoDetialActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoDetialActivity.java index 30c85cf..d3f67ba 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoDetialActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoDetialActivity.java @@ -4,8 +4,11 @@ import java.util.ArrayList; import java.util.List; import org.apache.http.message.BasicNameValuePair; + +import android.content.Context; import android.view.View.OnTouchListener; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; @@ -21,7 +24,6 @@ import com.umeng.socialize.media.UMMin; import com.umeng.socialize.media.UMWeb; //import com.umeng.socialize.sso.SinaSsoHandler; //import com.umeng.socialize.sso.UMSsoHandler; -import com.umeng.socialize.utils.Log; //import com.umeng.socialize.weixin.controller.UMWXHandler; //import com.umeng.socialize.weixin.media.CircleShareContent; //import com.umeng.socialize.weixin.media.WeiXinShareContent; @@ -66,6 +68,7 @@ import android.view.ViewGroup; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; import android.webkit.WebChromeClient; import android.webkit.WebSettings; import android.webkit.WebView; @@ -305,7 +308,8 @@ public class VideoDetialActivity extends Activity implements OnClickListener { super.onCreate(savedInstanceState); mActivity = this; setContentView(R.layout.activity_video_detial); - + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); init(); collect.setOnClickListener(new OnClickListener() { @@ -450,7 +454,6 @@ public class VideoDetialActivity extends Activity implements OnClickListener { parameters);// 请求网络 String result = httpResult.getString();// str为服务器返回的json串 if (result!=null) { - Log.e("TAG", "videoRead:" + result); if (!TextUtils.isEmpty(result)) { Gson gson = new Gson(); videoReadBean = gson.fromJson(result, @@ -809,9 +812,19 @@ public class VideoDetialActivity extends Activity implements OnClickListener { // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.bt_add_pinglun: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } String comment = mEt_add.getText().toString(); if (TextUtils.isEmpty(comment)) { ToastUtil.showMessage("请输入回复内容"); @@ -1086,7 +1099,13 @@ public class VideoDetialActivity extends Activity implements OnClickListener { mTV_Cancel.setOnClickListener(new OnClickListener() { @Override - public void onClick(View v) { + public void onClick(View v) + { + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } popupWindow.dismiss(); } }); @@ -1094,6 +1113,11 @@ public class VideoDetialActivity extends Activity implements OnClickListener { @Override public void onClick(View v) { + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } // TODO Auto-generated method stub if (mEt_add != null) { mEt_add.setText(mEt_adds.getText().toString()); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java index 8423957..3a948d9 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VideoSearch1Activity.java @@ -397,6 +397,7 @@ public class VideoSearch1Activity extends BaseActivity implements OnClickListene // TODO Auto-generated method stub switch (arg0.getId()) { case R.id.top_back_layout: + hideInput(VideoSearch1Activity.this); finish(); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VisitInfoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VisitInfoActivity.java index fb0bc39..8ef39b4 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/VisitInfoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/VisitInfoActivity.java @@ -7,6 +7,9 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; + +import com.gyf.immersionbar.ImmersionBar; + import cn.shangyu.gdxzPatient.R; /** @@ -29,6 +32,8 @@ public class VisitInfoActivity extends Activity implements OnClickListener { super.onCreate(savedInstanceState); setContentView(R.layout.visit_info_activity); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); initView(); setListener(); initData(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java index 2da9106..b252e59 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WithDrawalsActivity.java @@ -20,6 +20,7 @@ import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import android.Manifest; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; @@ -454,6 +455,11 @@ public class WithDrawalsActivity extends BaseActivity implements // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_back_layout: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } finish(); break; case R.id.rl_select_bank: @@ -462,6 +468,11 @@ public class WithDrawalsActivity extends BaseActivity implements startActivityForResult(intent, 1); break; case R.id.btn_with_draw: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } checkWords(); // showVerDialog(); break; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java index c3efaeb..e253c16 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/WriteTopicActivity.java @@ -16,6 +16,7 @@ import org.json.JSONObject; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; @@ -42,6 +43,7 @@ import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState; import android.Manifest; import android.app.Activity; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; @@ -62,6 +64,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; +import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.CheckBox; @@ -566,7 +569,11 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener // TODO Auto-generated method stub switch (v.getId()) { case R.id.top_right_text: - + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } if (TextUtils.isEmpty(et_house_topic.getText().toString())) { ToastUtil.showMessage("话题内容不能为空!"); return; @@ -581,6 +588,11 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener break; case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } if (TextUtils.isEmpty(et_house_topic.getText().toString())) { finish(); }else { @@ -768,10 +780,10 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener getResources(), (Bitmap) null)); // 触摸popupwindow外部,popupwindow消失。 mPopupWindowDialog.setOutsideTouchable(true); - + mPopupWindowDialog.setClippingEnabled(false); if (mPopupWindowDialog != null) { // 设置弹出位置 - mPopupWindowDialog.showAtLocation(btn_pop, Gravity.BOTTOM, 0, 0); + mPopupWindowDialog.showAtLocation(btn_pop, Gravity.BOTTOM, 0, ImmersionBar.getNavigationBarHeight(this)); } } @@ -821,7 +833,7 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener // 拍照获取照片 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限 takePhoto(); } else { @@ -837,7 +849,7 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { @@ -854,12 +866,51 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener @Override public void onClick(View v) { - // 从相册获取 - pickPhoto(); - if (mPopupWindowDialog != null - && mPopupWindowDialog.isShowing()) { - mPopupWindowDialog.dismiss();// 消失 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + //有读写内存 + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } else { + PermissionsUtil.requestPermission(WriteTopicActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + // + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + + //用户拒绝了访问读写的申请 + + +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + } + else + { + // 从相册获取 + pickPhoto(); + if (mPopupWindowDialog != null + && mPopupWindowDialog.isShowing()) { + mPopupWindowDialog.dismiss();// 消失 + } + } + } }); tv_cancel.setOnClickListener(new OnClickListener() { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java index a1fffd8..06d1289 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZhiBoActivity.java @@ -6,6 +6,7 @@ import cn.shangyu.gdxzPatient.utils.UIUtils; import cn.shangyu.gdxzPatient.utils.Url; import cn.shangyu.gdxzPatient.utils.X5WebView; +import com.gyf.immersionbar.ImmersionBar; import com.nostra13.universalimageloader.core.ImageLoader; import com.umeng.socialize.ShareAction; @@ -132,6 +133,7 @@ public class ZhiBoActivity extends Activity implements OnClickListener { webView = this.findViewById(R.id.aaaaaa); webView.setKeepScreenOn(true);//确保屏幕长亮 layout_top = this.findViewById(R.id.layout_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(layout_top).init(); loadingView = this.findViewById(R.id.loading_view); top_back = (ImageView) this.findViewById(R.id.top_back); mTitle = (TextView) this.findViewById(R.id.top_title); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/application/BaseApplication.java b/app/src/main/java/cn/shangyu/gdxzPatient/application/BaseApplication.java index 439963f..f0ff36a 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/application/BaseApplication.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/application/BaseApplication.java @@ -89,8 +89,7 @@ import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; import com.nostra13.universalimageloader.core.assist.QueueProcessingType; import com.nostra13.universalimageloader.utils.StorageUtils; -import com.umeng.message.IUmengRegisterCallback; -import com.umeng.message.PushAgent; +import com.umeng.commonsdk.UMConfigure; import com.umeng.socialize.PlatformConfig; import com.umeng.socialize.UMShareAPI; import com.xiaomi.mipush.sdk.MiPushClient; @@ -239,15 +238,21 @@ public class BaseApplication extends Application { /** * 小米推送 * */ - if (shouldInit()) { - MiPushClient.registerPush(this, APP_ID, APP_KEY); - } +// if (shouldInit()) { +// MiPushClient.registerPush(this, APP_ID, APP_KEY); +// } // 友盟6.4.5分享初始化sdk // Config.DEBUG = true; - UMShareAPI.get(this); + UMConfigure.preInit(this, "566fb983e0f55a12cd001b84","umeng"); + boolean isFirstRun=this.getSharedPreferences("share",MODE_PRIVATE).getBoolean("isFirstRun", true); + if(!isFirstRun)//隐私权限 + { + initYinsi(); + } +// UMShareAPI.get(this); // 科大讯飞初始化 - SpeechUtility.createUtility(this, SpeechConstant.APPID + "=5975b0e3"); +// SpeechUtility.createUtility(this, SpeechConstant.APPID + "=5975b0e3"); // try { // //以下都不是必须的,根据需要自行选择,一般来说只需要 debug,缓存相关,cookie相关的 就可以了 @@ -311,12 +316,7 @@ public class BaseApplication extends Application { * 初始化图片选择器 */ // Fresco.initialize(getApplicationContext()); - /** - * 初始化地图 - */ - mLocationClient = new LocationClient(getApplicationContext()); - mLocationClient.registerLocationListener(mMyLocationListener); - InitLocation(); + /** * 初始化imageloader(图片处理的类) @@ -327,29 +327,33 @@ public class BaseApplication extends Application { */ CrashHandler crashHandler = CrashHandler.getInstance(); crashHandler.init(getApplicationContext()); + + /** * */ // 友盟推送v3.1.1a +// +// PushAgent mPushAgent = PushAgent.getInstance(this); +// // 注册推送服务,每次调用register方法都会回调该接口 +// mPushAgent.register(new IUmengRegisterCallback() { +// +// @Override +// public void onSuccess(String deviceToken) { +// +// // 注册成功会返回device token +// // LogUtils.e("onSuccess>>>token>>>>>>>>>>>>>>" + deviceToken); +// } +// +// @Override +// public void onFailure(String s, String s1) { +// // LogUtils.e("onFailure>>>msg>>>>>>>>>>>>>>" + s+s1); +// } +// }); +// +// mPushAgent.setDebugMode(false); - PushAgent mPushAgent = PushAgent.getInstance(this); - // 注册推送服务,每次调用register方法都会回调该接口 - mPushAgent.register(new IUmengRegisterCallback() { - - @Override - public void onSuccess(String deviceToken) { - - // 注册成功会返回device token - // LogUtils.e("onSuccess>>>token>>>>>>>>>>>>>>" + deviceToken); - } - - @Override - public void onFailure(String s, String s1) { - // LogUtils.e("onFailure>>>msg>>>>>>>>>>>>>>" + s+s1); - } - }); - mPushAgent.setDebugMode(false); // UmengMessageHandler messageHandler = new UmengMessageHandler(){ // /** @@ -436,8 +440,8 @@ public class BaseApplication extends Application { // }; // mPushAgent.setNotificationClickHandler(notificationClickHandler); //保利威视频初始化 - initPolyvCilent(); - initScreencast(); +// initPolyvCilent(); +// initScreencast(); StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder(); StrictMode.setVmPolicy(builder.build()); @@ -850,6 +854,21 @@ public class BaseApplication extends Application { NimUIKit.setOnlineStateContentProvider(new DemoOnlineStateContentProvider()); } + public void initYinsi() + { + initPolyvCilent(); + //初始化组件化基础库, 统计SDK/推送SDK/分享SDK都必须调用此初始化接口 + UMConfigure.init(context, "566fb983e0f55a12cd001b84", "Umeng", UMConfigure.DEVICE_TYPE_PHONE, + "eaeaa9e296ee10cebee1552ba830a3fe"); + SpeechUtility.createUtility(this, SpeechConstant.APPID + "=5975b0e3"); + initScreencast(); + /** + * 初始化地图 + */ + mLocationClient = new LocationClient(getApplicationContext()); + mLocationClient.registerLocationListener(mMyLocationListener); + InitLocation(); + } /** * 用户状态变化 */ diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java index 498db18..3bacf19 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ChattingFragment.java @@ -1786,7 +1786,7 @@ public class ChattingFragment extends CCPFragment implements if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限 showTakeStyle(getActivity()); } else { @@ -1802,7 +1802,7 @@ public class ChattingFragment extends CCPFragment implements } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGalleryFragment.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGalleryFragment.java index 0777dc3..27af575 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGalleryFragment.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGalleryFragment.java @@ -2,10 +2,12 @@ package cn.shangyu.gdxzPatient.ecdemo.ui.chatting; import java.io.File; +import android.Manifest; import android.app.Dialog; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; +import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.View; @@ -14,6 +16,8 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; + +import androidx.annotation.NonNull; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.ecdemo.common.CCPAppManager; import cn.shangyu.gdxzPatient.ecdemo.common.dialog.ECListDialog; @@ -30,6 +34,8 @@ import cn.shangyu.gdxzPatient.ecdemo.ui.SDKCoreHelper; import cn.shangyu.gdxzPatient.ecdemo.ui.chatting.model.ImgInfo; import cn.shangyu.gdxzPatient.utils.X5WebView; +import com.github.dfqin.grantor.PermissionListener; +import com.github.dfqin.grantor.PermissionsUtil; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; @@ -114,7 +120,30 @@ public class ImageGalleryFragment extends CCPFragment { dialog.setOnDialogItemClickListener(new ECListDialog.OnDialogItemClickListener() { @Override public void onDialogItemClick(Dialog d, int position) { - handleDialogItemClick(position); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + handleDialogItemClick(position); + } else { + PermissionsUtil.requestPermission(getActivity(), new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + handleDialogItemClick(position); + + } + + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } else { + handleDialogItemClick(position); + } + } }); dialog.show(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGralleryPagerActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGralleryPagerActivity.java index 5486d4b..bb0501a 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGralleryPagerActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImageGralleryPagerActivity.java @@ -3,9 +3,13 @@ package cn.shangyu.gdxzPatient.ecdemo.ui.chatting; import java.io.File; import java.util.List; +import android.Manifest; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; + +import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; @@ -24,6 +28,8 @@ import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; import cn.shangyu.gdxzPatient.ecdemo.ui.ECSuperActivity; import cn.shangyu.gdxzPatient.utils.Url; +import com.github.dfqin.grantor.PermissionListener; +import com.github.dfqin.grantor.PermissionsUtil; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.utils.DiskCacheUtils; @@ -100,30 +106,97 @@ public class ImageGralleryPagerActivity extends ECSuperActivity implements .showMessage(R.string.save_img_waite_download); return; } - try { - File file = null; - // 由于不是聊天的图片查看无法下载保存 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(ImageGralleryPagerActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + try { + File file = null; + // 由于不是聊天的图片查看无法下载保存 // if (viewImageInfo.getPicurl().contains(Url.imgUrl)) { - if (viewImageInfo.getPicurl().contains("http")||viewImageInfo.getPicurl().contains(Url.imgUrl)||viewImageInfo.getPicurl().contains(".jpg")||viewImageInfo.getPicurl().contains(".png")||viewImageInfo.getPicurl().contains(".gif")||viewImageInfo.getPicurl().contains(".jpeg")||viewImageInfo.getPicurl().contains(".tga")) { - file = DiskCacheUtils.findInCache(viewImageInfo.getPicurl(),ImageLoader.getInstance().getDiskCache()); - } else { - file = new File(FileAccessor.getImagePathName(), viewImageInfo.getPicurl()); + if (viewImageInfo.getPicurl().contains("http")||viewImageInfo.getPicurl().contains(Url.imgUrl)||viewImageInfo.getPicurl().contains(".jpg")||viewImageInfo.getPicurl().contains(".png")||viewImageInfo.getPicurl().contains(".gif")||viewImageInfo.getPicurl().contains(".jpeg")||viewImageInfo.getPicurl().contains(".tga")) { + file = DiskCacheUtils.findInCache(viewImageInfo.getPicurl(),ImageLoader.getInstance().getDiskCache()); + } else { + file = new File(FileAccessor.getImagePathName(), viewImageInfo.getPicurl()); + } + + // File file = new + // File(FileAccessor.getImagePathName() + // ,viewImageInfo.getPicurl()); + if (viewImageInfo != null + && viewImageInfo.isGif()) { + DemoUtils.saveImage(file.getAbsolutePath(), + ".gif"); + return; + } + DemoUtils.saveImage(file.getAbsolutePath()); + } catch (Exception e) { + LogUtil.e(TAG, "onContextItemSelected error "); + } } - - // File file = new - // File(FileAccessor.getImagePathName() - // ,viewImageInfo.getPicurl()); - if (viewImageInfo != null - && viewImageInfo.isGif()) { - DemoUtils.saveImage(file.getAbsolutePath(), - ".gif"); - return; + else + { + PermissionsUtil.requestPermission(ImageGralleryPagerActivity.this, new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + try { + File file = null; + // 由于不是聊天的图片查看无法下载保存 +// if (viewImageInfo.getPicurl().contains(Url.imgUrl)) { + if (viewImageInfo.getPicurl().contains("http")||viewImageInfo.getPicurl().contains(Url.imgUrl)||viewImageInfo.getPicurl().contains(".jpg")||viewImageInfo.getPicurl().contains(".png")||viewImageInfo.getPicurl().contains(".gif")||viewImageInfo.getPicurl().contains(".jpeg")||viewImageInfo.getPicurl().contains(".tga")) { + file = DiskCacheUtils.findInCache(viewImageInfo.getPicurl(),ImageLoader.getInstance().getDiskCache()); + } else { + file = new File(FileAccessor.getImagePathName(), viewImageInfo.getPicurl()); + } + + // File file = new + // File(FileAccessor.getImagePathName() + // ,viewImageInfo.getPicurl()); + if (viewImageInfo != null + && viewImageInfo.isGif()) { + DemoUtils.saveImage(file.getAbsolutePath(), + ".gif"); + return; + } + DemoUtils.saveImage(file.getAbsolutePath()); + } catch (Exception e) { + LogUtil.e(TAG, "onContextItemSelected error "); + } + } + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + }else + { + try { + File file = null; + // 由于不是聊天的图片查看无法下载保存 +// if (viewImageInfo.getPicurl().contains(Url.imgUrl)) { + if (viewImageInfo.getPicurl().contains("http")||viewImageInfo.getPicurl().contains(Url.imgUrl)||viewImageInfo.getPicurl().contains(".jpg")||viewImageInfo.getPicurl().contains(".png")||viewImageInfo.getPicurl().contains(".gif")||viewImageInfo.getPicurl().contains(".jpeg")||viewImageInfo.getPicurl().contains(".tga")) { + file = DiskCacheUtils.findInCache(viewImageInfo.getPicurl(),ImageLoader.getInstance().getDiskCache()); + } else { + file = new File(FileAccessor.getImagePathName(), viewImageInfo.getPicurl()); + } + + // File file = new + // File(FileAccessor.getImagePathName() + // ,viewImageInfo.getPicurl()); + if (viewImageInfo != null + && viewImageInfo.isGif()) { + DemoUtils.saveImage(file.getAbsolutePath(), + ".gif"); + return; + } + DemoUtils.saveImage(file.getAbsolutePath()); + } catch (Exception e) { + LogUtil.e(TAG, "onContextItemSelected error "); } - DemoUtils.saveImage(file.getAbsolutePath()); - } catch (Exception e) { - LogUtil.e(TAG, "onContextItemSelected error "); } + } } }); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImagePreviewActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImagePreviewActivity.java index c95e091..a1aaff7 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImagePreviewActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/ecdemo/ui/chatting/ImagePreviewActivity.java @@ -19,6 +19,9 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.text.TextUtils; import android.view.View; + +import com.gyf.immersionbar.ImmersionBar; + import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.ecdemo.common.utils.CoreHandler; import cn.shangyu.gdxzPatient.ecdemo.common.utils.DemoUtils; @@ -69,6 +72,7 @@ public class ImagePreviewActivity extends ECSuperActivity implements View.OnClic getString(R.string.app_title_image_preview), null, this); mTopBarView.setRightBtnEnable(false); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(mTopBarView).init(); initViewUI(); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/fragment/HomeFragment.java b/app/src/main/java/cn/shangyu/gdxzPatient/fragment/HomeFragment.java index a861b9a..caa6c13 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/fragment/HomeFragment.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/fragment/HomeFragment.java @@ -1,6 +1,10 @@ package cn.shangyu.gdxzPatient.fragment; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Field; +import java.net.HttpURLConnection; +import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -25,6 +29,7 @@ import android.app.Activity; import android.content.Intent; import android.graphics.Bitmap; +import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -39,6 +44,7 @@ import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import androidx.core.widget.EdgeEffectCompat; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; @@ -47,7 +53,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import android.widget.Toast; +import cn.bertsir.zbar.Qr.ScanResult; +import cn.bertsir.zbar.QrConfig; +import cn.bertsir.zbar.QrManager; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.activity.AdvertActivity; @@ -88,6 +98,7 @@ import cn.shangyu.gdxzPatient.utils.EvenBusEvent; import cn.shangyu.gdxzPatient.utils.GsonTools; import cn.shangyu.gdxzPatient.utils.LogUtils; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; +import cn.shangyu.gdxzPatient.utils.StreamTool; import cn.shangyu.gdxzPatient.utils.StringUtil; import cn.shangyu.gdxzPatient.utils.UIUtils; import cn.shangyu.gdxzPatient.utils.Url; @@ -117,6 +128,11 @@ import com.nostra13.universalimageloader.core.assist.ImageScaleType; import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import com.zbar.lib.CaptureActivity; + +import static cn.bertsir.zbar.QrConfig.SCANVIEW_TYPE_QRCODE; +import static cn.bertsir.zbar.QrConfig.SCREEN_PORTRAIT; +import static cn.bertsir.zbar.QrConfig.TYPE_QRCODE; +import static cn.bertsir.zbar.view.ScanLineView.style_line; import static cn.shangyu.gdxzPatient.ecdemo.storage.ConversationSqlManager.isExpert; import static cn.shangyu.gdxzPatient.ecdemo.storage.ConversationSqlManager.isExpert1; import static cn.shangyu.gdxzPatient.utils.Constant.EXPERT_APPID; @@ -1147,17 +1163,19 @@ public class HomeFragment extends BaseFragment implements OnClickListener, case R.id.ll_scan:// 掃一掃 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 - Intent scan = new Intent(getActivity(), CaptureActivity.class); - startActivity(scan); +// Intent scan = new Intent(getActivity(), CaptureActivity.class); +// startActivity(scan); + start(); } else { PermissionsUtil.requestPermission(getActivity(), new PermissionListener() { @Override public void permissionGranted(@NonNull String[] permissions) { + start(); //用户授予了访问读取短信的权限 - Intent scan = new Intent(getActivity(), CaptureActivity.class); - startActivity(scan); +// Intent scan = new Intent(getActivity(), CaptureActivity.class); +// startActivity(scan); } @Override public void permissionDenied(@NonNull String[] permissions) { @@ -1165,12 +1183,13 @@ public class HomeFragment extends BaseFragment implements OnClickListener, } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } }else { - Intent scan = new Intent(getActivity(), CaptureActivity.class); - startActivity(scan); + start(); +// Intent scan = new Intent(getActivity(), CaptureActivity.class); +// startActivity(scan); } break; @@ -2042,5 +2061,140 @@ public class HomeFragment extends BaseFragment implements OnClickListener, } } + private String expertUuid; + private void start() { + + QrConfig qrConfig = new QrConfig.Builder() + .setDesText("请将医生二维码放入框内")//扫描框下文字 + .setShowDes(true)//是否显示扫描框下面文字 + .setShowLight(false)//显示手电筒按钮 + .setShowTitle(true)//显示Title + .setShowAlbum(false)//显示从相册选择按钮 + .setNeedCrop(false)//是否从相册选择后裁剪图片 +// .setCornerColor(Color.parseColor("#E42E30"))//设置扫描框颜色 + .setLineColor(Color.parseColor("#08C8FF"))//设置扫描线颜色 + .setLineSpeed(QrConfig.LINE_MEDIUM)//设置扫描线速度 + .setScanType(TYPE_QRCODE)//设置扫码类型(二维码,条形码,全部,自定义,默认为二维码) + .setScanViewType(SCANVIEW_TYPE_QRCODE)//设置扫描框类型(二维码还是条形码,默认为二维码) + .setCustombarcodeformat(QrConfig.BARCODE_PDF417)//此项只有在扫码类型为TYPE_CUSTOM时才有效 + .setPlaySound(true)//是否扫描成功后bi~的声音 +// .setDingPath(cb_show_custom_ding.isChecked() ? R.raw.test : R.raw.qrcode)//设置提示音(不设置为默认的Ding~) + .setIsOnlyCenter(false)//是否只识别框中内容(默认为全屏识别) +// .setTitleText(et_qr_title.getText().toString())//设置Tilte文字 + .setTitleBackgroudColor(Color.parseColor("#3cc9c0"))//设置状态栏颜色 + .setTitleTextColor(Color.WHITE)//设置Title文字颜色 +// .setShowZoom(cb_show_zoom.isChecked())//是否开始滑块的缩放 +// .setAutoZoom(cb_auto_zoom.isChecked())//是否开启自动缩放(实验性功能,不建议使用) +// .setFingerZoom(cb_finger_zoom.isChecked())//是否开始双指缩放 +// .setDoubleEngine(cb_double_engine.isChecked())//是否开启双引擎识别(仅对识别二维码有效,并且开启后只识别框内功能将失效) + .setScreenOrientation(SCREEN_PORTRAIT)//设置屏幕方式 + .setOpenAlbumText("选择要识别的图片")//打开相册的文字 + .setLooperScan(false)//是否连续扫描二维码 +// .setLooperWaitTime(Integer.parseInt(et_loop_scan_time.getText().toString()) * 1000)//连续扫描间隔时间 + .setScanLineStyle(style_line)//扫描线样式 +// .setAutoLight(cb_auto_light.isChecked())//自动灯光 + .setShowVibrator(true)//是否震动提醒 + .create(); + QrManager.getInstance().init(qrConfig).startScan(getActivity(), new QrManager.OnScanResultCallback() { + @Override + public void onScanSuccess(ScanResult result) { +// Log.e(TAG, "onScanSuccess: " + result); + expertUuid=result.getContent(); + new Thread(networkTask2).start(); +// Toast.makeText(getActivity(), "内容:" + result.getContent() +// + " 类型:" + result.getType(), Toast.LENGTH_SHORT).show(); + } + }); + } + Runnable networkTask2 = new Runnable() { + + + @Override + public void run() { + // TODO + String url = null; + url = Url.isExpert + "?expertUuid=" + expertUuid; + getTooken1(url); + + } + + private void getTooken1(String urlStringUtil) { + // TODO Auto-generated method stub + LogUtil.i("urlStringUtil = " + urlStringUtil); + try { + URL url = new URL(urlStringUtil); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + conn.setDoOutput(true); + conn.setConnectTimeout(5 * 1000); + OutputStream outStream = conn.getOutputStream(); + outStream.flush(); + outStream.close(); + if (conn.getResponseCode() == 200) { + InputStream inStream = conn.getInputStream(); + String result = new String( + StreamTool.readInputStream(inStream), "UTF-8"); + Message message = new Message(); + message.what = 102; + message.obj = new String(result); + handler1.sendMessage(message); + } else { + Message message = new Message(); + message.what = 105; + handler1.sendMessage(message); + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + ToastUtil.showMessage("请求失败,请稍后重试"); + } + + } + }; + public Handler handler1 = new Handler() { + @Override + public void handleMessage(Message msg) { + // TODO Auto-generated method stub + switch (msg.what) { + case 102: + + try { + String str = (String) msg.obj; + LogUtils.d("onSuccess resultJson = " + str); + JSONObject objs = new JSONObject(str); + String retcode = objs.getString("code"); + String expertuuid = objs.getString("expertUuid"); + String message = objs.getString("message"); + if (retcode.equals(String.valueOf(1))) { + String isExpert = objs.getString("data"); + if ("1".equals(isExpert)) { + Intent intent = new Intent( + getActivity(), + ExpertDetailActivity.class); + + intent.putExtra("uuid", expertuuid); + startActivity(intent); + + } else { + ToastUtil.showMessage( + "您扫描的二维码不是有效的肝胆相照专家二维码。", 1); + + } + } else { + ToastUtil.showMessage(message); + } + } catch (JSONException e) { + e.printStackTrace(); + // ToastUtil.showMessage("服务器异常!"); + ToastUtil.showMessage("您扫描的二维码不是有效的肝胆相照专家二维码。", 1); + } + break; + + + } + + } + + }; } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/netease/NimSDKOptionConfig.java b/app/src/main/java/cn/shangyu/gdxzPatient/netease/NimSDKOptionConfig.java index 6216566..71d2436 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/netease/NimSDKOptionConfig.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/netease/NimSDKOptionConfig.java @@ -2,6 +2,7 @@ package cn.shangyu.gdxzPatient.netease; import android.content.Context; import android.graphics.Color; +import android.media.RingtoneManager; import android.os.Environment; import android.text.TextUtils; @@ -11,6 +12,7 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderThumbBase; import com.netease.nimlib.sdk.NosTokenSceneConfig; import com.netease.nimlib.sdk.NotificationFoldStyle; import com.netease.nimlib.sdk.SDKOptions; +import com.netease.nimlib.sdk.ServerAddresses; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.mixpush.MixPushConfig; import com.netease.nimlib.sdk.msg.MessageNotifierCustomization; @@ -19,6 +21,7 @@ import com.netease.nimlib.sdk.msg.model.IMMessage; import java.io.IOException; import cn.shangyu.gdxzPatient.netease.config.preference.NimUserInfoProvider; +import cn.shangyu.gdxzPatient.netease.config.preference.UserPreferences; //import com.netease.nim.demo.config.preference.UserPreferences; //import com.netease.nim.demo.main.activity.WelcomeActivity; @@ -108,22 +111,22 @@ public class NimSDKOptionConfig { } private static void configServerAddress(final SDKOptions options, Context context) { -// ServerAddresses serverConfig = DemoPrivatizationConfig.getServerAddresses(context); -// if (serverConfig != null) { -// options.serverConfig = serverConfig; -// } -// String appKey = DemoPrivatizationConfig.getAppKey(context); -// if (!TextUtils.isEmpty(appKey)) { -// options.appKey = appKey; -// } + ServerAddresses serverConfig = DemoPrivatizationConfig.getServerAddresses(context); + if (serverConfig != null) { + options.serverConfig = serverConfig; + } + String appKey = DemoPrivatizationConfig.getAppKey(context); + if (!TextUtils.isEmpty(appKey)) { + options.appKey = appKey; + } } private static void initStatusBarNotificationConfig(SDKOptions options) { // load 应用的状态栏配置 StatusBarNotificationConfig config = loadStatusBarNotificationConfig(); // load 用户的 StatusBarNotificationConfig 设置项 -// StatusBarNotificationConfig userConfig = UserPreferences.getStatusConfig(); - StatusBarNotificationConfig userConfig =null; + StatusBarNotificationConfig userConfig = UserPreferences.getStatusConfig(); +// StatusBarNotificationConfig userConfig =null; if (userConfig == null) { userConfig = config; } else { @@ -136,7 +139,7 @@ public class NimSDKOptionConfig { userConfig.notificationColor = config.notificationColor; } // 持久化生效 -// UserPreferences.setStatusConfig(userConfig); + UserPreferences.setStatusConfig(userConfig); // SDK statusBarNotificationConfig 生效 options.statusBarNotificationConfig = userConfig; } @@ -149,7 +152,9 @@ public class NimSDKOptionConfig { // config.notificationSmallIconId = R.drawable.ic_stat_notify_msg; // config.notificationColor = DemoCache.getContext().getResources().getColor(R.color.color_blue_3a9efb); // 通知铃声的uri字符串 - config.notificationSound = "android.resource://com.netease.nim.demo/raw/msg"; +// config.notificationSound = "android.resource://com.netease.nim.demo/raw/msg"; + config.notificationSound= String.valueOf(RingtoneManager.getActualDefaultRingtoneUri(DemoCache.getContext(), RingtoneManager.TYPE_NOTIFICATION)); + config.ring=true; config.notificationFolded = true; // config.notificationFolded = false; config.notificationFoldStyle = NotificationFoldStyle.ALL; diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/netease/config/LogoutHelper.java b/app/src/main/java/cn/shangyu/gdxzPatient/netease/config/LogoutHelper.java index 0e9d905..9ddec25 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/netease/config/LogoutHelper.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/netease/config/LogoutHelper.java @@ -18,12 +18,13 @@ import cn.shangyu.gdxzPatient.utils.UIUtils; public class LogoutHelper { public static void logout() { // 清理缓存&注销监听&清除状态 - NimUIKit.logout(); + NIMClient.getService(AuthService.class).logout(); DemoCache.clear(); + NimUIKit.logout(); SharePrefUtil.saveString(UIUtils.getContext(), Constant.yx_accid, ""); SharePrefUtil.saveString(UIUtils.getContext(), Constant.yx_token, ""); SharePrefUtil.clear(UIUtils.getContext(), "isLogin"); - NIMClient.getService(AuthService.class).logout(); + } } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/netease/ptop/P2PMessageActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/netease/ptop/P2PMessageActivity.java index 320d0c9..f15e622 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/netease/ptop/P2PMessageActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/netease/ptop/P2PMessageActivity.java @@ -9,6 +9,7 @@ import android.view.inputmethod.InputMethodManager; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.gyf.immersionbar.ImmersionBar; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.api.model.contact.ContactChangedObserver; import com.netease.nim.uikit.api.model.main.OnlineStateChangeObserver; @@ -88,6 +89,7 @@ public class P2PMessageActivity extends BaseMessageActivity implements View.OnCl displayOnlineState(); registerObservers(true); topBarView=findView(R.id.topbar); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(topBarView).init(); uuid=getIntent().getStringExtra("olduuid"); gdxz_sessionType=getIntent().getStringExtra(Extras.EXTRA_GDXZ_TYPE); if(!StringUtil.isEmpty(getIntent().getStringExtra("chat_state")) @@ -308,8 +310,8 @@ public class P2PMessageActivity extends BaseMessageActivity implements View.OnCl @Override protected void initToolBar() { - ToolBarOptions options = new NimToolBarOptions(); - setToolBar(R.id.toolbar, options); +// ToolBarOptions options = new NimToolBarOptions(); +// setToolBar(R.id.toolbar, options); } @Override diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/InputPanel.java b/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/InputPanel.java index 36d149d..aeb367d 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/InputPanel.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/InputPanel.java @@ -360,7 +360,7 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba } else if (v == switchToAudioButtonInInputBar) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(container.activity, Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS + if (PermissionsUtil.hasPermission(container.activity, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS //有访问录音 switchToAudioLayout(); } else { @@ -376,7 +376,7 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba } - }, new String[]{Manifest.permission.RECORD_AUDIO}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.RECORD_AUDIO}); } } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/ImageAction.java b/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/ImageAction.java index 4a334f2..5de3d35 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/ImageAction.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/ImageAction.java @@ -1,17 +1,22 @@ package cn.shangyu.gdxzPatient.netease.session.action; +import android.Manifest; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.os.Build; +import com.github.dfqin.grantor.PermissionListener; +import com.github.dfqin.grantor.PermissionsUtil; import com.netease.nim.uikit.business.session.actions.BaseAction; import java.io.File; import java.io.IOException; import java.util.List; +import androidx.annotation.NonNull; import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.activity.Album6Activity; import cn.shangyu.gdxzPatient.activity.AlbumActivity; @@ -36,9 +41,36 @@ public class ImageAction extends BaseAction { @Override public void onClick() { - Intent intent=new Intent(getActivity(), AlbumActivity.class); - intent.putExtra("photonum", "0"); - getActivity().startActivityForResult(intent, 0x4); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + Intent intent = new Intent(getActivity(), AlbumActivity.class); + intent.putExtra("photonum", "0"); + getActivity().startActivityForResult(intent, 0x4); + } else { + PermissionsUtil.requestPermission(getActivity(), new PermissionListener() { + @Override + public void permissionGranted(@NonNull String[] permissions) { + Intent intent = new Intent(getActivity(), AlbumActivity.class); + intent.putExtra("photonum", "0"); + getActivity().startActivityForResult(intent, 0x4); + } + + @Override + public void permissionDenied(@NonNull String[] permissions) { + //用户拒绝了访问读写的申请 +// + } + + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}); + } + + } + else + { + Intent intent=new Intent(getActivity(), AlbumActivity.class); + intent.putExtra("photonum", "0"); + getActivity().startActivityForResult(intent, 0x4); + } } /** * diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/VideoAction.java b/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/VideoAction.java index 0ae0aec..36e9bea 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/VideoAction.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/netease/session/action/VideoAction.java @@ -45,7 +45,7 @@ public class VideoAction extends BaseAction { public void onClick() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.CAMERA)) { + if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA)) { //有访问摄像头的权限 showDialog(); } else { @@ -61,7 +61,7 @@ public class VideoAction extends BaseAction { } - }, new String[]{Manifest.permission.CAMERA}); + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}); } } @@ -88,7 +88,7 @@ public class VideoAction extends BaseAction { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (PermissionsUtil.hasPermission(getActivity(), Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS + if (PermissionsUtil.hasPermission(getActivity(),Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO)) {//,Manifest.permission.READ_CONTACTS //有访问录音 handleVideoRecord(); } else { @@ -104,7 +104,7 @@ public class VideoAction extends BaseAction { // finish(); } - }, new String[]{Manifest.permission.RECORD_AUDIO});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS + }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.RECORD_AUDIO});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS } }else { diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/ContactEmailActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/ContactEmailActivity.java index 9129fa3..a6a8376 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/ContactEmailActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/pointsmall/ContactEmailActivity.java @@ -30,6 +30,7 @@ import cn.shangyu.gdxzPatient.widget.LoadingPage.ResultState; import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; +import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; @@ -638,6 +639,11 @@ public class ContactEmailActivity extends BaseActivity implements OnClickListene // TODO Auto-generated method stub switch (v.getId()) { case R.id.btn_save: + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } String tele = et_tele.getText().toString().trim(); String name = et_name.getText().toString().trim(); if (TextUtils.isEmpty(name)) { @@ -713,6 +719,11 @@ public class ContactEmailActivity extends BaseActivity implements OnClickListene sendJsonPostParamtoNetSignMD5(Url.payGoodsOrder, param, 2, this); break; case R.id.top_back_layout: + View view1 = getWindow().peekDecorView(); + if (view1 != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view1.getWindowToken(), 0); + } finish(); break; } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/PolyvDownloadActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/PolyvDownloadActivity.java index 381c2fa..77ec7c9 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/PolyvDownloadActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/PolyvDownloadActivity.java @@ -13,6 +13,8 @@ import android.widget.CompoundButton; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gyf.immersionbar.ImmersionBar; + import java.util.ArrayList; import java.util.List; @@ -146,6 +148,8 @@ public class PolyvDownloadActivity extends FragmentActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.polyv_activity_downlaod); + View head=findViewById(R.id.head); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(head).init(); findIdAndNew(); initView(); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java index 8f41171..162587a 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/VideoDetailPolyvPlayerActivity.java @@ -28,6 +28,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.EditText; @@ -83,6 +84,7 @@ import com.easefun.polyvsdk.video.listener.IPolyvOnVideoTimeoutListener; import com.easefun.polyvsdk.vo.PolyvADMatterVO; import com.easefun.polyvsdk.vo.PolyvVideoVO; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; import com.nostra13.universalimageloader.core.ImageLoader; @@ -506,6 +508,7 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(head).init(); setContentView(R.layout.polyv_activity_videodetailplayer); puuid = SharePrefUtil.getString(UIUtils.getContext(),"uuid", ""); mActivity = this; @@ -594,7 +597,7 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements parameters);// 请求网络 if (httpResult!=null&&httpResult.getCode()==200&&httpResult.getString()!=null) { String result = httpResult.getString();// str为服务器返回的json串 - com.umeng.socialize.utils.Log.e("TAG", "videoRead:" + result); + if (!TextUtils.isEmpty(result)) { Gson gson = new Gson(); videoReadBean = gson.fromJson(result, @@ -1811,11 +1814,18 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements } final PopupWindow popupWindow = new PopupWindow(contentView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true); + popupWindow.setClippingEnabled(false); + Log.d("hhhhhhhhh","hhhhhhhhh1"); mTV_Cancel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { // TODO Auto-generated method stub + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } popupWindow.dismiss(); } }); @@ -1824,6 +1834,11 @@ public class VideoDetailPolyvPlayerActivity extends FragmentActivity implements @Override public void onClick(View v) { // TODO Auto-generated method stub + View view = getWindow().peekDecorView(); + if (view != null) { + InputMethodManager inputmanger = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputmanger.hideSoftInputFromWindow(view.getWindowToken(), 0); + } if (mEt_add != null) { mEt_add.setText(mEt_adds.getText().toString()); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/player/PolyvPlayerMediaController.java b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/player/PolyvPlayerMediaController.java index 1465290..301ee01 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/player/PolyvPlayerMediaController.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/polyvplayer/player/PolyvPlayerMediaController.java @@ -29,6 +29,7 @@ import com.easefun.polyvsdk.video.IPolyvVideoView; import com.easefun.polyvsdk.video.PolyvBaseMediaController; import com.easefun.polyvsdk.video.PolyvVideoView; import com.easefun.polyvsdk.vo.PolyvVideoVO; +import com.gyf.immersionbar.ImmersionBar; import java.util.ArrayList; import java.util.List; @@ -741,6 +742,7 @@ public class PolyvPlayerMediaController extends PolyvBaseMediaController impleme handler.sendEmptyMessage(SHOW_PROGRESS); isShowing = !isShowing; setVisibility(View.VISIBLE); + ImmersionBar.with((Activity) mContext).keyboardEnable(true).statusBarDarkFont(true).titleBar(head).init(); } sensorHelper.toggle(true, PolyvScreenUtils.isLandscape(getContext())); } @@ -789,6 +791,7 @@ public class PolyvPlayerMediaController extends PolyvBaseMediaController impleme public void changeToPortrait() { tv_exchange1.setVisibility(VISIBLE); head.setVisibility(VISIBLE); + ImmersionBar.with((Activity) mContext).titleBar(head).init(); if (is_white==1){ tv_exchange1.setVisibility(GONE); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/splash/GuideUI.java b/app/src/main/java/cn/shangyu/gdxzPatient/splash/GuideUI.java index dea8651..247ddab 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/splash/GuideUI.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/splash/GuideUI.java @@ -18,6 +18,8 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; +import com.gyf.immersionbar.ImmersionBar; + import cn.shangyu.gdxzPatient.R; import cn.shangyu.gdxzPatient.activity.LoginActivity; import cn.shangyu.gdxzPatient.utils.SharePrefUtil; @@ -34,7 +36,8 @@ public class GuideUI extends Activity implements OnPageChangeListener, OnClickLi @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_NO_TITLE); // 去标题, 需要在setContentView方法之前调用 + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).init(); +// requestWindowFeature(Window.FEATURE_NO_TITLE); // 去标题, 需要在setContentView方法之前调用 setContentView(R.layout.guide); initView(); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/splash/WelcomeUI.java b/app/src/main/java/cn/shangyu/gdxzPatient/splash/WelcomeUI.java index 08993eb..54ceb7e 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/splash/WelcomeUI.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/splash/WelcomeUI.java @@ -17,6 +17,7 @@ import cn.shangyu.gdxzPatient.activity.GuanggaoDetailActivity; import cn.shangyu.gdxzPatient.activity.LoginActivity; import cn.shangyu.gdxzPatient.activity.MainActivity; import cn.shangyu.gdxzPatient.activity.ZzcxyActivity; +import cn.shangyu.gdxzPatient.application.BaseApplication; import cn.shangyu.gdxzPatient.bean.StartPageBean; import cn.shangyu.gdxzPatient.ecdemo.common.utils.LogUtil; import cn.shangyu.gdxzPatient.http.HttpHelper; @@ -31,6 +32,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.Target; import com.github.dfqin.grantor.PermissionListener; import com.github.dfqin.grantor.PermissionsUtil; +import com.gyf.immersionbar.ImmersionBar; import android.Manifest; import android.app.Activity; @@ -84,6 +86,7 @@ public class WelcomeUI extends Activity implements AnimationListener { finish(); return; } + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).init(); setContentView(R.layout.welcome); mIv_start = (ImageView) findViewById(R.id.iv_start); ll_time = (LinearLayout) findViewById(R.id.ll_wel_time); @@ -103,51 +106,51 @@ public class WelcomeUI extends Activity implements AnimationListener { } private void initQuanxian() { - /**添加权限申请*/ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS - //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 - flag = true; - new Thread() { - public void run() { - upLoad(); - }; - }.start(); - init(); - } else { - PermissionsUtil.requestPermission(this, new PermissionListener() { - @Override - public void permissionGranted(@NonNull String[] permissions) { - //用户授予了访问读写的权限 - flag = true; - new Thread() { - public void run() { - upLoad(); - }; - }.start(); - init(); - } - @Override - public void permissionDenied(@NonNull String[] permissions) { - //用户拒绝了访问读写的申请 -// finish(); - flag = false; - WelcomeUI.this.finish(); - } - - }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS - } - - }else { +// /**添加权限申请*/ +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// +// if (PermissionsUtil.hasPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {//,Manifest.permission.READ_CONTACTS +// //有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录 +// flag = true; +// new Thread() { +// public void run() { +// upLoad(); +// }; +// }.start(); +// init(); +// } else { +// PermissionsUtil.requestPermission(this, new PermissionListener() { +// @Override +// public void permissionGranted(@NonNull String[] permissions) { +// //用户授予了访问读写的权限 +// flag = true; +// new Thread() { +// public void run() { +// upLoad(); +// }; +// }.start(); +// init(); +// } +// @Override +// public void permissionDenied(@NonNull String[] permissions) { +// //用户拒绝了访问读写的申请 +//// finish(); +// flag = false; +// WelcomeUI.this.finish(); +// } +// +// }, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});//WRITE_CONTACTS/,Manifest.permission.READ_CONTACTS +// } +// +// }else { flag = true; - new Thread() { - public void run() { - upLoad(); - }; - }.start(); +// new Thread() { +// public void run() { +// upLoad(); +// }; +// }.start(); init(); - } +// } } @@ -204,6 +207,7 @@ public class WelcomeUI extends Activity implements AnimationListener { SharedPreferences.Editor editor=sharedPreferences.edit(); editor.putBoolean("isFirstRun", false); editor.commit(); + BaseApplication.getInstance().initYinsi(); dialog.dismiss(); initQuanxian(); } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/utils/DownLoadUrlImage.java b/app/src/main/java/cn/shangyu/gdxzPatient/utils/DownLoadUrlImage.java index 78d8efb..36fa4ac 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/utils/DownLoadUrlImage.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/utils/DownLoadUrlImage.java @@ -107,6 +107,10 @@ public class DownLoadUrlImage { } catch (FileNotFoundException e) { e.printStackTrace(); } + catch (Exception e) + { + e.printStackTrace(); + } // 最后通知图库更新 context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + file2.getAbsolutePath()))); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java b/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java index 5335e03..7c28feb 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/utils/Url.java @@ -33,7 +33,7 @@ public class Url { // --------------------------------------------------------------------------------------------------------- //肝胆相照测试 -// + // public static String urlVer = "https://tapp.igandan.org/app/";// // public static String url = "https://tapp.igandan.org/app/patient/";// // public static String urlNew = "https://tapp.igandan.org/app/patientApp/";// diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/utils/X5WebView.java b/app/src/main/java/cn/shangyu/gdxzPatient/utils/X5WebView.java index 4438418..8f4b4b1 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/utils/X5WebView.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/utils/X5WebView.java @@ -3,6 +3,7 @@ package cn.shangyu.gdxzPatient.utils; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; +import android.os.Build; import android.util.AttributeSet; import android.webkit.WebSettings; import android.webkit.WebView; @@ -56,7 +57,9 @@ public class X5WebView extends WebView { webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND); // webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH); webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE); - + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){ + webSetting.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + } // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension // settings 的设计 } diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/wxapi/WXEntryActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/wxapi/WXEntryActivity.java index 284f0ed..c9fbaa0 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/wxapi/WXEntryActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/wxapi/WXEntryActivity.java @@ -1,6 +1,6 @@ package cn.shangyu.gdxzPatient.wxapi; -import com.umeng.weixin.callback.WXCallbackActivity; +import com.umeng.socialize.weixin.view.WXCallbackActivity; public class WXEntryActivity extends WXCallbackActivity { diff --git a/app/src/main/java/com/zbar/lib/CaptureActivity.java b/app/src/main/java/com/zbar/lib/CaptureActivity.java index 351270f..0c55f1c 100644 --- a/app/src/main/java/com/zbar/lib/CaptureActivity.java +++ b/app/src/main/java/com/zbar/lib/CaptureActivity.java @@ -43,6 +43,7 @@ import cn.shangyu.gdxzPatient.utils.StreamTool; import cn.shangyu.gdxzPatient.utils.StringUtil; import cn.shangyu.gdxzPatient.utils.Url; +import com.gyf.immersionbar.ImmersionBar; import com.zbar.lib.camera.CameraManager; import com.zbar.lib.decode.CaptureActivityHandler; import com.zbar.lib.decode.InactivityTimer; @@ -122,6 +123,8 @@ public class CaptureActivity extends Activity implements Callback, public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_qr_scan); + View toolbar_top=findViewById(R.id.toolbar_top); + ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(toolbar_top).init(); RelativeLayout top_back_layout = (RelativeLayout) findViewById(R.id.top_back_layout); TextView top_title = (TextView) findViewById(R.id.top_title); top_title.setText("扫一扫"); diff --git a/app/src/main/res/drawable-hdpi/checkbox_select_bg_new.xml b/app/src/main/res/drawable-hdpi/checkbox_select_bg_new.xml new file mode 100644 index 0000000..b607df2 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/checkbox_select_bg_new.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/icon_cb_unselected_new.png b/app/src/main/res/drawable-hdpi/icon_cb_unselected_new.png new file mode 100644 index 0000000..563532f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cb_unselected_new.png differ diff --git a/app/src/main/res/layout/activity_add_case.xml b/app/src/main/res/layout/activity_add_case.xml index 06a2fb3..8d37a96 100644 --- a/app/src/main/res/layout/activity_add_case.xml +++ b/app/src/main/res/layout/activity_add_case.xml @@ -77,24 +77,38 @@ android:textColor="@color/green_theme" android:textSize="@dimen/textsizea" android:textStyle="bold" /> - - + android:layout_margin="10dp" > + + + + - + + + +