update Base

lib_base/src/main/java/com/android/base/app/fragment/BaseDialogFragment.kt

@@ -39,6 +39,18 @@ open class BaseDialogFragment : AppCompatDialogFragment(), LoadingView, OnBackPr
 
     private var recentShowingDialogTime: Long = 0
 
+    private var _state: Bundle? = null
+
+    protected val state: Bundle
+        get() {
+            var state = _state
+            if (state == null) {
+                state = Bundle()
+                _state = state
+            }
+            return state
+        }
+
     private fun tag() = this.javaClass.simpleName
 
     override fun onAttach(context: Context) {
@@ -49,6 +61,7 @@ open class BaseDialogFragment : AppCompatDialogFragment(), LoadingView, OnBackPr
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        _state = getInstanceState(savedInstanceState)
         Timber.tag(tag()).d("-->onCreate  savedInstanceState   =   $savedInstanceState")
         fragmentDelegates.onCreate(savedInstanceState)
     }
@@ -156,6 +169,7 @@ open class BaseDialogFragment : AppCompatDialogFragment(), LoadingView, OnBackPr
 
     override fun onSaveInstanceState(outState: Bundle) {
         fragmentDelegates.onSaveInstanceState(outState)
+        saveInstanceState(outState, _state)
         super.onSaveInstanceState(outState)
     }
 

lib_base/src/main/java/com/android/base/app/fragment/BaseFragment.kt

@@ -50,6 +50,18 @@ open class BaseFragment : Fragment(), LoadingView, OnBackPressListener, Fragment
 
     private var recentShowingDialogTime: Long = 0
 
+    private var _state: Bundle? = null
+
+    protected val state: Bundle
+        get() {
+            var state = _state
+            if (state == null) {
+                state = Bundle()
+                _state = state
+            }
+            return state
+        }
+
     private fun tag() = this.javaClass.simpleName
 
     override fun onAttach(context: Context) {
@@ -60,6 +72,7 @@ open class BaseFragment : Fragment(), LoadingView, OnBackPressListener, Fragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        _state = getInstanceState(savedInstanceState)
         Timber.tag(tag()).d("-->onCreate  savedInstanceState   =   $savedInstanceState")
         fragmentDelegates.onCreate(savedInstanceState)
     }
@@ -167,6 +180,7 @@ open class BaseFragment : Fragment(), LoadingView, OnBackPressListener, Fragment
 
     override fun onSaveInstanceState(outState: Bundle) {
         fragmentDelegates.onSaveInstanceState(outState)
+        saveInstanceState(outState, _state)
         super.onSaveInstanceState(outState)
     }
 

lib_base/src/main/java/com/android/base/app/fragment/utils.kt

@@ -1,5 +1,6 @@
 package com.android.base.app.fragment
 
+import android.os.Bundle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.android.base.app.ui.LoadingView
@@ -36,4 +37,16 @@ internal fun <T> T.dismissDialog(recentShowingDialogTime: Long, minimumMills: Lo
         }
     }
 
+}
+
+private const val FRAGMENT_STATE_KEY = "fragment_state_key"
+
+internal fun saveInstanceState(outState: Bundle, _state: Bundle?) {
+    _state?.let {
+        outState.putBundle(FRAGMENT_STATE_KEY, it)
+    }
+}
+
+internal fun getInstanceState(state: Bundle?): Bundle? {
+    return state?.getBundle(FRAGMENT_STATE_KEY)
 }

lib_base/src/main/java/com/android/base/imageloader/Source.java

@@ -13,6 +13,9 @@ public class Source {
     Uri mUri;
     byte[] mBytes;
 
+    private Source() {
+    }
+
     public static Source create(String url) {
         Source source = new Source();
         source.mUrl = url;

lib_base/src/main/java/com/android/base/utils/android/ActFragWrapper.java

@@ -24,6 +24,12 @@ public class ActFragWrapper {
         return context;
     }
 
+    public static ActFragWrapper create(Fragment fragment) {
+        ActFragWrapper context = new ActFragWrapper();
+        context.mFragment = fragment;
+        return context;
+    }
+
     public Context getContext() {
         if (mActivity != null) {
             return mActivity;
@@ -44,12 +50,6 @@ public class ActFragWrapper {
         }
     }
 
-    public static ActFragWrapper create(Fragment fragment) {
-        ActFragWrapper context = new ActFragWrapper();
-        context.mFragment = fragment;
-        return context;
-    }
-
     public void startService(Intent intent) {
         if (mActivity != null) {
             mActivity.startService(intent);

lib_base/src/main/java/com/android/base/utils/android/BitmapUtils.kt

@@ -0,0 +1,21 @@
+package com.android.base.utils.android
+
+import android.graphics.Bitmap
+import androidx.annotation.IntRange
+import com.android.base.utils.common.makeParentPath
+import java.io.File
+import java.io.FileOutputStream
+
+
+fun Bitmap.saveToFile(format: Bitmap.CompressFormat, @IntRange(from = 1, to = 100) quality: Int, savePath: String): Boolean {
+    return try {
+        val file = File(savePath)
+        file.makeParentPath()
+        file.createNewFile()
+        compress(format, quality, FileOutputStream(file))
+        true
+    } catch (e: Exception) {
+        e.printStackTrace()
+        false
+    }
+}

lib_base/src/main/java/com/android/base/utils/common/Files.kt

@@ -6,20 +6,17 @@ import com.blankj.utilcode.util.FileUtils
 import timber.log.Timber
 import java.io.File
 
-fun File?.makeFilePath(): Boolean {
+fun File.makeParentPath(): Boolean {
-    if (this == null) {
+    val path = this.parentFile
-        return false
+    return path.exists() || makeDir(path)
-    }
-    val parent = this.parentFile
-    return parent.exists() || makeDir(parent)
 }
 
 private fun makeDir(file: File?): Boolean {
     return file != null && (file.exists() || file.mkdirs())
 }
 
-fun File?.sizeOf(): Long {
+fun File.sizeOf(): Long {
-    if (this == null || !this.exists()) {
+    if (!this.exists()) {
         return 0
     }
     return if (this.isDirectory) {
@@ -44,25 +41,15 @@ fun File.deleteSelf() {
     }
 }
 
-fun File?.isFileExists(): Boolean {
+fun File.isFileExists(): Boolean {
-    return this != null && this.isFile && this.exists()
+    return this.isFile && this.exists()
-}
-
-/**
- * 获取全路径中的文件拓展名
- *
- * @return 文件拓展名
- */
-fun File?.getFileExtension(): String? {
-    return if (this == null) null else getFileExtension(this.path)
 }
 
 /**
  * 获取全路径中的文件拓展名
  *
- * @param filePath 文件路径
  * @return 文件拓展名
  */
-fun getFileExtension(filePath: String): String {
+fun File.getFileExtension(): String {
-    return FileUtils.getFileExtension(filePath)
+    return FileUtils.getFileExtension(this.absolutePath)
 }

lib_qrcode/src/main/java/com/android/sdk/qrcode/CameraUtils.java

@@ -127,4 +127,4 @@ public class CameraUtils {
         return supportedPreviewResolutions.get(supportedPreviewResolutions.size() - 1);
     }
 
-}
+}

lib_qrcode/src/main/java/com/android/sdk/qrcode/Debug.java

@@ -7,16 +7,16 @@ import android.util.Log;
  * Email: ztiany3@gmail.com
  * Date : 2019-04-02 12:55
  */
-public class Debug {
+class Debug {
 
     private static final String TAG = "QRCODE";
     private static boolean debug = BuildConfig.DEBUG;
 
-    public static void setDebug(boolean debug) {
+    static void setDebug(boolean debug) {
         Debug.debug = debug;
     }
 
-    public static void log(String msg) {
+    static void log(String msg) {
         if (debug && msg != null) {
             Log.d(TAG, msg);
         }

lib_qrcode/src/main/java/com/android/sdk/qrcode/QRCodeView.kt

@@ -197,7 +197,6 @@ abstract class QRCodeView @JvmOverloads constructor(
         } catch (e: Exception) {
             e.printStackTrace()
         }
-
     }
 
     /**
@@ -209,7 +208,6 @@ abstract class QRCodeView @JvmOverloads constructor(
         } catch (e: Exception) {
             e.printStackTrace()
         }
-
     }
 
     /**