Skip to content

Commit 27f3ec7

Browse files
RealOnlyoneRealOnlyone
authored
Merge pull request didi#1038 from didi/feature/demo-reanlone-20220525
type:修改Demo样式
2 parents ef0c242 + bd34885 commit 27f3ec7

Some content is hidden

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

45 files changed

+1753
-366
lines changed

‎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/main/AndroidManifest.xml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,51 @@
3232
android:supportsRtl="true"
3333
android:theme="@style/AppTheme"
3434
tools:ignore="GoogleAppIndexingWarning">
35+
36+
<activity
37+
android:name=".MainDoKitActivity"
38+
android:theme="@style/NoTitleTheme">
39+
<intent-filter>
40+
<action android:name="android.intent.action.MAIN" />
41+
42+
<category android:name="android.intent.category.LAUNCHER" />
43+
</intent-filter>
44+
</activity>
3545
<activity
3646
android:name=".mc.NetMainActivity"
3747
android:exported="false" />
38-
<activity android:name=".WebViewNormalActivity" />
48+
<activity android:name=".WebViewSystemActivity" />
3949
<activity android:name=".WebViewX5Activity" />
40-
<activity android:name=".SecondActivity" />
41-
<activity android:name=".LeakActivity" />
42-
<activity android:name=".MapActivity" />
50+
<activity android:name=".EmptyActivity" />
51+
<activity android:name=".module.bigbitmap.BigBitmapActivity" />
52+
<activity android:name=".module.leak.LeakActivity" />
4353
<activity android:name=".mc.MCActivity" />
4454
<activity android:name="com.amap.api.navi.AmapRouteActivity" />
4555
<activity
4656
android:name=".comm.CommFragmentActivity"
47-
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> <!-- 高德定位服务 -->
57+
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
58+
<!-- 高德定位服务 -->
59+
60+
4861
<service android:name="com.amap.api.location.APSService" />
4962

5063
<meta-data
5164
android:name="com.amap.api.v2.apikey"
52-
android:value="11f9728ee0c2a141663fc4b784c42a33" /> <!-- 腾讯定位服务 -->
65+
android:value="11f9728ee0c2a141663fc4b784c42a33" />
66+
<!-- 腾讯定位服务 -->
5367
<meta-data
5468
android:name="TencentMapSDK"
55-
android:value="ECSBZ-ZDNCF-4K3J4-JNWQ2-TWW37-XOFNQ" /> <!-- 百度地图key -->
69+
android:value="ECSBZ-ZDNCF-4K3J4-JNWQ2-TWW37-XOFNQ" />
70+
<!-- 百度地图key -->
5671
<meta-data
5772
android:name="com.baidu.lbsapi.API_KEY"
58-
android:value="UhPZI3aQQ7un6RP8evAkXxFCtlvItawi" /> <!-- 百度地图定位服务 -->
73+
android:value="UhPZI3aQQ7un6RP8evAkXxFCtlvItawi" />
74+
<!-- 百度地图定位服务 -->
5975
<service
6076
android:name="com.baidu.location.f"
6177
android:enabled="true"
62-
android:process=":remote" /> <!-- Dokit targetApi为 29 Android Q时截屏的前台服务 -->
78+
android:process=":remote" />
79+
<!-- Dokit targetApi为 29 Android Q时截屏的前台服务 -->
6380
<service
6481
android:name="com.didichuxing.doraemonkit.kit.colorpick.ScreenRecorderService"
6582
android:enabled="true"

‎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+
}

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

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
package com.didichuxing.doraemondemo
2+
3+
import android.app.Activity
4+
import android.content.Intent
5+
import android.os.Bundle
6+
import android.util.Log
7+
import android.view.ViewGroup
8+
import androidx.core.view.children
9+
import com.didichuxing.doraemondemo.mc.MCActivity
10+
import com.didichuxing.doraemondemo.module.CrashTest
11+
import com.didichuxing.doraemondemo.module.DoKitItemView
12+
import com.didichuxing.doraemondemo.module.MethodCostTest
13+
import com.didichuxing.doraemondemo.module.bigbitmap.BigBitmapActivity
14+
import com.didichuxing.doraemondemo.module.db.DataBaseTest
15+
import com.didichuxing.doraemondemo.module.http.FileUploadTest
16+
import com.didichuxing.doraemondemo.module.http.OkHttpMock
17+
import com.didichuxing.doraemondemo.module.http.RetrofitMock
18+
import com.didichuxing.doraemondemo.module.http.URLConnectionMock
19+
import com.didichuxing.doraemondemo.module.leak.LeakActivity
20+
import com.didichuxing.doraemondemo.old.MainDebugActivityOkhttpV3
21+
import com.didichuxing.doraemonkit.DoKit
22+
import com.didichuxing.doraemonkit.util.ToastUtils
23+
24+
25+
/**
26+
* didi Create on 2022/5/25 .
27+
*
28+
* Copyright (c) 2022/5/25 by didiglobal.com.
29+
*
30+
* @author <a href="[email protected]">zhangjun</a>
31+
* @version 1.0
32+
* @Date 2022/5/25 6:05 下午
33+
* @Description 用一句话说明文件功能
34+
*/
35+
36+
class MainDoKitActivity : BaseStatusBarActivity() {
37+
38+
39+
override fun onCreate(savedInstanceState: Bundle?) {
40+
super.onCreate(savedInstanceState)
41+
setContentView(R.layout.activity_dokit_main)
42+
val all: ViewGroup = findViewById<ViewGroup>(R.id.all)
43+
44+
all.children.forEach {
45+
if (it is DoKitItemView) {
46+
val item = it as DoKitItemView
47+
item.setOnClickListener {
48+
onItemClick(item, item.itemText)
49+
}
50+
}
51+
}
52+
}
53+
54+
55+
private fun onItemClick(itemView: DoKitItemView, text: String) {
56+
Log.i("TEST", "onItemClick :$text")
57+
when (text) {
58+
//工具入口
59+
"显示/隐藏快捷入口" -> {
60+
showHideDoKit();
61+
}
62+
"打开工具窗口" -> {
63+
DoKit.showToolPanel()
64+
}
65+
//平台工具
66+
"数据Mock测试" -> {
67+
startActivity(Intent(this, EmptyActivity::class.java))
68+
}
69+
"OkHttp 模拟请求" -> {
70+
OkHttpMock.test()
71+
}
72+
"UrlConnection 模拟请求" -> {
73+
URLConnectionMock.get("https://wanandroid.com/user_article/list/0/json")
74+
}
75+
"retrofit 模拟请求" -> {
76+
RetrofitMock.test()
77+
}
78+
"一机多控测试" -> {
79+
startActivity(Intent(this, MCActivity::class.java))
80+
}
81+
"自动化测试" -> {
82+
startActivity(Intent(this, MCActivity::class.java))
83+
}
84+
85+
//常用工具
86+
"日志测试" -> {
87+
startActivity(Intent(this, EmptyActivity::class.java))
88+
}
89+
"跳转其他Activity" -> {
90+
startActivity(Intent(this, EmptyActivity::class.java))
91+
}
92+
93+
"系统:WebView" -> {
94+
startActivity(Intent(this, WebViewSystemActivity::class.java))
95+
}
96+
"X5:WebView" -> {
97+
startActivity(Intent(this, WebViewX5Activity::class.java))
98+
}
99+
100+
//LBS
101+
"位置模拟" -> {
102+
startActivity(Intent(this, EmptyActivity::class.java))
103+
}
104+
"路径模拟" -> {
105+
startActivity(Intent(this, EmptyActivity::class.java))
106+
}
107+
108+
//性能工具
109+
"模拟内存泄漏" -> {
110+
startActivity(Intent(this, LeakActivity::class.java))
111+
}
112+
113+
"模拟耗时函数调用" -> {
114+
MethodCostTest.test()
115+
}
116+
117+
"崩溃模拟" -> {
118+
CrashTest.test()
119+
}
120+
121+
"创建数据库" -> {
122+
DataBaseTest.test()
123+
}
124+
"文件上传模拟" -> {
125+
FileUploadTest.requestByFile(getActivity(), filesDir, true)
126+
}
127+
"文件下载模拟" -> {
128+
FileUploadTest.requestByFile(getActivity(), filesDir, false)
129+
}
130+
"大图检测模拟" -> {
131+
startActivity(Intent(this, BigBitmapActivity::class.java))
132+
}
133+
//视觉工具
134+
"取色器测试" -> {
135+
startActivity(Intent(this, EmptyActivity::class.java))
136+
}
137+
"标尺对齐测试" -> {
138+
startActivity(Intent(this, EmptyActivity::class.java))
139+
}
140+
141+
//其他工具
142+
"旧版页面入口" -> {
143+
startActivity(Intent(this, MainDebugActivityOkhttpV3::class.java))
144+
}
145+
else -> {
146+
ToastUtils.showShort("$text")
147+
}
148+
149+
}
150+
}
151+
152+
153+
private fun getActivity(): Activity {
154+
return this
155+
}
156+
157+
private fun showHideDoKit() {
158+
if (DoKit.isMainIconShow) {
159+
DoKit.hide()
160+
} else {
161+
DoKit.show()
162+
}
163+
}
164+
165+
}

‎Android/app/src/main/java/com/didichuxing/doraemondemo/WebViewNormalActivity.kt renamed to ‎Android/app/src/main/java/com/didichuxing/doraemondemo/WebViewSystemActivity.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import androidx.appcompat.app.AppCompatActivity
1111
/**
1212
* Created by jintai on 2018/11/13.
1313
*/
14-
class WebViewNormalActivity : AppCompatActivity() {
14+
class WebViewSystemActivity : AppCompatActivity() {
15+
1516
val TAG = "WebViewActivity"
1617
lateinit var mWebView: WebView
17-
val url = "https://jtsky.gitee.io/dokit-mock/index.html"
18+
val url = "https://xingyun.xiaojukeji.com/docs/dokit"
1819

1920
override fun onCreate(savedInstanceState: Bundle?) {
2021
super.onCreate(savedInstanceState)
@@ -40,7 +41,7 @@ class WebViewNormalActivity : AppCompatActivity() {
4041
webSettings.domStorageEnabled = true
4142
webSettings.cacheMode = WebSettings.LOAD_DEFAULT
4243
webSettings.javaScriptCanOpenWindowsAutomatically = false
43-
// webSettings.allowFileAccessFromFileURLs = true
44+
webSettings.allowFileAccessFromFileURLs = true
4445
webSettings.allowUniversalAccessFromFileURLs = true
4546

4647
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
@@ -82,12 +83,12 @@ class WebViewNormalActivity : AppCompatActivity() {
8283
val sourceID = consoleMessage.sourceId()
8384
val messageLevel = consoleMessage.message()
8485

85-
// Log.i(
86-
// TAG, String.format(
87-
// "[%s] sourceID: %s lineNumber: %n message: %s",
88-
// messageLevel, sourceID, lineNumber, message
89-
// )
90-
// )
86+
Log.i(
87+
TAG, String.format(
88+
"[%s] sourceID: %s lineNumber: %n message: %s",
89+
messageLevel, sourceID, lineNumber, message
90+
)
91+
)
9192

9293
//Log.i(TAG, "consoleMessage===>${consoleMessage?.message()}")
9394
return super.onConsoleMessage(consoleMessage)
@@ -104,4 +105,4 @@ class WebViewNormalActivity : AppCompatActivity() {
104105
}
105106
}
106107

107-
}
108+
}

0 commit comments

Comments
 (0)