From a1f99ce5e117725d43835449745fba3e04c2f813 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 31 十月 2024 13:09:34 +0800
Subject: [PATCH] 集成dokit
---
countrypicker/build.gradle | 4 +-
third-zxing/build.gradle | 4 +-
build.gradle | 1
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 5 ++
app/build.gradle | 39 +++++++++++++++++++
gradle.properties | 18 ++++++++
6 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 1c77e84..fca1c03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,8 @@
id 'com.android.application'
// 娣诲姞濡備笅閰嶇疆(鍗庝负鏋佸厜鎺ㄩ��)
id 'com.huawei.agconnect'
+ id 'com.didi.dokit'
+
}
//蹇呴』閰嶇疆uni
def mfph = [
@@ -112,6 +114,41 @@
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
+ }
+}
+
+dokitExt {
+ //閫氱敤璁剧疆
+ comm {
+ //鍦板浘缁忕含搴﹀紑鍏�
+ gpsSwitch true
+ //缃戠粶寮�鍏�
+ networkSwitch true
+ //澶у浘寮�鍏�
+ bigImgSwitch true
+ //webView js 鎶撳寘
+ webViewSwitch true
+ }
+
+ slowMethod {
+ //璋冪敤鏍堟ā寮忛厤缃� 瀵瑰簲gradle.properties涓璂OKIT_METHOD_STRATEGY=0
+ stackMethod {
+ //榛樿鍊间负 5ms 灏忎簬璇ュ�肩殑鍑芥暟鍦ㄨ皟鐢ㄦ爤涓笉鏄剧ず
+ thresholdTime 10
+// //璋冪敤鏍堝嚱鏁板叆鍙� 鍗冧竾涓嶈鐢ㄦ垜榛樿鐨勯厤缃� 濡傛灉鏈夌壒娈婇渶姹備慨鏀规垚椤圭洰涓嚜宸辩殑鍏ュ彛 鍋囧涓嶉渶瑕佸彲浠ュ幓鎺夎瀛楁
+// enterMethods = ["com.hdl.photovoltaic.MainDebugActivity.test1"]
+// //榛戝悕鍗� 绮掑害鏈�灏忓埌绫� 鏆備笉鏀寔鍒版柟娉� 鍗冧竾涓嶈鐢ㄦ垜榛樿鐨勯厤缃� 濡傛灉鏈夌壒娈婇渶姹備慨鏀规垚椤圭洰涓嚜宸辩殑鍏ュ彛 鍋囧涓嶉渶瑕佸彲浠ュ幓鎺夎瀛楁
+// methodBlacklist = ["com.facebook.drawee.backends.pipeline.Fresco"]
+ }
+ //鏅�氭ā寮忛厤缃� 瀵瑰簲gradle.properties涓璂OKIT_METHOD_STRATEGY=1
+ normalMethod {
+ //榛樿鍊间负 500ms 灏忎簬璇ュ�肩殑鍑芥暟鍦ㄨ繍琛屾椂涓嶄細鍦ㄦ帶鍒跺彴涓鎵撳嵃
+ thresholdTime 500
+ //闇�瑕侀拡瀵瑰嚱鏁版彃瑁呯殑鍖呭悕 鍗冧竾涓嶈鐢ㄦ垜榛樿鐨勯厤缃� 濡傛灉鏈夌壒娈婇渶姹備慨鏀规垚椤圭洰涓嚜宸辩殑椤圭洰鍖呭悕 鍋囧涓嶉渶瑕佸彲浠ュ幓鎺夎瀛楁
+ packageNames = ["com.hdl.photovoltaic"]
+// //涓嶉渶瑕侀拡瀵瑰嚱鏁版彃瑁呯殑鍖呭悕&绫诲悕 鍗冧竾涓嶈鐢ㄦ垜榛樿鐨勯厤缃� 濡傛灉鏈夌壒娈婇渶姹備慨鏀规垚椤圭洰涓嚜宸辩殑椤圭洰鍖呭悕 鍋囧涓嶉渶瑕佸彲浠ュ幓鎺夎瀛楁
+// methodBlacklist = ["com.hdl.photovoltaic"]
+ }
}
}
//鏋勫缓鏃堕棿
@@ -239,5 +276,5 @@
// FCM锛氬湪 Firebase 涓婂垱寤哄拰 JPush 涓婂悓鍖呭悕鐨勫緟鍙戝竷搴旂敤锛屽垱寤哄畬鎴愬悗涓嬭浇璇ュ簲鐢ㄧ殑 google-services.json 閰嶇疆鏂囦欢骞舵坊鍔犲埌搴旂敤鐨� module 鐩綍涓嬨��
// Huawei锛氬湪 Huawei 涓婂垱寤哄拰 JPush 涓婂悓鍖呭悕鐨勫緟鍙戝竷搴旂敤锛屽垱寤哄畬鎴愬悗涓嬭浇璇ュ簲鐢ㄧ殑 agconnect-services.json 閰嶇疆鏂囦欢骞舵坊鍔犲埌搴旂敤鐨� module 鐩綍涓嬨��
//鍙互浣跨敤CardView缁勪欢鏉ヤ负瑙嗗浘璁剧疆闃村奖鏁堟灉
-
+ debugImplementation 'io.github.didi.dokit:dokitx:3.5.0.1'
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 45aeb0a..861b9c1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -12,6 +12,7 @@
import androidx.multidex.MultiDex;
+import com.didichuxing.doraemonkit.DoKit;
import com.hdl.hdlhttp.HxHttpConfig;
import com.hdl.linkpm.sdk.HDLLinkPMSdk;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -154,6 +155,9 @@
this.networkMonitoring();
//鍒濆鍖栨湰鍦癮ssets鏂囦欢澶硅祫婧愭枃浠�
// this.initLocalAssetsData();
+ new DoKit.Builder(this)
+// .productId("闇�瑕佷娇鐢ㄥ钩鍙板姛鑳界殑璇濓紝闇�瑕佸埌dokit.cn骞冲彴鐢宠id")
+ .build();
}
@@ -218,6 +222,7 @@
HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
}
SystemClock.sleep(200);
+
initDCUniMPSDK();
Intent intent = new Intent(getInstance(), LoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
diff --git a/build.gradle b/build.gradle
index 15d7362..1ef1aa7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,7 @@
// in the individual module build.gradle files
//澧炲姞AGC鎻掍欢閰嶇疆锛屼互渚胯兘鍚屾鈥渁gconnect-services.json鈥濇枃浠朵腑鐨勪俊鎭�.锛堝崕涓烘瀬鍏夋帹閫侊級
classpath 'com.huawei.agconnect:agcp:1.6.1.300'
+ classpath 'io.github.didi.dokit:dokitx-plugin:3.5.0.1'
}
}
diff --git a/countrypicker/build.gradle b/countrypicker/build.gradle
index 31e9713..5b9f949 100644
--- a/countrypicker/build.gradle
+++ b/countrypicker/build.gradle
@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 30
+ compileSdkVersion 31
defaultConfig {
minSdkVersion 15
- targetSdkVersion 30
+ targetSdkVersion 31
versionCode 300
versionName "3.0.0"
diff --git a/gradle.properties b/gradle.properties
index 98aeb05..df73cf4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,20 @@
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
# 鍙互灏唙4,v7搴撹浆鎴怉ndroid X
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+# dokit????
+# ????
+DOKIT_PLUGIN_SWITCH=true
+# DOKIT???????booster?? ???????????booster ???????false
+DOKIT_THIRD_LIB_SWITCH=true
+# ????
+DOKIT_LOG_SWITCH=true
+# ???Webview????? ??????h5 js?????mock
+DOKIT_WEBVIEW_CLASS_NAME=com/didichuxing/doraemonkit/widget/webview/MyWebView
+# dokit ?????
+DOKIT_METHOD_SWITCH=false
+# dokit ???????
+DOKIT_METHOD_STACK_LEVEL=4
+# 0:???? ??????? ??????? ???application onCreate ?attachBaseContext
+# 1:???? ???????????? ??????????
+DOKIT_METHOD_STRATEGY=1
\ No newline at end of file
diff --git a/third-zxing/build.gradle b/third-zxing/build.gradle
index c39f127..65903a3 100644
--- a/third-zxing/build.gradle
+++ b/third-zxing/build.gradle
@@ -2,12 +2,12 @@
android {
- compileSdkVersion 30
+ compileSdkVersion 31
buildToolsVersion "29.0.1"
defaultConfig {
minSdkVersion 23
- targetSdkVersion 30
+ targetSdkVersion 31
versionCode 1
versionName "1.0"
--
Gitblit v1.8.0