opt: add disable the local watermark removal

Author: lingqiqi5211

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/camera/CloudWatermark.kt

@@ -23,6 +23,7 @@ import com.sevtinge.hyperceiler.hook.module.base.dexkit.DexKit
 import io.github.kyuubiran.ezxhelper.core.finder.MethodFinder.`-Static`.methodFinder
 import io.github.kyuubiran.ezxhelper.xposed.dsl.HookFactory.`-Static`.createHook
 import org.json.JSONObject
+import org.luckypray.dexkit.query.enums.StringMatchType
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 
@@ -46,6 +47,22 @@ object CloudWatermark : BaseHook() {
         } as Method?
     }
 
+    private val cloudDelete by lazy {
+        // 仅支持 6.2 及以上版本，用于强制获取云下发的新水印内容
+        DexKit.findMember("deleteCloud") {
+            it.findClass {
+                matcher {
+                    addUsingString("watermark_enable", StringMatchType.Equals)
+                }
+            }.findMethod {
+                matcher {
+                    addInvoke("Ljava/util/List;->isEmpty()Z")
+                    returnType = "void"
+                }
+            }.single()
+        } as Method?
+    }
+
     override fun init() {
         if (cloudMethod == null) {
             logD(TAG, lpparam.packageName, "maybe not support this version")
@@ -56,6 +73,16 @@ object CloudWatermark : BaseHook() {
             returnConstant(true)
         }
 
+        runCatching {
+            cloudDelete?.createHook {
+                before {
+                    it.result = null
+                }
+            }
+        }.onFailure {
+            logW(TAG, lpparam.packageName, "hook deleteCloud failed, maybe not support this version")
+        }
+
         JSONObject::class.java.methodFinder()
             .filterByName("optJSONObject")
             .first()

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/mediaeditor/CustomWatermark.kt

@@ -43,11 +43,31 @@ object CustomWatermark : BaseHook() {
         }
     }
 
+    private val searchNew by lazy<Method> {
+        // 2.2.0.1.6 开始混淆类名和字符串
+        DexKit.findMember("CustomWatermarkNew") {
+            it.findClass {
+                matcher {
+                    addUsingString("check geocode selectable", StringMatchType.Contains)
+                }
+            }.findMethod {
+                matcher {
+                    addInvoke("Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String;")
+                    returnType = "java.lang.String"
+                }
+            }.single()
+        }
+    }
+
     override fun init() {
-        logD(TAG, lpparam.packageName, "[CustomWatermark] search method is $search")
-        search.createHook {
-            // 当前只能修改后缀
-            returnConstant(name)
+        runCatching {
+            search.createHook {
+                returnConstant(name)
+            }
+        }.onFailure {
+            searchNew.createHook {
+                returnConstant(name)
+            }
         }
 
         /*SystemProperties.methodFinder()