Merge branch 'bggRGjQaUbCoE:main' into main

HDYOU · Jan 5, 2024 · 98f9621 · 98f9621
2 parents dde4f18 + c60541a
commit 98f9621
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 37 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1,3 +1,4 @@
 /build
 keytest.jks
-/release
+/release
+/schemas
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -87,42 +87,14 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    signingConfigs {
-        create("keyStore") {
-            keyAlias = "c001apk"
-            keyPassword = "123456"
-            storeFile = file("c001apk.jks")
-            storePassword = "123456"
-        }
-    }
-
     buildTypes {
-        /*release {
-            isMinifyEnabled = true
-            isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }*/
-        val signConfig = signingConfigs.getByName("keyStore")
-        getByName("release") {
+        release {
             isMinifyEnabled = true
             isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            signingConfig = signConfig
-        }
-        getByName("debug") {
-            isMinifyEnabled = false
-            isShrinkResources = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-            signingConfig = signConfig
         }
     }
     compileOptions {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -208,9 +208,4 @@
 -dontwarn org.conscrypt.ConscryptHostnameVerifier
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
-
--obfuscationdictionary dictionary.txt       # 混淆字典
--classobfuscationdictionary dictionary.txt
--packageobfuscationdictionary dictionary.txt
--optimizationpasses 5       # 指定代码的压缩级别
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/mojito/src/main/java/net/mikaelzero/mojito/ui/ImageMojitoFragment.kt b/mojito/src/main/java/net/mikaelzero/mojito/ui/ImageMojitoFragment.kt
@@ -20,7 +20,12 @@ import net.mikaelzero.mojito.interfaces.IMojitoFragment
 import net.mikaelzero.mojito.interfaces.IProgress
 import net.mikaelzero.mojito.interfaces.ImageViewLoadFactory
 import net.mikaelzero.mojito.interfaces.OnMojitoViewCallback
-import net.mikaelzero.mojito.loader.*
+import net.mikaelzero.mojito.loader.ContentLoader
+import net.mikaelzero.mojito.loader.DefaultImageCallback
+import net.mikaelzero.mojito.loader.FragmentCoverLoader
+import net.mikaelzero.mojito.loader.ImageLoader
+import net.mikaelzero.mojito.loader.OnLongTapCallback
+import net.mikaelzero.mojito.loader.OnTapCallback
 import net.mikaelzero.mojito.tools.BitmapUtil
 import net.mikaelzero.mojito.tools.MojitoConstant
 import net.mikaelzero.mojito.tools.ScreenUtils
@@ -331,6 +336,15 @@ class ImageMojitoFragment : Fragment(), IMojitoFragment, OnMojitoViewCallback {
         val arr = BitmapUtil.getAdjustSize(image.path, options)
         var w = arr[0]
         var h = arr[1]
+        fragmentConfig.targetUrl?.let {
+            val from = it.lastIndexOf("@")
+            val middle = it.lastIndexOf("x")
+            val end = it.lastIndexOf(".")
+            if (from != -1 && middle != -1 && end != -1) {
+                w = it.substring(from + 1, middle).toInt()
+                h = it.substring(middle + 1, end).toInt()
+            }
+        }
         val isLongImage = contentLoader?.isLongImage(w, h)
         if (isLongImage != null && isLongImage) {
             w = ScreenUtils.getScreenWidth(context)