From 643ca6481df5cef7c7c381413d60cc2dc8070e07 Mon Sep 17 00:00:00 2001 From: jackjintai Date: Thu, 2 Apr 2020 18:52:35 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201=E3=80=81=E8=A7=A3=E5=86=B3=E5=A4=A7?= =?UTF-8?q?=E5=9B=BE=E7=BC=96=E8=AF=91=E6=8F=92=E4=BB=B6=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doraemondemo/MainDebugActivity.java | 15 ++++++++------- .../src/main/AndroidManifest.xml | 4 ++-- .../doraemonkit}/aidl/IReceiverAidlInterface.aidl | 2 +- .../doraemonkit}/aidl/ISenderAidlInterface.aidl | 4 ++-- .../doraemonkit/LeakCanaryManager.java | 8 ++++---- .../doraemonkit/abridge}/AbridgeCallBack.java | 2 +- .../doraemonkit/abridge}/AbridgeManager.java | 9 +++++---- .../abridge}/AbridgeMessengerCallBack.java | 2 +- .../abridge}/AbridgeMessengerManager.java | 4 ++-- .../doraemonkit/abridge}/IBridge.java | 2 +- .../abridge}/service/ABridgeService.java | 7 ++++--- .../abridge}/service/MessengerService.java | 5 +---- .../squareup/leakcanary/ActivityRefWatcher.java | 2 -- .../squareup/leakcanary/UploadLeakService.java | 11 +++++------ .../leakcanary/internal/HeapAnalyzerService.java | 3 +++ Android/doraemonkit/build.gradle | 2 -- .../didichuxing/doraemonkit/DoraemonKitReal.java | 2 +- .../doraemonkit/kit/network/NetworkManager.java | 2 +- 18 files changed, 42 insertions(+), 44 deletions(-) rename Android/doraemonkit-leakcanary/src/main/aidl/com/{sjtu/yifei => didichuxing/doraemonkit}/aidl/IReceiverAidlInterface.aidl (79%) rename Android/doraemonkit-leakcanary/src/main/aidl/com/{sjtu/yifei => didichuxing/doraemonkit}/aidl/ISenderAidlInterface.aidl (71%) rename Android/doraemonkit-leakcanary/src/main/java/com/{sjtu/yifei => didichuxing/doraemonkit/abridge}/AbridgeCallBack.java (82%) rename Android/doraemonkit-leakcanary/src/main/java/com/{sjtu/yifei => didichuxing/doraemonkit/abridge}/AbridgeManager.java (95%) rename Android/doraemonkit-leakcanary/src/main/java/com/{sjtu/yifei => didichuxing/doraemonkit/abridge}/AbridgeMessengerCallBack.java (82%) rename Android/doraemonkit-leakcanary/src/main/java/com/{sjtu/yifei => didichuxing/doraemonkit/abridge}/AbridgeMessengerManager.java (96%) rename Android/doraemonkit-leakcanary/src/main/java/com/{sjtu/yifei => didichuxing/doraemonkit/abridge}/IBridge.java (97%) rename Android/doraemonkit-leakcanary/src/main/java/com/{sjtu/yifei => didichuxing/doraemonkit/abridge}/service/ABridgeService.java (95%) rename Android/doraemonkit-leakcanary/src/main/java/com/{sjtu/yifei => didichuxing/doraemonkit/abridge}/service/MessengerService.java (92%) diff --git a/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java b/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java index 1f640bfd..5d489672 100644 --- a/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java +++ b/Android/app/src/debug/java/com/didichuxing/doraemondemo/MainDebugActivity.java @@ -351,21 +351,22 @@ public class MainDebugActivity extends AppCompatActivity implements View.OnClick case R.id.btn_load_img: //Glide 加载 - String picassoImgUrl = "http://b-ssl.duitang.com/uploads/item/201808/27/20180827043223_twunu.jpg"; + String picassoImgUrl = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1585832555614&di=ea70ed1254b3242803d7dde56eedfe9f&imgtype=0&src=http%3A%2F%2Ft9.baidu.com%2Fit%2Fu%3D2268908537%2C2815455140%26fm%3D79%26app%3D86%26f%3DJPEG%3Fw%3D1280%26h%3D719"; String glideImageUrl = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1584969662890&di=bc7b18d8b4efa73fb88ddef4f6f56acc&imgtype=0&src=http%3A%2F%2Ft9.baidu.com%2Fit%2Fu%3D583874135%2C70653437%26fm%3D79%26app%3D86%26f%3DJPEG%3Fw%3D3607%26h%3D2408"; String frescoImageUrl = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1584969662890&di=09318a918fe9ea73a8e27c80291bf669&imgtype=0&src=http%3A%2F%2Ft8.baidu.com%2Fit%2Fu%3D1484500186%2C1503043093%26fm%3D79%26app%3D86%26f%3DJPEG%3Fw%3D1280%26h%3D853"; String imageLoaderImageUrl = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1584969662891&di=acaf549645e58b6c67c231d495e18271&imgtype=0&src=http%3A%2F%2Ft8.baidu.com%2Fit%2Fu%3D3571592872%2C3353494284%26fm%3D79%26app%3D86%26f%3DJPEG%3Fw%3D1200%26h%3D1290"; + Picasso.get().load(picassoImgUrl) + .memoryPolicy(MemoryPolicy.NO_CACHE) + .into((ImageView) findViewById(R.id.iv_picasso)); + Glide.with(MainDebugActivity.this) .asBitmap() .load(glideImageUrl) .diskCacheStrategy(DiskCacheStrategy.NONE) .skipMemoryCache(true) .into((ImageView) findViewById(R.id.iv_glide)); -// - Picasso.get().load(picassoImgUrl) - .memoryPolicy(MemoryPolicy.NO_CACHE) - .into((ImageView) findViewById(R.id.iv_picasso)); -// + + ImageLoader imageLoader = ImageLoader.getInstance(); imageLoader.displayImage(imageLoaderImageUrl, (ImageView) findViewById(R.id.iv_imageloader)); @@ -406,7 +407,7 @@ public class MainDebugActivity extends AppCompatActivity implements View.OnClick case R.id.btn_connection_mock: //requestByGet("https://www.v2ex.com/api/topics/hot.json"); //requestByGet("https://gank.io/api/today?a=哈哈&b=bb"); - requestByGet("http://gank.io/gateway?api=dj.map"); + requestByGet("https://www.v2ex.com/api/topics/hot.json"); break; // case R.id.btn_rpc_mock: // break; diff --git a/Android/doraemonkit-leakcanary/src/main/AndroidManifest.xml b/Android/doraemonkit-leakcanary/src/main/AndroidManifest.xml index 51ccc2ae..3dc8f644 100644 --- a/Android/doraemonkit-leakcanary/src/main/AndroidManifest.xml +++ b/Android/doraemonkit-leakcanary/src/main/AndroidManifest.xml @@ -68,7 +68,7 @@ android:theme="@style/leak_canary_Theme.Transparent" /> @@ -78,7 +78,7 @@ diff --git a/Android/doraemonkit-leakcanary/src/main/aidl/com/sjtu/yifei/aidl/IReceiverAidlInterface.aidl b/Android/doraemonkit-leakcanary/src/main/aidl/com/didichuxing/doraemonkit/aidl/IReceiverAidlInterface.aidl similarity index 79% rename from Android/doraemonkit-leakcanary/src/main/aidl/com/sjtu/yifei/aidl/IReceiverAidlInterface.aidl rename to Android/doraemonkit-leakcanary/src/main/aidl/com/didichuxing/doraemonkit/aidl/IReceiverAidlInterface.aidl index fdaf6f68..31845351 100644 --- a/Android/doraemonkit-leakcanary/src/main/aidl/com/sjtu/yifei/aidl/IReceiverAidlInterface.aidl +++ b/Android/doraemonkit-leakcanary/src/main/aidl/com/didichuxing/doraemonkit/aidl/IReceiverAidlInterface.aidl @@ -1,5 +1,5 @@ // ICallback.aidl -package com.sjtu.yifei.aidl; +package com.didichuxing.doraemonkit.aidl; // Declare any non-default types here with import statements diff --git a/Android/doraemonkit-leakcanary/src/main/aidl/com/sjtu/yifei/aidl/ISenderAidlInterface.aidl b/Android/doraemonkit-leakcanary/src/main/aidl/com/didichuxing/doraemonkit/aidl/ISenderAidlInterface.aidl similarity index 71% rename from Android/doraemonkit-leakcanary/src/main/aidl/com/sjtu/yifei/aidl/ISenderAidlInterface.aidl rename to Android/doraemonkit-leakcanary/src/main/aidl/com/didichuxing/doraemonkit/aidl/ISenderAidlInterface.aidl index 397aadff..63e87ea3 100644 --- a/Android/doraemonkit-leakcanary/src/main/aidl/com/sjtu/yifei/aidl/ISenderAidlInterface.aidl +++ b/Android/doraemonkit-leakcanary/src/main/aidl/com/didichuxing/doraemonkit/aidl/ISenderAidlInterface.aidl @@ -1,7 +1,7 @@ // ICall.aidl -package com.sjtu.yifei.aidl; +package com.didichuxing.doraemonkit.aidl; -import com.sjtu.yifei.aidl.IReceiverAidlInterface; +import com.didichuxing.doraemonkit.aidl.IReceiverAidlInterface; interface ISenderAidlInterface { diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/LeakCanaryManager.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/LeakCanaryManager.java index a999ac78..46fa8d0c 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/LeakCanaryManager.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/LeakCanaryManager.java @@ -1,14 +1,14 @@ package com.didichuxing.doraemonkit; import android.app.Application; +import android.util.Log; import com.blankj.utilcode.util.ActivityUtils; +import com.didichuxing.doraemonkit.abridge.AbridgeCallBack; +import com.didichuxing.doraemonkit.abridge.IBridge; import com.didichuxing.doraemonkit.constant.DokitConstant; import com.didichuxing.doraemonkit.kit.health.AppHealthInfoUtil; import com.didichuxing.doraemonkit.kit.health.model.AppHealthInfo; -import com.didichuxing.doraemonkit.util.LogHelper; -import com.sjtu.yifei.AbridgeCallBack; -import com.sjtu.yifei.IBridge; import com.squareup.leakcanary.LeakCanary; /** @@ -45,7 +45,7 @@ class LeakCanaryManager { @Override public void receiveMessage(String message) { try { - LogHelper.i(TAG, "====aidl=====>" + message); + Log.i(TAG, "====aidl=====>" + message); if (DokitConstant.APP_HEALTH_RUNNING) { AppHealthInfo.DataBean.LeakBean leakBean = new AppHealthInfo.DataBean.LeakBean(); leakBean.setPage(ActivityUtils.getTopActivity().getClass().getCanonicalName()); diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeCallBack.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeCallBack.java similarity index 82% rename from Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeCallBack.java rename to Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeCallBack.java index b79f8079..4034ff4e 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeCallBack.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeCallBack.java @@ -1,4 +1,4 @@ -package com.sjtu.yifei; +package com.didichuxing.doraemonkit.abridge; /** * 类描述： diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeManager.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeManager.java similarity index 95% rename from Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeManager.java rename to Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeManager.java index 26a163ea..e6ab1725 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeManager.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeManager.java @@ -1,4 +1,4 @@ -package com.sjtu.yifei; +package com.didichuxing.doraemonkit.abridge; import android.app.Application; import android.content.ComponentName; @@ -13,8 +13,9 @@ import android.text.TextUtils; import android.util.Log; ; -import com.sjtu.yifei.aidl.IReceiverAidlInterface; -import com.sjtu.yifei.aidl.ISenderAidlInterface; + +import com.didichuxing.doraemonkit.aidl.IReceiverAidlInterface; +import com.didichuxing.doraemonkit.aidl.ISenderAidlInterface; import java.util.ArrayList; import java.util.List; @@ -30,7 +31,7 @@ import java.util.List; final class AbridgeManager { private static final String TAG = "AbridgeManager"; private static final String BIND_SERVICE_ACTION = "android.intent.action.ICALL_AIDL_YIFEI"; - private static final String BIND_SERVICE_COMPONENT_NAME_CLS = "com.sjtu.yifei.service.ABridgeService"; + private static final String BIND_SERVICE_COMPONENT_NAME_CLS = "com.didichuxing.doraemonkit.abridge.service.ABridgeService"; private static AbridgeManager instance; private Application sApplication; diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeMessengerCallBack.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeMessengerCallBack.java similarity index 82% rename from Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeMessengerCallBack.java rename to Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeMessengerCallBack.java index 433784d3..15fa4e73 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeMessengerCallBack.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeMessengerCallBack.java @@ -1,4 +1,4 @@ -package com.sjtu.yifei; +package com.didichuxing.doraemonkit.abridge; import android.os.Message; diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeMessengerManager.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeMessengerManager.java similarity index 96% rename from Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeMessengerManager.java rename to Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeMessengerManager.java index 02cd85a2..a53a1e61 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/AbridgeMessengerManager.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/AbridgeMessengerManager.java @@ -1,4 +1,4 @@ -package com.sjtu.yifei; +package com.didichuxing.doraemonkit.abridge; import android.app.Application; import android.content.ComponentName; @@ -26,7 +26,7 @@ import java.util.List; final class AbridgeMessengerManager { private static final String TAG = "AbridgeMessengerManager"; private static final String BIND_SERVICE_ACTION = "android.intent.action.ICALL_MESSENGER_YIFEI"; - private static final String BIND_MESSENGER_SERVICE_COMPONENT_NAME_CLS = "com.sjtu.yifei.service.MessengerService"; + private static final String BIND_MESSENGER_SERVICE_COMPONENT_NAME_CLS = "com.didichuxing.doraemonkit.abridge.service.MessengerService"; private static AbridgeMessengerManager instance; private Application sApplication; diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/IBridge.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/IBridge.java similarity index 97% rename from Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/IBridge.java rename to Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/IBridge.java index 002c0454..a298c01b 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/IBridge.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/IBridge.java @@ -1,4 +1,4 @@ -package com.sjtu.yifei; +package com.didichuxing.doraemonkit.abridge; import android.app.Application; import android.os.Message; diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/service/ABridgeService.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/service/ABridgeService.java similarity index 95% rename from Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/service/ABridgeService.java rename to Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/service/ABridgeService.java index 1152b8d5..3ce00796 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/service/ABridgeService.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/service/ABridgeService.java @@ -1,4 +1,4 @@ -package com.sjtu.yifei.service; +package com.didichuxing.doraemonkit.abridge.service; import android.app.Service; import android.content.Intent; @@ -7,8 +7,9 @@ import android.os.RemoteCallbackList; import android.os.RemoteException; import android.util.Log; -import com.sjtu.yifei.aidl.IReceiverAidlInterface; -import com.sjtu.yifei.aidl.ISenderAidlInterface; + +import com.didichuxing.doraemonkit.aidl.IReceiverAidlInterface; +import com.didichuxing.doraemonkit.aidl.ISenderAidlInterface; import java.util.ArrayList; import java.util.List; diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/service/MessengerService.java b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/service/MessengerService.java similarity index 92% rename from Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/service/MessengerService.java rename to Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/service/MessengerService.java index cbe3c884..320fd26d 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/sjtu/yifei/service/MessengerService.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/didichuxing/doraemonkit/abridge/service/MessengerService.java @@ -1,4 +1,4 @@ -package com.sjtu.yifei.service; +package com.didichuxing.doraemonkit.abridge.service; import android.annotation.SuppressLint; import android.app.Service; @@ -7,12 +7,9 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.Messenger; -import android.os.RemoteCallbackList; import android.os.RemoteException; import android.text.TextUtils; -import com.sjtu.yifei.aidl.IReceiverAidlInterface; - import java.util.ArrayList; import java.util.List; diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/ActivityRefWatcher.java b/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/ActivityRefWatcher.java index 7a47ca91..e06cd1e6 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/ActivityRefWatcher.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/ActivityRefWatcher.java @@ -18,11 +18,9 @@ package com.squareup.leakcanary; import android.app.Activity; import android.app.Application; import android.content.Context; -import android.text.TextUtils; import androidx.annotation.NonNull; -import com.didichuxing.doraemonkit.util.LogHelper; import com.squareup.leakcanary.internal.ActivityLifecycleCallbacksAdapter; /** diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/UploadLeakService.java b/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/UploadLeakService.java index 052646c5..83a997ff 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/UploadLeakService.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/UploadLeakService.java @@ -15,13 +15,12 @@ */ package com.squareup.leakcanary; -import android.os.Bundle; -import android.os.Message; -import androidx.annotation.NonNull; import android.text.TextUtils; +import android.util.Log; + +import androidx.annotation.NonNull; -import com.didichuxing.doraemonkit.util.LogHelper; -import com.sjtu.yifei.IBridge; +import com.didichuxing.doraemonkit.abridge.IBridge; import com.squareup.leakcanary.internal.DisplayLeakActivity; /** @@ -48,7 +47,7 @@ public class UploadLeakService extends DisplayLeakService { if (TextUtils.isEmpty(leakInfo)) { return; } - LogHelper.i(TAG, "====leakInfo====" + leakInfo); + Log.i(TAG, "====leakInfo====" + leakInfo); try { IBridge.sendAIDLMessage(leakInfo); } catch (Exception e) { diff --git a/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/internal/HeapAnalyzerService.java b/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/internal/HeapAnalyzerService.java index f5f120a2..2f85cc54 100644 --- a/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/internal/HeapAnalyzerService.java +++ b/Android/doraemonkit-leakcanary/src/main/java/com/squareup/leakcanary/internal/HeapAnalyzerService.java @@ -20,6 +20,8 @@ import android.content.Intent; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; +import com.blankj.utilcode.util.Utils; +import com.didichuxing.doraemonkit.DoraemonKit; import com.squareup.leakcanary.R; import com.squareup.leakcanary.AbstractAnalysisResultService; import com.squareup.leakcanary.AnalysisResult; @@ -63,6 +65,7 @@ public final class HeapAnalyzerService extends ForegroundService public HeapAnalyzerService() { super(HeapAnalyzerService.class.getSimpleName(), R.string.leak_canary_notification_analysing); +// Utils.init(getApplication()); } /** diff --git a/Android/doraemonkit/build.gradle b/Android/doraemonkit/build.gradle index f7288900..a0889a3c 100644 --- a/Android/doraemonkit/build.gradle +++ b/Android/doraemonkit/build.gradle @@ -61,8 +61,6 @@ dependencies { //远程调试db implementation rootProject.ext.dependencies["debug-db"] implementation rootProject.ext.dependencies["debug-db-encrypt"] - //rv -// implementation rootProject.ext.dependencies["brvah"] implementation rootProject.ext.dependencies["android_spinkit"] implementation rootProject.ext.dependencies["okhttp"] implementation rootProject.ext.dependencies["okhttp_v2"] diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKitReal.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKitReal.java index 885519f5..f32e8dda 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKitReal.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKitReal.java @@ -152,7 +152,7 @@ class DoraemonKitReal { //OkHttp 拦截器 注入 OkHttpHook.installInterceptor(); - LogHelper.i(TAG, "IS_HOOK====>" + IS_HOOK); + Log.i(TAG, "IS_HOOK====>" + IS_HOOK); //赋值全局变量 DokitConstant.IS_HOOK = IS_HOOK; //注册全局的activity生命周期回调 diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/NetworkManager.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/NetworkManager.java index 2f850a43..c715f909 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/NetworkManager.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/NetworkManager.java @@ -25,7 +25,7 @@ public class NetworkManager { // private static final String MOCK_HOST_DEBUG = "xyrd.intra.xiaojukeji.com"; private static final String MOCK_HOST_DEBUG = "mock.dokit.cn"; private static final String MOCK_HOST_RELEASE = "mock.dokit.cn"; - private static final String MOCK_DEBUG_DOMAIN = MOCK_SCHEME_HTTP + MOCK_HOST_DEBUG; + private static final String MOCK_DEBUG_DOMAIN = MOCK_SCHEME_HTTPS + MOCK_HOST_DEBUG; private static final String MOCK_RELEASE_DOMAIN = MOCK_SCHEME_HTTPS + MOCK_HOST_RELEASE; public static final String MOCK_DOMAIN = BuildConfig.DEBUG ? MOCK_DEBUG_DOMAIN : MOCK_RELEASE_DOMAIN; public static final String MOCK_HOST = BuildConfig.DEBUG ? MOCK_HOST_DEBUG : MOCK_HOST_RELEASE; -- GitLab