Merge pull request #12 from LuckyPray/dev

merge the 3.0-release dev branch source code

Author: teble

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "xa_mmkv"]
+	path = xa_mmkv
+	url = https://github.com/LuckyPray/xa_mmkv.git

README.md

@@ -3,7 +3,7 @@
 [![license](https://img.shields.io/github/license/teble/XAutoDaily.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![GitHub release](https://img.shields.io/github/release/teble/XAutoDaily.svg)](https://github.com/cinit/teble/XAutoDaily/latest)
 
-XAutoDaily 是一个兼容QQ大部分版本的开源签到 Xposed 模块
+XAutoDaily 是一个兼容QQ大部分版本(包括新版TIM)的开源签到 Xposed 模块
 
 ## 使用方法
 
@@ -23,11 +23,16 @@ XAutoDaily 是一个兼容QQ大部分版本的开源签到 Xposed 模块
 - 会员排行榜点赞
 - QQ日签卡
 - 小程序打卡/任务
-- 大会员任务
+- 大会员任务(个性赞需要手动点赞)
 - 好友名片自动点赞回赞
 - 好友续火（避免滥用限制字符为20）
 - 会员公众号签到
 - 新版群打卡
+- QQ好友字符抽取
+- 萌宠任务
+- 好友空间互访
+- 好友名片点赞
+- 好友续火
 
 ## License
 

app/build.gradle

@@ -12,22 +12,33 @@ if (performSigning) {
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-    ndkVersion '21.4.7075529'
+    buildToolsVersion "32.0.0"
+//    ndkVersion '23.1.7779620'
 
     defaultConfig {
         applicationId "me.teble.xposed.autodaily"
         minSdkVersion 24
         //noinspection OldTargetApi
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode mVersionCode
         versionName "3.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         externalNativeBuild {
             cmake {
-                cppFlags "-std=c++11"
+                cppFlags "-std=c++14"
+                // 静态库内置签名验证
+                if (performSigning) {
+                    // release 签名
+                    cppFlags.add("-DMODULE_SIGNATURE=FF9FF61037FF85BEDDBA5C98A3CB7600")
+                } else {
+                    // android 默认 debug md5 签名可通过 signingReport 获取
+                    cppFlags.add("-DMODULE_SIGNATURE=CB49EE96102F0D9C331AB59A5921AA42")
+                }
+                arguments "-DANDROID_TOOLCHAIN=clang"
+//                        "-DANDROID_STL=c++_shared"
+//                        "-DANDROID_CPP_FEATURES=rtti exceptions"
             }
         }
         ndk {
@@ -86,7 +97,7 @@ android {
                 signingConfig signingConfigs.release
             }
             matchingFallbacks = ['release']
-            versionNameSuffix "-rc"
+            versionNameSuffix "-rc10"
         }
     }
 
@@ -99,7 +110,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.6.0"
+            version "3.10.2"
         }
     }
 
@@ -129,13 +140,14 @@ android {
 }
 
 dependencies {
-//    implementation project(":stub")
+    implementation project(":mmkv")
     implementation fileTree(dir: "libs", include: ["*.jar"])
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 
     // Xposed
+    //noinspection GradleDependency
     implementation "com.github.kyuubiran:EzXHelper:0.6.1"
     compileOnly "de.robv.android.xposed:api:82"
 
@@ -150,20 +162,22 @@ dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.navigation:navigation-compose:2.4.0-rc01"
+    // implementation "androidx.compose.material:material-icons-extended:$compose_version"
+    implementation "androidx.navigation:navigation-compose:2.5.0-alpha04"
 
     // hutool
-    def hutool_version = "5.7.15"
+    def hutool_version = "5.8.0.M1"
     implementation "cn.hutool:hutool-core:$hutool_version"
-    implementation "cn.hutool:hutool-cron:$hutool_version"
-    implementation "cn.hutool:hutool-http:$hutool_version"
-    implementation "cn.hutool:hutool-crypto:$hutool_version"
+
+    implementation "com.squareup.okhttp3:okhttp:4.9.3"
 
     // Other
-    implementation "com.tencent:mmkv-static:1.2.11"
+    implementation "com.hankcs:aho-corasick-double-array-trie:1.2.3"
     implementation "net.bytebuddy:byte-buddy-android:1.12.7"
     implementation "com.charleskorn.kaml:kaml:0.36.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0"
-    implementation "org.apache-extras.beanshell:bsh:2.0b6"
-    implementation 'com.jayway.jsonpath:json-path:2.6.0'
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
+    // implementation "org.apache-extras.beanshell:bsh:2.0b6"
+
+    // 导航栏
+    implementation "com.google.accompanist:accompanist-insets:0.24.6-alpha"
 }

app/proguard-rules.pro

@@ -77,12 +77,16 @@
 }
 # Hook 混淆
 -keep public class me.teble.xposed.autodaily.hook.MainHook
+-keep class me.teble.xposed.autodaily.utils.LogUtil {
+    *;
+}
 -keepclassmembers public class me.teble.xposed.autodaily.hook.MainHook {
     <init>(android.content.Context);
 }
 -keep class * extends me.teble.xposed.autodaily.hook.base.BaseHook {
     <methods>;
 }
+-keep class com.tencent.mmkv.** { *; }
 # 插件代理混
 -keep class me.teble.xposed.autodaily.hook.function.proxy.* {
     <methods>;
@@ -95,30 +99,28 @@
     *;
 }
 -keep class net.bytebuddy.** {
-  *;
+    *;
 }
 
 
 ##########################################################################################################
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
-    public static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String);
-    public static void checkFieldIsNotNull(java.lang.Object, java.lang.String);
-    public static void checkFieldIsNotNull(java.lang.Object, java.lang.String, java.lang.String);
-    public static void checkNotNull(java.lang.Object);
-    public static void checkNotNull(java.lang.Object, java.lang.String);
-    public static void checkNotNullExpressionValue(java.lang.Object, java.lang.String);
-    public static void checkNotNullParameter(java.lang.Object, java.lang.String);
-    public static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
-    public static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String);
-    public static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String, java.lang.String);
+    public static void check*(...);
+    public static void throw*(...);
+}
+# 去除 DebugMetadataKt() 注释
+-assumenosideeffects class kotlin.coroutines.jvm.internal.BaseContinuationImpl {
+  java.lang.StackTraceElement getStackTraceElement() return null;
+}
+-assumenosideeffects public final class kotlin.coroutines.jvm.internal.DebugMetadataKt {
+   private static final kotlin.coroutines.jvm.internal.DebugMetadata getDebugMetadataAnnotation(kotlin.coroutines.jvm.internal.BaseContinuationImpl) return null;
 }
-
 ##########################################################################################################
 #-obfuscationdictionary          proguard-dic.txt
 #-renamesourcefileattribute      proguard-dic.txt
 #-classobfuscationdictionary     proguard-dic.txt
 #-packageobfuscationdictionary   proguard-dic.txt
--repackageclasses 'o'
+-repackageclasses ''
 -keepattributes Signature
 -keepattributes EnclosingMethod
 -keepattributes *Annotation*