公共库更新

Author: bihe0832

APPTest/build.gradle

@@ -28,6 +28,15 @@ android {
         }
     }
 
+    packagingOptions {
+        project.doNotStripList.each { item ->
+            doNotStrip item
+        }
+        project.excludeList.each { item ->
+            exclude item
+        }
+    }
+
     lintOptions {
         abortOnError false
     }

APPTest/src/main/java/com/bihe0832/android/test/module/TestDebugTempFragment.kt

@@ -1,14 +1,19 @@
 package com.bihe0832.android.test.module
 
 import android.content.Intent
-import android.provider.MediaStore
 import android.view.View
 import com.bihe0832.android.app.about.AboutActivity
+import com.bihe0832.android.common.photos.cropPhoto
+import com.bihe0832.android.common.photos.getDefaultPhoto
+import com.bihe0832.android.common.photos.getPhotosFolder
+import com.bihe0832.android.common.photos.showPhotoChooser
+import com.bihe0832.android.framework.constant.ZixieActivityRequestCode
 import com.bihe0832.android.lib.adapter.CardBaseModule
 import com.bihe0832.android.lib.log.ZLog
+import com.bihe0832.android.lib.ui.photos.Photos
+import com.bihe0832.android.lib.utils.intent.IntentUtils
 import com.bihe0832.android.test.base.BaseTestFragment
 import com.bihe0832.android.test.base.item.TestItemData
-import java.lang.Exception
 
 
 class
@@ -21,6 +26,7 @@ TestDebugTempFragment : BaseTestFragment() {
             add(TestItemData("通用测试预处理", View.OnClickListener { preTest() }))
             add(TestItemData("测试自定义请求", View.OnClickListener { testOneRequest() }))
             add(TestItemData("默认关于页", View.OnClickListener { startActivity(AboutActivity::class.java) }))
+            add(TestItemData("APP设置", View.OnClickListener { IntentUtils.startAppDetailSettings(context) }))
         }
     }
 
@@ -34,14 +40,19 @@ TestDebugTempFragment : BaseTestFragment() {
     private fun testFunc() {
         ZLog.d("test")
         try {
-            val takePhotoIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE) //用来打开相机的Intent
-            if (takePhotoIntent.resolveActivity(context!!.getPackageManager()) != null) { //这句作用是如果没有相机则该应用不会闪退，要是不加这句则当系统没有相机应用的时候该应用会闪退
-                activity!!.startActivityForResult(takePhotoIntent, 1) //启动相机
-            }
-        }catch (e:Exception){
+            activity?.showPhotoChooser()
+        } catch (e: Exception) {
             e.printStackTrace()
         }
-
     }
 
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        ZLog.d("PhotoChooser", "in PhotoChooser onResult, $this, $requestCode, $resultCode, ${data?.data}")
+        if (requestCode == ZixieActivityRequestCode.TAKE_PHOTO) {
+            Photos.addPicToPhotos(context, activity!!.getDefaultPhoto().absolutePath)
+            activity?.cropPhoto(activity!!.getDefaultPhoto().absolutePath, activity!!.getPhotosFolder() + "a.jpg", 2)
+        }
+    }
 }

APPTest/src/main/res/values/strings.xml

@@ -1,5 +1,4 @@
 <resources>
-    <string name="lib_bihe0832_file_folder">zixie/</string>
     <color name="common_activity_bg">@color/colorPrimaryDark</color>
     <string name="update_url">https://cdn.bihe0832.com/app/update/get_apk.json</string>
 </resources>

Application/src/main/java/com/bihe0832/android/app/update/UpdateManager.kt

@@ -83,7 +83,7 @@ object UpdateManager {
                 }
             }
         }.let {
-            HTTPServer.getInstance().doRequest(it)
+            HTTPServer.getInstance().doRequestAsync(it)
         }
     }
 }

Application/src/main/res/values/file_path.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="lib_bihe0832_file_folder">zixie/</string>
+</resources>

config.gradle

@@ -40,17 +40,26 @@ ext {
     ]
 
     //使用kotlin版本
-    kotlin_version = '1.3.50'
+    kotlin_version = '1.3.71'
     glide_version = "4.6.1"
     gson_version = "2.8.2"
     //使用Android Support库版本
-    android_support_version = "27.0.0"
+    android_support_version = "28.0.0"
     android_constraint_layout_version = '1.1.3'
     android_arch_lifecycle_version = '1.1.1'
     android_arch_persistence_version = '1.1.1'
     robolectricVersion = '3.3.2'
 
-    aaf_version ='3.7.9'
+
     aaf_router_version = '3.7.9'
+    aaf_version ='3.8.0'
 
+    excludeList = [
+            'META-INF/*.kotlin_module',
+            'META-INF/proguard/androidx-annotations.pro'
+    ]
+
+    doNotStripList = [
+            "*/armeabi-v7a/*.so"
+    ]
 }

dependencies.gradle

@@ -45,6 +45,7 @@ ext.moduleInfo = [
         "Application"  : [
                 "apidependenciesList"    : [
                         "com.bihe0832.android:common-feedback:${project.aaf_version}",
+                        "com.bihe0832.android:common-photos:${project.aaf_version}",
                         "com.bihe0832.android:framework:${project.aaf_version}",
                         'com.squareup.okhttp3:okhttp:3.9.1',
                         'com.squareup.okhttp3:logging-interceptor:3.8.0',