Merge branch 'feature/autotest-reanlone-20220414' into feature/autotest-reanlone-3.6.10

# Conflicts:
#	Android/config.gradle
#	Android/dokit/src/main/res/layout/dk_item_connect_address.xml
#	Android/dokit_module.json

Author: RealOnlyone

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

@@ -10,10 +10,10 @@
 import android.widget.TextView;
 
 import com.didichuxing.doraemondemo.R;
-import com.didichuxing.doraemondemo.dokit.SimpleDokitView;
+import com.didichuxing.doraemondemo.dokit.SimpleDoKitView;
 import com.didichuxing.doraemonkit.kit.lbs.route.FloatGpsRouteMockCache;
 
-public class FloatGpsMockRouteKitView extends SimpleDokitView {
+public class FloatGpsMockRouteKitView extends SimpleDoKitView {
     public static final String TAG = "FloatGpsMockRoutKitView";
     private View mRootView;
     private static int sMockSpeed = 10;

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

@@ -8,7 +8,7 @@
 import android.widget.TextView;
 
 import com.didichuxing.doraemondemo.R;
-import com.didichuxing.doraemondemo.dokit.SimpleDokitView;
+import com.didichuxing.doraemondemo.dokit.SimpleDoKitView;
 import com.didichuxing.doraemonkit.kit.lbs.common.LocInfo;
 import com.didichuxing.doraemonkit.kit.lbs.manual.FloatGpsMockCache;
 import com.didichuxing.doraemonkit.kit.lbs.preset.FloatGpsPresetMockCache;
@@ -17,7 +17,7 @@
 
 import java.util.ArrayList;
 
-public class FloatGpsPresetMockKitView extends SimpleDokitView {
+public class FloatGpsPresetMockKitView extends SimpleDoKitView {
     public static final String TAG = "FloatGpsPresetMockKitView";
     private View mRootView;
 

Android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,9 @@
 
     <dist:module dist:instant="true" />
 
+    <uses-permission
+        android:name="android.permission.READ_FRAME_BUFFER"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" /> <!-- tencent Android Q新增权限，允许应用在后台发起定位，如应用target为Q，请添加此权限 -->
@@ -62,6 +65,12 @@
             android:enabled="true"
             android:foregroundServiceType="mediaProjection"
             tools:targetApi="q" />
+
+        <service
+            android:name=".test.ScreenRecordingService"
+            android:enabled="true"
+            android:foregroundServiceType="mediaProjection" />
+
     </application>
 
 </manifest>

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

@@ -5,15 +5,15 @@ import android.view.View
 import android.widget.CompoundButton
 import com.didichuxing.doraemondemo.R
 import com.didichuxing.doraemonkit.DoKit
-import com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
+import com.didichuxing.doraemonkit.kit.core.AbsDoKitFragment
 
 /**
  * @Author: changzuozhen
  * @Date: 2020-12-22
  * 切换全屏与否只需要调整继承关系即可
  * @see CustomDokitFragment
  *
- * @see TestSimpleDokitFloatView
+ * @see TestSimpleDoKitFloatView
  *
  *
  * 悬浮窗，支持折叠
@@ -24,11 +24,11 @@ import com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
  *
  * 全屏页面
  *
- * @see com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
+ * @see com.didichuxing.doraemonkit.kit.core.AbsDoKitFragment
  * 启动工具函数
  *
  */
-class CustomDokitFragment : AbsDokitFragment() {
+class CustomDokitFragment : AbsDoKitFragment() {
     override fun onViewCreated(rootView: View?) {
         super.onViewCreated(view)
         ViewSetupHelper.setupButton(rootView, R.id.test1, "TestSimpleDokitFragment") { v: View? ->
@@ -63,4 +63,4 @@ class CustomDokitFragment : AbsDokitFragment() {
     override fun initTitle(): String {
         return "我是自定义页面"
     }
-}
+}

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

@@ -8,8 +8,8 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import com.didichuxing.doraemondemo.R
 import com.didichuxing.doraemonkit.DoKit
-import com.didichuxing.doraemonkit.kit.core.AbsDokitView
-import com.didichuxing.doraemonkit.kit.core.DokitViewLayoutParams
+import com.didichuxing.doraemonkit.kit.core.AbsDoKitView
+import com.didichuxing.doraemonkit.kit.core.DoKitViewLayoutParams
 
 /**
  * ================================================
@@ -20,7 +20,7 @@ import com.didichuxing.doraemonkit.kit.core.DokitViewLayoutParams
  * 修订历史：
  * ================================================
  */
-class DemoDokitView : AbsDokitView() {
+class DemoDoKitView : AbsDoKitView() {
     override fun onCreate(context: Context) {}
     override fun onCreateView(context: Context, rootView: FrameLayout): View {
         return LayoutInflater.from(context).inflate(R.layout.dk_demo, rootView, false)
@@ -30,18 +30,18 @@ class DemoDokitView : AbsDokitView() {
 
         val tvClose = findViewById<TextView>(R.id.tv_close)
         tvClose?.setOnClickListener {
-            DoKit.removeFloating(DemoDokitView::class)
+            DoKit.removeFloating(DemoDoKitView::class)
         }
     }
 
 
-    override fun initDokitViewLayoutParams(params: DokitViewLayoutParams) {
-        params.width = DokitViewLayoutParams.WRAP_CONTENT
-        params.height = DokitViewLayoutParams.WRAP_CONTENT
+    override fun initDokitViewLayoutParams(params: DoKitViewLayoutParams) {
+        params.width = DoKitViewLayoutParams.WRAP_CONTENT
+        params.height = DoKitViewLayoutParams.WRAP_CONTENT
         params.gravity = Gravity.TOP or Gravity.LEFT
         params.x = 200
         params.y = 200
     }
 
 
-}
+}

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

@@ -25,11 +25,11 @@ class DemoKit : AbstractKit() {
         get() = R.mipmap.dk_sys_info
 
     override fun onClickWithReturn(activity: Activity): Boolean {
-        DoKit.launchFloating(DemoDokitView::class.java)
+        DoKit.launchFloating(DemoDoKitView::class.java)
         return true
     }
 
     override fun onAppInit(context: Context?) {
     }
 
-}
+}

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

@@ -15,18 +15,18 @@
 import com.blankj.utilcode.util.ConvertUtils;
 import com.didichuxing.doraemondemo.R;
 import com.didichuxing.doraemonkit.DoKit;
-import com.didichuxing.doraemonkit.kit.core.AbsDokitView;
-import com.didichuxing.doraemonkit.kit.core.DokitViewLayoutParams;
+import com.didichuxing.doraemonkit.kit.core.AbsDoKitView;
+import com.didichuxing.doraemonkit.kit.core.DoKitViewLayoutParams;
 
 /**
  * @Author: changzuozhen
  * @Date: 2020-12-22
  * <p>
  * 悬浮窗，支持折叠
- * @see SimpleDokitView
+ * @see SimpleDoKitView
  * 启动工具函数
  */
-public abstract class SimpleDokitView extends AbsDokitView {
+public abstract class SimpleDoKitView extends AbsDoKitView {
     private static final String TAG = "SimpleBaseFloatPage";
     int mWidth;
     int mHeight;
@@ -92,9 +92,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
 
     @Override
-    public void initDokitViewLayoutParams(DokitViewLayoutParams params) {
-        params.width = DokitViewLayoutParams.WRAP_CONTENT;
-        params.height = DokitViewLayoutParams.WRAP_CONTENT;
+    public void initDokitViewLayoutParams(DoKitViewLayoutParams params) {
+        params.width = DoKitViewLayoutParams.WRAP_CONTENT;
+        params.height = DoKitViewLayoutParams.WRAP_CONTENT;
         params.gravity = Gravity.TOP | Gravity.LEFT;
         params.x = 200;
         params.y = 200;
@@ -115,4 +115,4 @@ protected void initView() {
     }
 
 
-}
+}

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

@@ -13,18 +13,18 @@ import com.didichuxing.doraemonkit.DoKit
  * @Date: 2020-12-22
  * 切换全屏与否只需要调整继承关系即可
  * @see CustomDokitFragment
- * @see TestSimpleDokitFloatView
+ * @see TestSimpleDoKitFloatView
  *
  * 悬浮窗，支持折叠
  * @see com.didichuxing.doraemonkit.kit.core.SimpleDokitView
  * 启动工具函数
  *
  * 全屏页面
- * @see com.didichuxing.doraemonkit.kit.core.AbsDokitFragment
+ * @see com.didichuxing.doraemonkit.kit.core.AbsDoKitFragment
  * 启动工具函数
  *
  */
-class TestSimpleDokitFloatView : SimpleDokitView() {
+class TestSimpleDoKitFloatView : SimpleDoKitView() {
     override fun getLayoutId(): Int {
         return R.layout.layout_demo_custom
     }
@@ -48,4 +48,4 @@ class TestSimpleDokitFloatView : SimpleDokitView() {
     }
 
 
-}
+}

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

@@ -23,10 +23,10 @@ class TestSimpleDokitFloatViewKit : AbstractKit() {
     }
 
     override fun onClickWithReturn(activity: Activity): Boolean {
-        DoKit.launchFloating(TestSimpleDokitFloatView::class.java)
+        DoKit.launchFloating(TestSimpleDoKitFloatView::class.java)
         return true
     }
 
     override fun onAppInit(context: Context?) {
     }
-}
+}

Android/app/src/main/java/com/didichuxing/doraemondemo/mc/MCActivity.kt

@@ -13,16 +13,29 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
 import com.blankj.utilcode.util.ToastUtils
 import com.didichuxing.doraemondemo.R
+import com.didichuxing.doraemondemo.test.ScreenRecordingTest
 import com.didichuxing.doraemonkit.DoKit
+import com.didichuxing.doraemonkit.constant.BundleKey
+import com.didichuxing.doraemonkit.kit.fileexplorer.ImageDetailFragment
+import com.didichuxing.doraemonkit.kit.test.report.ScreenShotManager
+import java.io.File
 
 /**
  * 一机多控Demo Activity
  */
 class MCActivity : AppCompatActivity() {
-    val TAG = "MCActivity"
+
+    companion object {
+        private const val TAG = "MCActivity"
+    }
 
     lateinit var mAdapter: RVAdapter
 
+    private val screenShotManager = ScreenShotManager("test/kk")
+
+    private val screenRecordingTest = ScreenRecordingTest()
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_mc)
@@ -35,24 +48,39 @@ class MCActivity : AppCompatActivity() {
             startActivity(Intent(this, WebViewActivity::class.java))
         }
 
+        findViewById<Button>(R.id.testPage).setOnClickListener {
+            startScreenShot()
+        }
+
+        findViewById<Button>(R.id.screenPage).setOnClickListener {
+            screenRecordingTest.start(this)
+        }
+
+
+
         findViewById<SlideBar>(R.id.unlock_bar).setOnUnlockListener(object :
             SlideBar.OnUnlockListener {
             override fun onUnlock(view: View?) {
                 DoKit.sendCustomEvent(
                     "un_lock",
                     view,
-                    mapOf("unlock" to "custom unlock")
+                    mapOf(
+                        "unlock" to "custom unlock",
+                        "testRecording" to "true"
+                    )
                 )
             }
 
             override fun progress(view: View?, leftMargin: Int) {
                 DoKit.sendCustomEvent(
                     "lock_process",
                     view,
-                    mapOf("progress" to "$leftMargin")
+                    mapOf(
+                        "progress" to "$leftMargin",
+                        "testRecording" to "false"
+                    )
                 )
             }
-
         })
 
         val spinner = findViewById<Spinner>(R.id.spinner)
@@ -107,6 +135,17 @@ class MCActivity : AppCompatActivity() {
 
     }
 
+
+    private fun startScreenShot() {
+        val map = screenShotManager.screenshotBitmap()
+        val fileName = screenShotManager.createNextFileName()
+        screenShotManager.saveBitmap(map, fileName)
+        val bundle = Bundle()
+        bundle.putSerializable(BundleKey.FILE_KEY, File(screenShotManager.getScreenFile(fileName)))
+        DoKit.launchFullScreen(ImageDetailFragment::class.java, this, bundle, false)
+    }
+
+
     private fun initData() {
 
         val rvDatas = mutableListOf<String>()
@@ -161,4 +200,8 @@ class MCActivity : AppCompatActivity() {
     }
 
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        screenRecordingTest.onActivityResult(requestCode, resultCode, data)
+    }
 }