更新依赖

TanZhiL · Jan 3, 2020 · cb9db52 · cb9db52
1 parent 1b6b39c
commit cb9db52
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,10 +12,10 @@ android {
             keyPassword '123698745'
         }
         debug {
-            storeFile file('E:\\Project\\Android\\thomas.jks')
-            storePassword '123698745'
-            keyAlias = 'thomas'
-            keyPassword '123698745'
+//            storeFile file('E:\\Project\\Android\\thomas.jks')
+//            storePassword '123698745'
+//            keyAlias = 'thomas'
+//            keyPassword '123698745'
         }
     }
     compileSdkVersion rootProject.ext.android.compileSdkVersion

diff --git a/config.gradle b/config.gradle
@@ -60,7 +60,7 @@ ext {
             "roundedimageview":"2.3.0",
             "aspectjrt":"1.8.14",
             "customactivityoncrash":"2.2.0",
-            "okaspectjrt":"1.0.4",
+            "okaspectjrt":"1.0.7",
             "location":"4.7.0",
             "crashreport_upgrade":"1.4.1",
             "tinker-android-lib":"1.9.9",
@@ -115,8 +115,10 @@ ext {
             "agentwebX5"                           :"com.just.agentwebX5:agentwebX5:${versions["agentwebX5"]}",
             "aspectjrt"                            :"org.aspectj:aspectjrt:${versions["aspectjrt"]}",
             "customactivityoncrash"                :"cat.ereza:customactivityoncrash:${versions["customactivityoncrash"]}",
-            "okaspectjrt-compiler"                 :"com.github.TanZhiL:OkAspectjCompiler:${versions["okaspectjrt"]}",
-            "okaspectjrt"                          :"com.github.TanZhiL:OkAspectjAnnotation:${versions["okaspectjrt"]}",
+
+            "okaspectjrt-compiler"                 :"com.github.TanZhiL.OkAspectj:okaspectj-compiler:${versions["okaspectjrt"]}",
+            "okaspectjrt"                          :"com.github.TanZhiL.OkAspectj:okaspectj:${versions["okaspectjrt"]}",
+
             "location"                             :"com.amap.api:location:${versions["location"]}",
             "crashreport_upgrade"                  :"com.tencent.bugly:crashreport_upgrade:${versions["crashreport_upgrade"]}",
             "tinker-android-lib"                   :"com.tencent.tinker:tinker-android-lib:${versions["tinker-android-lib"]}",

diff --git a/lib_common/src/main/java/com/gykj/zhumulangma/common/aop/NeedLogin.java b/lib_common/src/main/java/com/gykj/zhumulangma/common/aop/NeedLogin.java
@@ -1,6 +1,6 @@
 package com.gykj.zhumulangma.common.aop;
 
-import com.gykj.thomas.aspectj.OkAspectj;
+import com.thomas.aspectj.OkAspectj;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/lib_common/src/main/java/com/gykj/zhumulangma/common/aop/PointHelper.java b/lib_common/src/main/java/com/gykj/zhumulangma/common/aop/PointHelper.java
@@ -4,8 +4,8 @@
 import android.util.Log;
 
 import com.blankj.utilcode.util.ActivityUtils;
-import com.gykj.thomas.aspectj.PointHandler;
 import com.gykj.zhumulangma.common.util.ToastUtil;
+import com.thomas.okaspectj.PointHandler;
 import com.ximalaya.ting.android.opensdk.datatrasfer.AccessTokenManager;
 
 import org.aspectj.lang.ProceedingJoinPoint;

diff --git a/lib_third/build.gradle b/lib_third/build.gradle
@@ -88,7 +88,9 @@ dependencies {
     api rootProject.ext.dependencies["agentwebX5"]
     api rootProject.ext.dependencies["roundedimageview"]
     api rootProject.ext.dependencies["aspectjrt"]
-    api rootProject.ext.dependencies["okaspectjrt"]
+    api (rootProject.ext.dependencies["okaspectjrt"],{
+        exclude group: 'androidx.appcompat', module: 'appcompat'
+    })
     api rootProject.ext.dependencies["location"]
     api rootProject.ext.dependencies["customactivityoncrash"]
     api rootProject.ext.dependencies["crashreport_upgrade"]

diff --git a/lib_third/src/main/java/com/gykj/thomas/third/ThirdHelper.java b/lib_third/src/main/java/com/gykj/thomas/third/ThirdHelper.java
@@ -8,8 +8,6 @@
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.Utils;
-import com.gykj.thomas.aspectj.OkAspectjHelper;
-import com.gykj.thomas.aspectj.PointHandler;
 import com.hjq.toast.ToastUtils;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechUtility;
@@ -18,6 +16,8 @@
 import com.tencent.bugly.Bugly;
 import com.tencent.bugly.beta.Beta;
 import com.tencent.smtt.sdk.QbSdk;
+import com.thomas.okaspectj.OkAspectjHelper;
+import com.thomas.okaspectj.PointHandler;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
 
@@ -143,7 +143,7 @@ public ThirdHelper initFragmentation(boolean isDebug) {
         return this;
     }
     public ThirdHelper initAspectj(PointHandler handler) {
-        OkAspectjHelper.setmHandler(handler);
+        OkAspectjHelper.init(handler);
         return this;
     }