Skip to content

Commit 62439c2

Browse files
mengyanshoumengyanshou
authored
Merge branch 'master' into master
2 parents 84da2ea + 779c2df commit 62439c2

File tree

656 files changed

+20324
-11032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

656 files changed

+20324
-11032
lines changed

‎Android/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ local.properties
66
/.idea/workspace.xml
77
.DS_Store
88
/build
9+
/*/build
910
/captures
1011
.externalNativeBuild
1112
.idea/
1213
.project
1314
.classpath
1415
.settings/
1516
/*/*.iml
16-
/*/*/*.iml
17+
/*/*/*.iml

‎Android/app/build.gradle

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,22 @@ android {
107107

108108
//dokit 扩展
109109

110-
//dokitExt {
111-
// //通用设置
112-
// comm {
113-
// //地图经纬度开关
114-
// gpsSwitch true
115-
// //网络开关
116-
// networkSwitch true
117-
// //大图开关
118-
// bigImgSwitch true
119-
// //webView js 抓包
120-
// webViewSwitch true
121-
// }
110+
111+
dokit {
112+
gpsEnable true
113+
bigImageEnable true
114+
webView {
115+
network true
116+
dokitWeb true
117+
vConsole true
118+
}
119+
gps {
120+
didi true
121+
baidu true
122+
}
123+
}
124+
125+
//dokit {
122126
//
123127
// slowMethod {
124128
// //调用栈模式配置
@@ -201,10 +205,9 @@ dependencies {
201205
releaseImplementation rootProject.ext.dependencies["okgo"]
202206
//高德地图定位
203207
implementation rootProject.ext.dependencies["amap_location"]
204-
//高德地图
205-
// implementation rootProject.ext.dependencies["amap_map3d"]
206208
//高德搜索
207209
implementation rootProject.ext.dependencies["amap_search"]
210+
//高德地图
208211
implementation rootProject.ext.dependencies["amap_navi"]
209212
//腾讯地图定位
210213
// implementation rootProject.ext.dependencies["tencent_location"]

‎Android/app/doraemonkit.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if (runType == 0) {
1111
// debugImplementation project(":dokit-weex")
1212
// debugImplementation project(":dokit-rpc")
1313
// debugImplementation project(":dokit-rpc-mc")
14-
// debugImplementation project(":dokit-dmap")
14+
debugImplementation project(":dokit-gps-mock")
1515
releaseImplementation project(":dokit-no-op")
1616
}
1717
} else if (runType == 1) {
@@ -23,6 +23,7 @@ if (runType == 0) {
2323
debugImplementation "io.github.didi.dokit:dokitx-ft:${rootProject.ext.publish_config["version"]}"
2424
debugImplementation "io.github.didi.dokit:dokitx-mc:${rootProject.ext.publish_config["version"]}"
2525
debugImplementation "io.github.didi.dokit:dokitx-weex:${rootProject.ext.publish_config["version"]}"
26+
debugImplementation "io.github.didi.dokit:dokit-gps-mock:${rootProject.ext.publish_config["version"]}"
2627
releaseImplementation "io.github.didi.dokit:dokitx-no-op:${rootProject.ext.publish_config["version"]}"
2728
}
2829
}

‎Android/app/src/debug/java/AndroidManifest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424
android:supportsRtl="true"
2525
android:theme="@style/AppTheme"
2626
tools:replace="android:allowBackup">
27-
<activity android:name=".MainDebugActivityOkhttpV3">
28-
<intent-filter>
29-
<action android:name="android.intent.action.MAIN" />
27+
<activity android:name=".old.MainDebugActivityOkhttpV3">
3028

31-
<category android:name="android.intent.category.LAUNCHER" />
32-
</intent-filter>
3329
</activity>
3430

3531
<!-- <activity-->
@@ -58,4 +54,4 @@
5854

5955
</application>
6056

61-
</manifest>
57+
</manifest>

‎Android/app/src/debug/java/com/didichuxing/doraemondemo/App.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.didichuxing.doraemondemo.dokit.DemoKit
1313
import com.didichuxing.doraemondemo.dokit.TestSimpleDokitFloatViewKit
1414
import com.didichuxing.doraemondemo.dokit.TestSimpleDokitFragmentKit
1515
import com.didichuxing.doraemondemo.mc.SlideBar
16+
import com.didichuxing.doraemondemo.module.http.CustomInterceptor
1617
import com.didichuxing.doraemonkit.DoKit
1718
import com.didichuxing.doraemonkit.DoKitCallBack
1819
import com.didichuxing.doraemonkit.kit.AbstractKit

‎Android/app/src/debug/java/com/didichuxing/doraemondemo/amap/FloatGpsMockRouteKitView.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import android.widget.TextView;
1111

1212
import com.didichuxing.doraemondemo.R;
13-
import com.didichuxing.doraemondemo.dokit.SimpleDokitView;
14-
import com.didichuxing.doraemonkit.kit.lbs.route.FloatGpsRouteMockCache;
13+
import com.didichuxing.doraemondemo.dokit.SimpleDoKitView;
14+
import com.didichuxing.doraemonkit.gps_mock.lbs.route.FloatGpsRouteMockCache;
1515

16-
public class FloatGpsMockRouteKitView extends SimpleDokitView {
16+
public class FloatGpsMockRouteKitView extends SimpleDoKitView {
1717
public static final String TAG = "FloatGpsMockRoutKitView";
1818
private View mRootView;
1919
private static int sMockSpeed = 10;

‎Android/app/src/debug/java/com/didichuxing/doraemondemo/amap/FloatGpsPresetMockKitView.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
import android.widget.TextView;
99

1010
import com.didichuxing.doraemondemo.R;
11-
import com.didichuxing.doraemondemo.dokit.SimpleDokitView;
12-
import com.didichuxing.doraemonkit.kit.lbs.common.LocInfo;
13-
import com.didichuxing.doraemonkit.kit.lbs.manual.FloatGpsMockCache;
14-
import com.didichuxing.doraemonkit.kit.lbs.preset.FloatGpsPresetMockCache;
15-
import com.didichuxing.doraemonkit.kit.lbs.preset.MockLocList;
11+
import com.didichuxing.doraemondemo.dokit.SimpleDoKitView;
12+
import com.didichuxing.doraemonkit.gps_mock.lbs.common.LocInfo;
13+
import com.didichuxing.doraemonkit.gps_mock.lbs.manual.FloatGpsMockCache;
14+
import com.didichuxing.doraemonkit.gps_mock.lbs.preset.FloatGpsPresetMockCache;
15+
import com.didichuxing.doraemonkit.gps_mock.lbs.preset.MockLocList;
1616
import com.google.android.flexbox.FlexboxLayout;
1717

1818
import java.util.ArrayList;
1919

20-
public class FloatGpsPresetMockKitView extends SimpleDokitView {
20+
public class FloatGpsPresetMockKitView extends SimpleDoKitView {
2121
public static final String TAG = "FloatGpsPresetMockKitView";
2222
private View mRootView;
2323

‎Android/app/src/main/AndroidManifest.xml

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
<dist:module dist:instant="true" />
88

9-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
10-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
9+
<uses-permission
10+
android:name="android.permission.READ_FRAME_BUFFER"
11+
tools:ignore="ProtectedPermissions" />
1112
<uses-permission android:name="android.permission.INTERNET" /> <!-- tencent Android Q新增权限，允许应用在后台发起定位，如应用target为Q，请添加此权限 -->
1213
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- tencent 如果设置了target >= 28 如果需要启动后台定位则必须声明这个权限 -->
1314
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 用于进行网络定位 -->
@@ -29,39 +30,58 @@
2930
android:supportsRtl="true"
3031
android:theme="@style/AppTheme"
3132
tools:ignore="GoogleAppIndexingWarning">
33+
34+
<activity
35+
android:name=".MainDoKitActivity"
36+
android:theme="@style/NoTitleTheme"
37+
android:exported="true">
38+
<intent-filter>
39+
<action android:name="android.intent.action.MAIN" />
40+
41+
<category android:name="android.intent.category.LAUNCHER" />
42+
</intent-filter>
43+
</activity>
3244
<activity
3345
android:name=".mc.NetMainActivity"
3446
android:exported="false" />
35-
<activity android:name=".WebViewNormalActivity" />
47+
<activity android:name=".WebViewSystemActivity" />
3648
<activity android:name=".WebViewX5Activity" />
37-
<activity android:name=".SecondActivity" />
38-
<activity android:name=".LeakActivity" />
39-
<activity android:name=".MapActivity" />
49+
<activity android:name=".EmptyActivity" />
50+
<activity android:name=".module.bigbitmap.BigBitmapActivity" />
51+
<activity android:name=".module.leak.LeakActivity" />
4052
<activity android:name=".mc.MCActivity" />
4153
<activity android:name="com.amap.api.navi.AmapRouteActivity" />
4254
<activity
4355
android:name=".comm.CommFragmentActivity"
44-
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> <!-- 高德定位服务 -->
56+
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
57+
<!-- 高德定位服务 -->
58+
59+
4560
<service android:name="com.amap.api.location.APSService" />
4661

4762
<meta-data
4863
android:name="com.amap.api.v2.apikey"
49-
android:value="11f9728ee0c2a141663fc4b784c42a33" /> <!-- 腾讯定位服务 -->
64+
android:value="11f9728ee0c2a141663fc4b784c42a33" />
65+
<!-- 腾讯定位服务 -->
5066
<meta-data
5167
android:name="TencentMapSDK"
52-
android:value="ECSBZ-ZDNCF-4K3J4-JNWQ2-TWW37-XOFNQ" /> <!-- 百度地图key -->
68+
android:value="ECSBZ-ZDNCF-4K3J4-JNWQ2-TWW37-XOFNQ" />
69+
<!-- 百度地图key -->
5370
<meta-data
5471
android:name="com.baidu.lbsapi.API_KEY"
55-
android:value="UhPZI3aQQ7un6RP8evAkXxFCtlvItawi" /> <!-- 百度地图定位服务 -->
72+
android:value="UhPZI3aQQ7un6RP8evAkXxFCtlvItawi" />
73+
<!-- 百度地图定位服务 -->
5674
<service
5775
android:name="com.baidu.location.f"
5876
android:enabled="true"
59-
android:process=":remote" /> <!-- Dokit targetApi为 29 Android Q时截屏的前台服务 -->
77+
android:process=":remote" />
78+
79+
<!-- Dokit targetApi为 29 Android Q时截屏的前台服务 -->
6080
<service
61-
android:name="com.didichuxing.doraemonkit.kit.colorpick.ScreenRecorderService"
81+
android:name=".test.ScreenRecordingService"
6282
android:enabled="true"
63-
android:foregroundServiceType="mediaProjection"
64-
tools:targetApi="q" />
83+
android:foregroundServiceType="mediaProjection" />
84+
6585
</application>
6686

6787
</manifest>

‎Android/app/src/main/java/com/didichuxing/doraemondemo/BaseStatusBarActivity.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.didichuxing.doraemondemo;
2+
3+
import android.app.Activity;
4+
import android.os.Build;
5+
import android.os.Bundle;
6+
import android.view.View;
7+
import android.view.WindowManager;
8+
9+
import androidx.annotation.Nullable;
10+
import androidx.appcompat.app.AppCompatActivity;
11+
12+
/**
13+
* didi Create on 2022/5/25 .
14+
* <p>
15+
* Copyright (c) 2022/5/25 by didiglobal.com.
16+
*
17+
* @author <a href="[email protected]">zhangjun</a>
18+
* @version 1.0
19+
* @Date 2022/5/25 5:55 下午
20+
* @Description 用一句话说明文件功能
21+
*/
22+
23+
public class BaseStatusBarActivity extends AppCompatActivity {
24+
25+
@Override
26+
protected void onCreate(@Nullable Bundle savedInstanceState) {
27+
super.onCreate(savedInstanceState);
28+
preUpdateStatusBar(this);
29+
}
30+
31+
32+
private void preUpdateStatusBar(Activity activity) {
33+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
34+
activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
35+
activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
36+
activity.getWindow().setStatusBarColor(getResources().getColor(R.color.colorPrimary));
37+
}
38+
}
39+
40+
private void setLightStatusBar() {
41+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
42+
getWindow().getDecorView().setSystemUiVisibility(
43+
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
44+
}
45+
}
46+
47+
private void setNotLightStatusBar() {
48+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
49+
getWindow().getDecorView().setSystemUiVisibility(
50+
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN );
51+
}
52+
}
53+
}

‎Android/app/src/main/java/com/didichuxing/doraemondemo/SecondActivity.kt renamed to ‎Android/app/src/main/java/com/didichuxing/doraemondemo/DataBaseActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import android.os.Bundle
44
import android.view.View
55
import androidx.appcompat.app.AppCompatActivity
66
import com.blankj.utilcode.util.ToastUtils
7-
import com.didichuxing.doraemondemo.db.room.PersonDBHelper
7+
import com.didichuxing.doraemondemo.db.PersonDBHelper
88
import kotlinx.coroutines.*
99

10-
class SecondActivity : AppCompatActivity() {
10+
class DataBaseActivity : AppCompatActivity() {
1111
companion object {
1212
val TAG = "SecondActivity"
1313
}
@@ -46,4 +46,4 @@ class SecondActivity : AppCompatActivity() {
4646
return true
4747
}
4848

49-
}
49+
}

‎Android/app/src/main/java/com/didichuxing/doraemondemo/EmptyActivity.kt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.didichuxing.doraemondemo
2+
3+
import android.os.Bundle
4+
import android.view.View
5+
import androidx.appcompat.app.AppCompatActivity
6+
import com.blankj.utilcode.util.ToastUtils
7+
import com.didichuxing.doraemondemo.db.PersonDBHelper
8+
import kotlinx.coroutines.*
9+
10+
class EmptyActivity : AppCompatActivity() {
11+
companion object {
12+
val TAG = "EmptyActivity"
13+
}
14+
15+
override fun onCreate(savedInstanceState: Bundle?) {
16+
super.onCreate(savedInstanceState)
17+
setContentView(R.layout.activity_empty)
18+
19+
}
20+
}

0 commit comments

Comments
 (0)