Merge pull request #1006 from didi/feature/reanlone_mc_001

Feature/reanlone mc 001

Author: RealOnlyone

Android/README.md

@@ -480,6 +480,8 @@ public class DoKit private constructor() {
     }
 }
 ```
+开启插件调试
+./gradlew :app:assembleDebug -Dorg.gradle.daemon=false -Dorg.gradle.debug=true
 
 
 #### 5. FAQ

Android/app/build.gradle

@@ -145,6 +145,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation project(path: ':dokit-util')
+    implementation project(path: ':dokit-mc')
+    implementation project(path: ':dokit-autotest')
+    implementation project(path: ':dokit-test')
+
     testImplementation rootProject.ext.dependencies["junit"]
     implementation rootProject.ext.dependencies["constraintLayout"]
     implementation rootProject.ext.dependencies["multidex"]
@@ -212,6 +218,8 @@ dependencies {
     debugImplementation rootProject.ext.dependencies["leakcanary_android"]
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation project(":dokit-pthread-hook")
+
+    implementation rootProject.ext.dependencies["epic"]
 }
 
 

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

@@ -19,6 +19,7 @@ import com.didichuxing.doraemonkit.kit.AbstractKit
 import com.didichuxing.doraemonkit.kit.core.McClientProcessor
 import com.didichuxing.doraemonkit.kit.network.bean.NetworkRecord
 import com.didichuxing.doraemonkit.kit.network.okhttp.interceptor.DokitExtInterceptor
+import com.didichuxing.doraemonkit.util.LogUtils
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipelineConfig
 import com.lzy.okgo.OkGo
@@ -144,6 +145,32 @@ class App : Application() {
 
         //严格检查模式
         //StrictMode.enableDefaults();
+
+        com.didichuxing.doraemonkit.util.LogUtils.getConfig()
+            .setLogSwitch(true)
+            // 设置是否输出到控制台开关，默认开
+            .setConsoleSwitch(true)
+            // 设置 log 全局标签，默认为空，当全局标签不为空时，我们输出的 log 全部为该 tag， 为空时，如果传入的 tag 为空那就显示类名，否则显示 tag
+            .setGlobalTag("Dokit")
+            // 设置 log 头信息开关，默认为开
+            .setLogHeadSwitch(true)
+            // 打印 log 时是否存到文件的开关，默认关
+            .setLog2FileSwitch(false)
+            // 当自定义路径为空时，写入应用的/cache/log/目录中
+            .setDir("")
+            // 当文件前缀为空时，默认为"util"，即写入文件为"util-MM-dd.txt"
+            .setFilePrefix("djx-table-log")
+            // 输出日志是否带边框开关，默认开
+            .setBorderSwitch(true)
+            // 一条日志仅输出一条，默认开，为美化 AS 3.1 的 Logcat
+            .setSingleTagSwitch(false)
+            // log 的控制台过滤器，和 logcat 过滤器同理，默认 Verbose
+            .setConsoleFilter(LogUtils.V)
+            // log 文件过滤器，和 logcat 过滤器同理，默认 Verbose
+            .setFileFilter(LogUtils.E)
+            // log 栈深度，默认为 1
+            .setStackDeep(1)
+            .stackOffset = 1
     }
 
     override fun attachBaseContext(base: Context) {
@@ -155,4 +182,4 @@ class App : Application() {
         private const val TAG = "App"
         var leakActivity: Activity? = null
     }
-}
+}

Android/app/src/main/AndroidManifest.xml

@@ -8,32 +8,18 @@
 
     <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，请添加此权限 -->
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <!-- tencent 如果设置了target >= 28 如果需要启动后台定位则必须声明这个权限-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-    <!--用于进行网络定位-->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <!--用于访问GPS定位-->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!--用于获取运营商信息，用于支持提供运营商信息相关的接口-->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!--用于访问wifi网络信息，wifi信息会用于进行网络定位-->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <!--用于获取wifi的获取权限，wifi信息会用来进行网络定位-->
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!--用于读取手机当前的状态-->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!--用于写入缓存数据到扩展存储卡-->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!--用于申请调用A-GPS模块-->
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- tencent Android Q新增权限，允许应用在后台发起定位，如应用target为Q，请添加此权限 -->
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- tencent 如果设置了target >= 28 如果需要启动后台定位则必须声明这个权限 -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 用于进行网络定位 -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- 用于访问GPS定位 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 用于获取运营商信息，用于支持提供运营商信息相关的接口 -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 用于访问wifi网络信息，wifi信息会用于进行网络定位 -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 用于获取wifi的获取权限，wifi信息会用来进行网络定位 -->
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- 用于读取手机当前的状态 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 用于写入缓存数据到扩展存储卡 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 用于申请调用A-GPS模块 -->
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
 
-
-    <!-- https://blog.csdn.net/CHS007chs/article/details/85849625
-       tools:replace="android:allowBackup,android:label"-->
     <application
         android:name=".App"
         android:allowBackup="false"
@@ -43,7 +29,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-
+        <activity
+            android:name=".mc.NetMainActivity"
+            android:exported="false" />
         <activity android:name=".WebViewNormalActivity" />
         <activity android:name=".WebViewX5Activity" />
         <activity android:name=".SecondActivity" />
@@ -53,35 +41,27 @@
         <activity android:name="com.amap.api.navi.AmapRouteActivity" />
         <activity
             android:name=".comm.CommFragmentActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-        <!--高德定位服务-->
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> <!-- 高德定位服务 -->
         <service android:name="com.amap.api.location.APSService" />
 
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="11f9728ee0c2a141663fc4b784c42a33" />
-
-        <!--腾讯定位服务-->
+            android:value="11f9728ee0c2a141663fc4b784c42a33" /> <!-- 腾讯定位服务 -->
         <meta-data
             android:name="TencentMapSDK"
-            android:value="ECSBZ-ZDNCF-4K3J4-JNWQ2-TWW37-XOFNQ" />
-        <!--百度地图key-->
+            android:value="ECSBZ-ZDNCF-4K3J4-JNWQ2-TWW37-XOFNQ" /> <!-- 百度地图key -->
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
-            android:value="UhPZI3aQQ7un6RP8evAkXxFCtlvItawi" />
-        <!--百度地图定位服务-->
+            android:value="UhPZI3aQQ7un6RP8evAkXxFCtlvItawi" /> <!-- 百度地图定位服务 -->
         <service
             android:name="com.baidu.location.f"
             android:enabled="true"
-            android:process=":remote" />
-
-        <!-- Dokit targetApi为 29 Android Q时截屏的前台服务-->
+            android:process=":remote" /> <!-- Dokit targetApi为 29 Android Q时截屏的前台服务 -->
         <service
             android:name="com.didichuxing.doraemonkit.kit.colorpick.ScreenRecorderService"
             android:enabled="true"
             android:foregroundServiceType="mediaProjection"
             tools:targetApi="q" />
     </application>
 
-
 </manifest>

Android/app/src/main/java/com/didichuxing/doraemondemo/mc/FileUtils.java

@@ -0,0 +1,39 @@
+package com.didichuxing.doraemondemo.mc;
+
+import java.io.File;
+import java.io.InputStream;
+
+/**
+ * didi Create on 2022/3/17 .
+ * <p>
+ * Copyright (c) 2022/3/17 by didiglobal.com.
+ *
+ * @author <a href="[email protected]">zhangjun</a>
+ * @version 1.0
+ * @Date 2022/3/17 4:54 下午
+ * @Description 用一句话说明文件功能
+ */
+
+public class FileUtils {
+
+    /**
+     * 获取assets目录下的单个文件
+     * 这种方式只能用于webview加载
+     * 读取文件夹，直接取路径是不行的
+     *
+     * @param fileName 文件夹名
+     * @return File
+     */
+    public static File getFileFromAssetsFile(String fileName) {
+        String path = "file:///android_asset/" + fileName;
+        File file = new File(path);
+        return file;
+    }
+
+    public static String readString(InputStream inputStream) throws Exception {
+        int size = inputStream.available();
+        byte[] buffer = new byte[size];
+        inputStream.read(buffer, 0, size);
+        return new String(buffer);
+    }
+}

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

@@ -1,8 +1,10 @@
 package com.didichuxing.doraemondemo.mc
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.*
+import android.widget.AdapterView.OnItemSelectedListener
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -25,10 +27,13 @@ class MCActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_mc)
 
+        findViewById<Button>(R.id.nextPage).setOnClickListener {
+            startActivity(Intent(this, NetMainActivity::class.java))
+        }
 
-//        btn_webview.setOnClickListener {
-//            startActivity(Intent(this@MCActivity, WebViewActivity::class.java))
-//        }
+        findViewById<Button>(R.id.webPage).setOnClickListener {
+            startActivity(Intent(this, WebViewActivity::class.java))
+        }
 
         findViewById<SlideBar>(R.id.unlock_bar).setOnUnlockListener(object :
             SlideBar.OnUnlockListener {
@@ -50,6 +55,24 @@ class MCActivity : AppCompatActivity() {
 
         })
 
+        val spinner = findViewById<Spinner>(R.id.spinner)
+
+        val citis = resources.getStringArray(R.array.city);
+        val adapter = ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, citis)
+        //第三步：设置下拉列表下拉时的菜单样式
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.setAdapter(adapter)
+        spinner.prompt = "测试"
+
+        spinner.setOnItemSelectedListener(object : OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                ToastUtils.showShort("选择：" + citis[position])
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                ToastUtils.showShort("没有选择")
+            }
+        })
 
 
         findViewById<View>(R.id.btn1).setOnClickListener {
@@ -138,4 +161,4 @@ class MCActivity : AppCompatActivity() {
     }
 
 
-}
+}

Android/app/src/main/java/com/didichuxing/doraemondemo/mc/MyProxyWebView.java

@@ -0,0 +1,28 @@
+package com.didichuxing.doraemondemo.mc;
+
+import android.webkit.WebView;
+
+/**
+ * didi Create on 2022/3/22 .
+ * <p>
+ * Copyright (c) 2022/3/22 by didiglobal.com.
+ *
+ * @author <a href="[email protected]">zhangjun</a>
+ * @version 1.0
+ * @Date 2022/3/22 7:15 下午
+ * @Description 用一句话说明文件功能
+ */
+
+public class MyProxyWebView {
+
+
+    private WebView webView;
+
+    public MyProxyWebView(WebView webView) {
+        this.webView = webView;
+    }
+
+    public WebView getWebView() {
+        return webView;
+    }
+}

Android/app/src/main/java/com/didichuxing/doraemondemo/mc/MyTestWebView.java

@@ -0,0 +1,47 @@
+package com.didichuxing.doraemondemo.mc;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.webkit.WebView;
+
+import java.util.Map;
+
+/**
+ * didi Create on 2022/3/22 .
+ * <p>
+ * Copyright (c) 2022/3/22 by didiglobal.com.
+ *
+ * @author <a href="[email protected]">zhangjun</a>
+ * @version 1.0
+ * @Date 2022/3/22 3:56 下午
+ * @Description 用一句话说明文件功能
+ */
+
+public class MyTestWebView extends WebView {
+
+    public MyTestWebView(Context context) {
+        super(context);
+    }
+
+    public MyTestWebView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MyTestWebView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public MyTestWebView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    public void loadUrl(String url) {
+        super.loadUrl(url);
+    }
+
+    @Override
+    public void loadUrl(String url, Map<String, String> additionalHttpHeaders) {
+        super.loadUrl(url, additionalHttpHeaders);
+    }
+}