Skip to content

Commit ff50f19

Browse files
committed
feat: 修改DoKitView 的自动化测试支持
1 parent d811d2f commit ff50f19

File tree

126 files changed

+1089
-1134
lines changed

Some content is hidden

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

126 files changed

+1089
-1134
lines changed

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

Lines changed: 2 additions & 2 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;
13+
import com.didichuxing.doraemondemo.dokit.SimpleDoKitView;
1414
import com.didichuxing.doraemonkit.kit.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.widget.TextView;
99

1010
import com.didichuxing.doraemondemo.R;
11-
import com.didichuxing.doraemondemo.dokit.SimpleDokitView;
11+
import com.didichuxing.doraemondemo.dokit.SimpleDoKitView;
1212
import com.didichuxing.doraemonkit.kit.lbs.common.LocInfo;
1313
import com.didichuxing.doraemonkit.kit.lbs.manual.FloatGpsMockCache;
1414
import com.didichuxing.doraemonkit.kit.lbs.preset.FloatGpsPresetMockCache;
@@ -17,7 +17,7 @@
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/java/com/didichuxing/doraemondemo/dokit/CustomDokitFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import android.view.View
55
import android.widget.CompoundButton
66
import com.didichuxing.doraemondemo.R
77
import com.didichuxing.doraemonkit.DoKit
8-
import com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
8+
import com.didichuxing.doraemonkit.kit.core.AbsDoKitFragment
99

1010
/**
1111
* @Author: changzuozhen
1212
* @Date: 2020-12-22
1313
* 切换全屏与否只需要调整继承关系即可
1414
* @see CustomDokitFragment
1515
*
16-
* @see TestSimpleDokitFloatView
16+
* @see TestSimpleDoKitFloatView
1717
*
1818
*
1919
* 悬浮窗,支持折叠
@@ -24,11 +24,11 @@ import com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
2424
*
2525
* 全屏页面
2626
*
27-
* @see com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
27+
* @see com.didichuxing.doraemonkit.kit.core.AbsDoKitFragment
2828
* 启动工具函数
2929
*
3030
*/
31-
class CustomDokitFragment : AbsDokitFragment() {
31+
class CustomDokitFragment : AbsDoKitFragment() {
3232
override fun onViewCreated(rootView: View?) {
3333
super.onViewCreated(view)
3434
ViewSetupHelper.setupButton(rootView, R.id.test1, "TestSimpleDokitFragment") { v: View? ->
@@ -63,4 +63,4 @@ class CustomDokitFragment : AbsDokitFragment() {
6363
override fun initTitle(): String {
6464
return "我是自定义页面"
6565
}
66-
}
66+
}

Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/DemoDokitView.kt renamed to Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/DemoDoKitView.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import android.widget.FrameLayout
88
import android.widget.TextView
99
import com.didichuxing.doraemondemo.R
1010
import com.didichuxing.doraemonkit.DoKit
11-
import com.didichuxing.doraemonkit.kit.core.AbsDokitView
12-
import com.didichuxing.doraemonkit.kit.core.DokitViewLayoutParams
11+
import com.didichuxing.doraemonkit.kit.core.AbsDoKitView
12+
import com.didichuxing.doraemonkit.kit.core.DoKitViewLayoutParams
1313

1414
/**
1515
* ================================================
@@ -20,7 +20,7 @@ import com.didichuxing.doraemonkit.kit.core.DokitViewLayoutParams
2020
* 修订历史:
2121
* ================================================
2222
*/
23-
class DemoDokitView : AbsDokitView() {
23+
class DemoDoKitView : AbsDoKitView() {
2424
override fun onCreate(context: Context) {}
2525
override fun onCreateView(context: Context, rootView: FrameLayout): View {
2626
return LayoutInflater.from(context).inflate(R.layout.dk_demo, rootView, false)
@@ -30,18 +30,18 @@ class DemoDokitView : AbsDokitView() {
3030

3131
val tvClose = findViewById<TextView>(R.id.tv_close)
3232
tvClose?.setOnClickListener {
33-
DoKit.removeFloating(DemoDokitView::class)
33+
DoKit.removeFloating(DemoDoKitView::class)
3434
}
3535
}
3636

3737

38-
override fun initDokitViewLayoutParams(params: DokitViewLayoutParams) {
39-
params.width = DokitViewLayoutParams.WRAP_CONTENT
40-
params.height = DokitViewLayoutParams.WRAP_CONTENT
38+
override fun initDokitViewLayoutParams(params: DoKitViewLayoutParams) {
39+
params.width = DoKitViewLayoutParams.WRAP_CONTENT
40+
params.height = DoKitViewLayoutParams.WRAP_CONTENT
4141
params.gravity = Gravity.TOP or Gravity.LEFT
4242
params.x = 200
4343
params.y = 200
4444
}
4545

4646

47-
}
47+
}

Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/DemoKit.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ class DemoKit : AbstractKit() {
2525
get() = R.mipmap.dk_sys_info
2626

2727
override fun onClickWithReturn(activity: Activity): Boolean {
28-
DoKit.launchFloating(DemoDokitView::class.java)
28+
DoKit.launchFloating(DemoDoKitView::class.java)
2929
return true
3030
}
3131

3232
override fun onAppInit(context: Context?) {
3333
}
3434

35-
}
35+
}

Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/SimpleDokitView.java renamed to Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/SimpleDoKitView.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
import com.blankj.utilcode.util.ConvertUtils;
1616
import com.didichuxing.doraemondemo.R;
1717
import com.didichuxing.doraemonkit.DoKit;
18-
import com.didichuxing.doraemonkit.kit.core.AbsDokitView;
19-
import com.didichuxing.doraemonkit.kit.core.DokitViewLayoutParams;
18+
import com.didichuxing.doraemonkit.kit.core.AbsDoKitView;
19+
import com.didichuxing.doraemonkit.kit.core.DoKitViewLayoutParams;
2020

2121
/**
2222
* @Author: changzuozhen
2323
* @Date: 2020-12-22
2424
* <p>
2525
* 悬浮窗,支持折叠
26-
* @see SimpleDokitView
26+
* @see SimpleDoKitView
2727
* 启动工具函数
2828
*/
29-
public abstract class SimpleDokitView extends AbsDokitView {
29+
public abstract class SimpleDoKitView extends AbsDoKitView {
3030
private static final String TAG = "SimpleBaseFloatPage";
3131
int mWidth;
3232
int mHeight;
@@ -92,9 +92,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
9292

9393

9494
@Override
95-
public void initDokitViewLayoutParams(DokitViewLayoutParams params) {
96-
params.width = DokitViewLayoutParams.WRAP_CONTENT;
97-
params.height = DokitViewLayoutParams.WRAP_CONTENT;
95+
public void initDokitViewLayoutParams(DoKitViewLayoutParams params) {
96+
params.width = DoKitViewLayoutParams.WRAP_CONTENT;
97+
params.height = DoKitViewLayoutParams.WRAP_CONTENT;
9898
params.gravity = Gravity.TOP | Gravity.LEFT;
9999
params.x = 200;
100100
params.y = 200;
@@ -115,4 +115,4 @@ protected void initView() {
115115
}
116116

117117

118-
}
118+
}

Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/TestSimpleDokitFloatView.kt renamed to Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/TestSimpleDoKitFloatView.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ import com.didichuxing.doraemonkit.DoKit
1313
* @Date: 2020-12-22
1414
* 切换全屏与否只需要调整继承关系即可
1515
* @see CustomDokitFragment
16-
* @see TestSimpleDokitFloatView
16+
* @see TestSimpleDoKitFloatView
1717
*
1818
* 悬浮窗,支持折叠
1919
* @see com.didichuxing.doraemonkit.kit.core.SimpleDokitView
2020
* 启动工具函数
2121
*
2222
* 全屏页面
23-
* @see com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
23+
* @see com.didichuxing.doraemonkit.kit.core.AbsDoKitFragment
2424
* 启动工具函数
2525
*
2626
*/
27-
class TestSimpleDokitFloatView : SimpleDokitView() {
27+
class TestSimpleDoKitFloatView : SimpleDoKitView() {
2828
override fun getLayoutId(): Int {
2929
return R.layout.layout_demo_custom
3030
}
@@ -48,4 +48,4 @@ class TestSimpleDokitFloatView : SimpleDokitView() {
4848
}
4949

5050

51-
}
51+
}

Android/app/src/main/java/com/didichuxing/doraemondemo/dokit/TestSimpleDokitFloatViewKit.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ class TestSimpleDokitFloatViewKit : AbstractKit() {
2323
}
2424

2525
override fun onClickWithReturn(activity: Activity): Boolean {
26-
DoKit.launchFloating(TestSimpleDokitFloatView::class.java)
26+
DoKit.launchFloating(TestSimpleDoKitFloatView::class.java)
2727
return true
2828
}
2929

3030
override fun onAppInit(context: Context?) {
3131
}
32-
}
32+
}

Android/app/src/main/java/com/didichuxing/doraemondemo/test/screen/ScreenRecordingDoKitView.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import android.widget.FrameLayout
99
import android.widget.ImageView
1010
import com.didichuxing.doraemondemo.R
1111
import com.didichuxing.doraemondemo.test.ScreenRecordingService
12-
import com.didichuxing.doraemonkit.kit.core.AbsDokitView
13-
import com.didichuxing.doraemonkit.kit.core.DokitViewLayoutParams
12+
import com.didichuxing.doraemonkit.kit.core.AbsDoKitView
13+
import com.didichuxing.doraemonkit.kit.core.DoKitViewLayoutParams
1414
import com.didichuxing.doraemonkit.kit.test.widget.FlashImageView
1515
import com.didichuxing.doraemonkit.util.ConvertUtils
1616
import com.didichuxing.doraemonkit.util.ToastUtils
@@ -32,7 +32,7 @@ import kotlinx.coroutines.plus
3232
* @Description 用一句话说明文件功能
3333
*/
3434

35-
class ScreenRecordingDoKitView : AbsDokitView() {
35+
class ScreenRecordingDoKitView : AbsDoKitView() {
3636

3737
companion object {
3838
private val mainScope = MainScope() + CoroutineName(this.toString())
@@ -85,7 +85,7 @@ class ScreenRecordingDoKitView : AbsDokitView() {
8585
}
8686

8787

88-
override fun initDokitViewLayoutParams(params: DokitViewLayoutParams) {
88+
override fun initDokitViewLayoutParams(params: DoKitViewLayoutParams) {
8989
params.width = UIUtils.getWidthPixels() / 2
9090
params.height = UIUtils.getRealHeightPixels() / 2
9191
params.gravity = Gravity.TOP or Gravity.LEFT

Android/config.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ext {
33
//0:发布到到本地localRepoURL仓库
44
//1:发布到滴滴内部仓库 一般不建议使用 如果需要发布到滴滴内网仓库需要将版本号改得比较大 假如版本号跟jcenter上的一致会由于缓存导致没法下载最新的jcenter的线上代码
55
//2:发布到maven_central远程仓库
6-
archives_type: 1,
6+
archives_type: 0,
77
//0:依赖dokit本地module运行
88
//1:依赖dokit远程aar运行
99
run_type : 0,
@@ -13,7 +13,7 @@ ext {
1313
//是否使用本地仓库,需要使用绝对路径,仓库地址在 local.properties 中添加 LOCAL_REPOSITORY_URL
1414
use_local : true,
1515
group_id : 'io.github.didi.dokit',
16-
version : '3.6.0.9'
16+
version : '3.6.0.17'
1717

1818
]
1919

0 commit comments

Comments
 (0)