Просмотр исходного кода

5.1.7版本 修复图片选择不了的bug

fancy 5 лет назад
Родитель
Сommit
1cc95bf259

+ 3 - 4
o2android/app/build.gradle

@@ -52,8 +52,8 @@ task printVersionName {
 
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     sourceSets {
         main {
             jniLibs.srcDir 'libs'
@@ -82,7 +82,7 @@ android {
     defaultConfig {
         applicationId "net.zoneland.x.bpm.mobile.v1.zoneXBPM"
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 28
         versionCode project.property("o2.versionCode").toInteger()
         versionName project.property("o2.versionName").toString()
         multiDexEnabled true
@@ -260,7 +260,6 @@ dependencies {
 
     //im
 //    implementation 'com.michaelpardo:activeandroid:3.1.0'
-////    implementation files('libs/activeandroid-3.1.0-SNAPSHOT.jar')
 //    implementation 'com.jakewharton:butterknife:8.4.0'
 //    kapt 'com.jakewharton:butterknife-compiler:8.4.0'
 //    implementation 'com.github.chrisbanes.photoview:library:1.2.4'

BIN
o2android/app/libs/pgyer_sdk_2.2.2.jar


+ 4 - 6
o2android/app/proguard-rules.pro

@@ -176,12 +176,7 @@
 -keep class com.afollestad.materialdialogs.** { *; }
 #日历控件 github > material-calendarview
 -keep class com.prolificinteractive.** { *; }
-#pgy
--dontwarn com.pgyersdk.**
--keep class com.pgyersdk.** { *; }
-#umeng
--keep class com.umeng.analytics.** { *; }
--dontwarn com.umeng.analytics.**
+
 #log4j
 -keep class org.apache.log4j.** { *; }
 -dontwarn org.apache.log4j.**
@@ -563,3 +558,6 @@
 -keep class io.flutter.view.**  { *; }
 -keep class io.flutter.**  { *; }
 -keep class io.flutter.plugins.**  { *; }
+
+
+-keep class net.sourceforge.pinyin4j.** { *; }

+ 2 - 0
o2android/app/src/main/AndroidManifest.xml

@@ -390,6 +390,8 @@
 
         <activity android:name=".app.tbs.FileReaderActivity" />
         <activity android:name=".flutter.FlutterConnectActivity" />
+
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
     </application>
 
 </manifest>

+ 5 - 1
o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/utils/cache/DiskLruCacheHelper.java

@@ -27,7 +27,11 @@ public class DiskLruCacheHelper {
         try {
             if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())
                     || !Environment.isExternalStorageRemovable()) {
-                mCache = DiskLruCache.open(context.getExternalCacheDir(), appVersion, 1, maxSize);
+                if (context.getExternalCacheDir() !=null ) {
+                    mCache = DiskLruCache.open(context.getExternalCacheDir(), appVersion, 1, maxSize);
+                }else {
+                    mCache = DiskLruCache.open(context.getCacheDir(), appVersion, 1, maxSize);
+                }
             } else {
                 mCache = DiskLruCache.open(context.getCacheDir(), appVersion, 1, maxSize);
             }

+ 2 - 2
o2android/gradle.properties

@@ -23,6 +23,6 @@ android.enableJetifier=true
 
 
 # o2
-o2.versionName=5.1.6
-o2.versionCode=116
+o2.versionName=5.1.7
+o2.versionCode=117
 

+ 3 - 3
o2android/o2_auth_sdk/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
 
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"