Merge branch 'feature/support_from_master'

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

@@ -33,7 +33,7 @@ public class App extends Application {
         //线上环境:749a0600b5e48dd77cf8ee680be7b1b7
         DoraemonKit.disableUpload();
         //是否显示入口icon
-        //DoraemonKit.setAwaysShowMainIcon(false);
+//        DoraemonKit.setAwaysShowMainIcon(false);
         DoraemonKit.install(this, kits, "749a0600b5e48dd77cf8ee680be7b1b7");
         ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
                 .setDiskCacheEnabled(false)

Android/app/src/main/java/com/didichuxing/doraemondemo/SecondActivity.java

@@ -2,6 +2,9 @@ package com.didichuxing.doraemondemo;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.didichuxing.doraemonkit.DoraemonKit;
 
 public class SecondActivity extends AppCompatActivity {
 
@@ -9,7 +12,12 @@ public class SecondActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_second);
-        App.leakActivity = this;
+        findViewById(R.id.tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                DoraemonKit.show();
+            }
+        });
     }
 
 

Android/app/src/main/res/layout/activity_second.xml

@@ -4,15 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.didichuxing.doraemondemo.LeakActivity">
+    tools:context="com.didichuxing.doraemondemo.SecondActivity">
 
     <TextView
         android:id="@+id/tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="second activity"
         android:layout_centerInParent="true"
         android:gravity="center"
-        />
+        android:text="second activity" />
+
+
 
 </RelativeLayout>

Android/doraemonkit-leakcanary/src/main/res/values/strings.xml

 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="dk_frameinfo_leakcanary">leakCanary</string>
+    <string name="dk_frameinfo_leakcanary">LeakCanary</string>
 </resources>

Android/doraemonkit-weex/src/main/res/values-en-rUS/strings.xml

 <resources>
 <!--    <string name="app_name">weexkit</string>-->
     
-    <string name="dk_console_log_name">Log</string>
+    <string name="dk_console_log_name">Weex Log</string>
     <string name="dk_console_log_title">Weex Logging</string>
-    <string name="dk_storage_cache_name">Cache</string>
+    <string name="dk_storage_cache_name">Weex Cache</string>
     <string name="dk_storage_cache_title">Storage Information</string>
-    <string name="dk_weex_info_name">Information</string>
+    <string name="dk_weex_info_name">Weex Info</string>
     <string name="dk_weex_info_title">Weex Information</string>
     <string name="dk_dev_tool_name">DevTool</string>
     <string name="dk_dev_tool_title">Weex DevTool</string>

Android/doraemonkit-weex/src/main/res/values-zh-rCN/strings.xml

 <resources>
 <!--    <string name="app_name">weexkit</string>-->
     
-    <string name="dk_console_log_name">日志</string>
+    <string name="dk_console_log_name">Weex日志</string>
     <string name="dk_console_log_title">Weex日志记录</string>
-    <string name="dk_storage_cache_name">缓存</string>
+    <string name="dk_storage_cache_name">Weex缓存</string>
     <string name="dk_storage_cache_title">Storage信息查看</string>
-    <string name="dk_weex_info_name">信息</string>
+    <string name="dk_weex_info_name">Weex信息</string>
     <string name="dk_weex_info_title">Weex信息查看</string>
     <string name="dk_dev_tool_name">DevTool</string>
     <string name="dk_dev_tool_title">Weex DevTool</string>
 
     <string name="dk_storage_tip_key">key:</string>
     <string name="dk_storage_tip_value">value:</string>
+    <string name="dk_log_btn_clean">清空日志</string>
+    <string name="dk_log_btn_export">导出</string>
+    <string name="dk_log_btn_back_top">回到顶部</string>
+    <string name="dk_log_btn_to_bottom">滚至底部</string>
 </resources>

Android/doraemonkit-weex/src/main/res/values-zh-rTW/strings.xml

 <resources>
 <!--    <string name="app_name">weexkit</string>-->
     
-    <string name="dk_console_log_name">日誌</string>
+    <string name="dk_console_log_name">Weex日誌</string>
     <string name="dk_console_log_title">Weex日誌記錄</string>
-    <string name="dk_storage_cache_name">緩存</string>
+    <string name="dk_storage_cache_name">Weex緩存</string>
     <string name="dk_storage_cache_title">Storage信息查看</string>
-    <string name="dk_weex_info_name">信息</string>
+    <string name="dk_weex_info_name">Weex信息</string>
     <string name="dk_weex_info_title">Weex信息查看</string>
     <string name="dk_dev_tool_name">DevTool</string>
     <string name="dk_dev_tool_title">Weex DevTool</string>
 
     <string name="dk_storage_tip_key">key:</string>
     <string name="dk_storage_tip_value">value:</string>
+    <string name="dk_log_btn_clean">清空日誌</string>
+    <string name="dk_log_btn_export">導出</string>
+    <string name="dk_log_btn_back_top">回到頂部</string>
+    <string name="dk_log_btn_to_bottom">滾至底部</string>
 </resources>

Android/doraemonkit-weex/src/main/res/values/strings.xml

 <resources>
 <!--    <string name="app_name">weexkit</string>-->
     
-    <string name="dk_console_log_name">日志</string>
+    <string name="dk_console_log_name">Weex日志</string>
     <string name="dk_console_log_title">Weex日志记录</string>
-    <string name="dk_storage_cache_name">缓存</string>
+    <string name="dk_storage_cache_name">Weex缓存</string>
     <string name="dk_storage_cache_title">Storage信息查看</string>
-    <string name="dk_weex_info_name">信息</string>
+    <string name="dk_weex_info_name">Weex信息</string>
     <string name="dk_weex_info_title">Weex信息查看</string>
     <string name="dk_dev_tool_name">DevTool</string>
     <string name="dk_dev_tool_title">Weex DevTool</string>

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKitReal.java

@@ -3,6 +3,7 @@ package com.didichuxing.doraemonkit;
 import android.app.Application;
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.amitshekhar.DebugDB;
 import com.amitshekhar.debug.encrypt.sqlite.DebugDBEncryptFactory;
@@ -399,7 +400,8 @@ class DoraemonKitReal {
         NetworkUtils.registerNetworkStatusChangedListener(new NetworkUtils.OnNetworkStatusChangedListener() {
             @Override
             public void onDisconnected() {
-                ToastUtils.showShort("当前网络已断开");
+                //ToastUtils.showShort("当前网络已断开");
+                Log.i("Doraemon", "当前网络已断开");
                 try {
                     DebugDB.shutDown();
                     if (DokitConstant.DB_DEBUG_FRAGMENT != null && DokitConstant.DB_DEBUG_FRAGMENT.get() != null) {
@@ -413,7 +415,8 @@ class DoraemonKitReal {
             @Override
             public void onConnected(NetworkUtils.NetworkType networkType) {
                 //重启DebugDB
-                ToastUtils.showShort("当前网络类型:" + networkType.name());
+                //ToastUtils.showShort("当前网络类型:" + networkType.name());
+                Log.i("Doraemon", "当前网络类型" + networkType.name());
                 try {
                     DebugDB.shutDown();
                     DebugDB.initialize(APPLICATION, new DebugDBFactory());

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/DokitViewManager.java

@@ -11,6 +11,7 @@ import com.didichuxing.doraemonkit.constant.DokitConstant;
 import com.didichuxing.doraemonkit.kit.network.room_db.DokitDatabase;
 import com.didichuxing.doraemonkit.kit.network.room_db.DokitDbManager;
 import com.didichuxing.doraemonkit.ui.main.ToolPanelDokitView;
+import com.didichuxing.doraemonkit.util.LogHelper;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -89,6 +90,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void notifyBackground() {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.notifyBackground();
     }
 
@@ -97,6 +102,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void notifyForeground() {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.notifyForeground();
     }
 
@@ -150,6 +159,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void resumeAndAttachDokitViews(Activity activity) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.resumeAndAttachDokitViews(activity);
     }
 
@@ -170,6 +183,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
 
     @Override
     public void onActivityPause(Activity activity) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.onActivityPause(activity);
     }
 
@@ -180,6 +197,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void attach(DokitIntent dokitIntent) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.attach(dokitIntent);
     }
 
@@ -195,11 +216,19 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void detach(String tag) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.detach(tag);
     }
 
     @Override
     public void detach(Activity activity, String tag) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.detach(activity, tag);
     }
 
@@ -209,22 +238,38 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void detach(AbsDokitView dokitView) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.detach(dokitView);
     }
 
     @Override
     public void detach(Activity activity, AbsDokitView dokitView) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.detach(activity, dokitView);
     }
 
 
     @Override
     public void detach(Class<? extends AbsDokitView> dokitViewClass) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.detach(dokitViewClass);
     }
 
     @Override
     public void detach(Activity activity, Class<? extends AbsDokitView> dokitViewClass) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.detach(activity, dokitViewClass);
     }
 
@@ -233,6 +278,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void detachAll() {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.detachAll();
     }
 
@@ -242,6 +291,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public void onActivityDestroy(Activity activity) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         mDokitViewManager.onActivityDestroy(activity);
     }
 
@@ -254,6 +307,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public AbsDokitView getDokitView(Activity activity, String tag) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return null;
+        }
         return mDokitViewManager.getDokitView(activity, tag);
     }
 
@@ -263,6 +320,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      */
     @Override
     public Map<String, AbsDokitView> getDokitViews(Activity activity) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return new HashMap<>();
+        }
         return mDokitViewManager.getDokitViews(activity);
     }
 
@@ -279,6 +340,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      * @param listener
      */
     void addDokitViewAttachedListener(DokitViewAttachedListener listener) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         if (!DokitConstant.IS_NORMAL_FLOAT_MODE && mDokitViewManager instanceof SystemDokitViewManager) {
             ((SystemDokitViewManager) mDokitViewManager).addListener(listener);
         }
@@ -290,6 +355,10 @@ public class DokitViewManager implements DokitViewManagerInterface {
      * @param listener
      */
     void removeDokitViewAttachedListener(DokitViewAttachedListener listener) {
+        if (mDokitViewManager == null) {
+            LogHelper.e("Doraemon", "mDokitViewManager == null请检查是否已在Application的onCreate中完成初始化");
+            return;
+        }
         if (!DokitConstant.IS_NORMAL_FLOAT_MODE && mDokitViewManager instanceof SystemDokitViewManager) {
             ((SystemDokitViewManager) mDokitViewManager).removeListener(listener);
         }

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/NormalDokitViewManager.java

@@ -226,7 +226,10 @@ class NormalDokitViewManager implements DokitViewManagerInterface {
 
             //LogHelper.i(TAG, " activity  resume==>" + activity.getClass().getSimpleName() + "  dokitView==>" + globalSingleDokitViewInfo.getTag());
             //判断resume Activity 中时候存在指定的dokitview
-            AbsDokitView existDokitView = existDokitViews.get(globalSingleDokitViewInfo.getTag());
+            AbsDokitView existDokitView = null;
+            if (existDokitViews != null && !existDokitViews.isEmpty()) {
+                existDokitView = existDokitViews.get(globalSingleDokitViewInfo.getTag());
+            }
 
             //当前页面已存在dokitview
             if (existDokitView != null && existDokitView.getRootView() != null) {

Android/doraemonkit/src/main/res/values-en-rUS/strings.xml

@@ -2,39 +2,39 @@
     <string name="dk_app_name">DoraemonKit</string>
 
     <string name="dk_category_biz">Business</string>
-    <string name="dk_category_tools">Tool Box</string>
+    <string name="dk_category_tools">"Common Tool "</string>
     <string name="dk_category_performance">Performance Monitor</string>
     <string name="dk_category_large_image">Large image detection</string>
     <string name="dk_category_ui">UI Tool</string>
     <string name="dk_category_platform">Platform Tool</string>
-    <string name="dk_kit_network_mock">Network Mock</string>
-    <string name="dk_kit_health">Health</string>
+    <string name="dk_kit_network_mock">Api Mock</string>
+    <string name="dk_kit_health">App Health</string>
     <string name="dk_category_weex">WEEX</string>
 
     <string name="dk_kit_sysinfo">App Info</string>
-    <string name="dk_kit_develop">developPage</string>
+    <string name="dk_kit_develop">Developer Options</string>
     <string name="dk_kit_service_running">running service</string>
     <string name="dk_kit_local_lang">Language</string>
 
     <string name="dk_kit_list">Tools</string>
     <string name="dk_kit_demo">demo</string>
-    <string name="dk_kit_file_explorer">Sandbox</string>
-    <string name="dk_kit_frame_info">FPS Monitor</string>
-    <string name="dk_kit_gps_mock">Mock GPS</string>
+    <string name="dk_kit_file_explorer">Sandbox Brow</string>
+    <string name="dk_kit_frame_info">FPS</string>
+    <string name="dk_kit_gps_mock">" GPS Mock"</string>
     <string name="dk_kit_color_picker">Color Picker</string>
-    <string name="dk_kit_align_ruler">Align Size</string>
-    <string name="dk_kit_log_info">Show Log</string>
-    <string name="dk_kit_web_door">H5 Opener</string>
+    <string name="dk_kit_align_ruler">Align Ruler</string>
+    <string name="dk_kit_log_info">"Log Viewer "</string>
+    <string name="dk_kit_web_door">"H5 Door "</string>
     <string name="dk_kit_temporary_close">Hide Doraemon</string>
     <string name="dk_kit_crash">Crash Viewer</string>
-    <string name="dk_kit_data_clean">Cache Cleanup</string>
+    <string name="dk_kit_data_clean">Cache Clean</string>
     <string name="dk_kit_db_debug">DBView</string>
-    <string name="dk_kit_weak_network">Simulated Weak Network</string>
+    <string name="dk_kit_weak_network">Weak Network</string>
     <string name="dk_kit_view_check">View Ciewer</string>
     <string name="dk_kit_net_monitor">NetWork Monitor</string>
     <string name="dk_kit_ui_monitor">Show Current Infos On UI</string>
-    <string name="dk_kit_time_counter">Time Counter</string>
-    <string name="dk_kit_method_cost">method cost</string>
+    <string name="dk_kit_time_counter">Start Cost</string>
+    <string name="dk_kit_method_cost">Method Cost</string>
     <string name="dk_kit_mock_template_preview">Data Preview</string>
     <string name="dk_kit_method_cost_desc">
         <![CDATA[
@@ -102,8 +102,8 @@
     <string name="dk_frameinfo_upstream">Upstream traffic</string>
     <string name="dk_frameinfo_downstream">Downstream traffic</string>
     <string name="dk_frameinfo_avg_value">Average value</string>
-    <string name="dk_frameinfo_big_img">Big Image</string>
-    <string name="dk_frameinfo_leakcanary">leakCanary</string>
+    <string name="dk_frameinfo_big_img">BigImg Monitor</string>
+    <string name="dk_frameinfo_leakcanary">LeakCanary</string>
     <string name="dk_tools_dbdebug">DBView</string>
 
     <string name="dk_log_info_edt_hint">Enter the keywords you want to filter</string>
@@ -123,19 +123,19 @@
     <string name="dk_gpsmock_hint_longlat">Please Input latitude and longitude</string>
 
     <!--卡顿检测-->
-    <string name="dk_kit_block_monitor">ANR Check</string>
-    <string name="dk_kit_block_monitor_list">ANR List</string>
-    <string name="dk_kit_block_monitor_detail">ANR Detail</string>
-    <string name="dk_item_block_switch">ANR Switch</string>
-    <string name="dk_item_block_goto_list">View ANR History</string>
-    <string name="dk_item_block_mock">Mock ANR</string>
+    <string name="dk_kit_block_monitor">Block Monitor</string>
+    <string name="dk_kit_block_monitor_list">Block List</string>
+    <string name="dk_kit_block_monitor_detail">Block Detail</string>
+    <string name="dk_item_block_switch">Block Switch</string>
+    <string name="dk_item_block_goto_list">View Block History</string>
+    <string name="dk_item_block_mock">Mock Block</string>
 
     <string name="dk_block_class_has_blocked">blocked %s ms</string>
     <string name="dk_block_notification_message">Click for more details</string>
 
     <string name="dk_crash_capture_tips">DoraemonKit is recording Crash for you</string>
     <string name="dk_crash_capture_no_record">No crash record</string>
-    <string name="dk_gpsmock_open">Open Mock Gps</string>
+    <string name="dk_gpsmock_open">"Open Gps Mock "</string>
 
     <string name="dk_crash_capture_switch">Crash Log Collection Switch</string>
     <string name="dk_crash_capture_look">View Crash Log</string>
@@ -272,7 +272,7 @@
     <string name="dk_health_upload_successed">Data uploaded successfully</string>
     <string name="dk_health_upload_failed">upload failed,try again</string>
     <string name="dk_health_upload_droped">This test case has been discarded!</string>
-    <string name="dk_health_upload_title">Health Checkup</string>
+    <string name="dk_health_upload_title">App Health</string>
     <string name="dk_health_upload_message">Are you sure to start the health checkup?</string>
     <string name="dk_health_funcation_start">App is about to restart and start to enter medical examination mode</string>
     <string name="dk_health_funcation_running">Checking up ...</string>

Android/doraemonkit/src/main/res/values-zh-rCN/strings.xml

@@ -7,7 +7,7 @@
     <string name="dk_category_large_image">大图检测</string>
     <string name="dk_category_ui">视觉工具</string>
     <string name="dk_category_platform">平台工具</string>
-    <string name="dk_kit_network_mock">数据Mock</string>
+    <string name="dk_kit_network_mock">接口Mock</string>
     <string name="dk_kit_health">健康体检</string>
     <string name="dk_category_weex">WEEX</string>
 
@@ -17,7 +17,7 @@
     <string name="dk_kit_local_lang">本地语言</string>
     <string name="dk_kit_list">工具列表</string>
     <string name="dk_kit_demo">demo</string>
-    <string name="dk_kit_file_explorer">沙盒游览</string>
+    <string name="dk_kit_file_explorer">沙盒浏览</string>
     <string name="dk_kit_frame_info">帧率</string>
     <string name="dk_kit_frame_info_desc">帧率检测</string>
     <string name="dk_kit_gps_mock">位置模拟</string>
@@ -33,7 +33,7 @@
     <string name="dk_kit_view_check">控件检查</string>
     <string name="dk_kit_net_monitor">流量监控</string>
     <string name="dk_kit_ui_monitor">UI显示实时数据</string>
-    <string name="dk_kit_time_counter">耗时</string>
+    <string name="dk_kit_time_counter">启动耗时</string>
     <string name="dk_kit_method_cost">函数耗时</string>
     <string name="dk_kit_mock_template_preview">数据预览</string>
     <string name="dk_kit_method_cost_desc">
@@ -103,8 +103,8 @@
     <string name="dk_frameinfo_upstream">上行流量</string>
     <string name="dk_frameinfo_downstream">下行流量</string>
     <string name="dk_frameinfo_avg_value">平均值</string>
-    <string name="dk_frameinfo_big_img">大图</string>
-    <string name="dk_frameinfo_leakcanary">leakCanary</string>
+    <string name="dk_frameinfo_big_img">大图监控</string>
+    <string name="dk_frameinfo_leakcanary">LeakCanary</string>
     <string name="dk_tools_dbdebug">DBView</string>
 
     <string name="dk_log_info_edt_hint">输入想要过滤的关键字</string>

Android/doraemonkit/src/main/res/values-zh-rTW/strings.xml

@@ -7,7 +7,7 @@
     <string name="dk_category_large_image">大圖檢測</string>
     <string name="dk_category_ui">視覺工具</string>
     <string name="dk_category_platform">平台工具</string>
-    <string name="dk_kit_network_mock">數據Mock</string>
+    <string name="dk_kit_network_mock">接口Mock</string>
     <string name="dk_kit_health">健康體檢</string>
     <string name="dk_category_weex">WEEX</string>
 
@@ -17,7 +17,7 @@
     <string name="dk_kit_local_lang">本地語言</string>
     <string name="dk_kit_list">工具列表</string>
     <string name="dk_kit_demo">demo</string>
-    <string name="dk_kit_file_explorer">Sandbox</string>
+    <string name="dk_kit_file_explorer">沙盒瀏覽</string>
     <string name="dk_kit_frame_info">幀率</string>
     <string name="dk_kit_frame_info_desc">幀率檢測</string>
     <string name="dk_kit_gps_mock">位置模擬</string>
@@ -33,7 +33,7 @@
     <string name="dk_kit_view_check">View 元件檢查</string>
     <string name="dk_kit_net_monitor">流量監控</string>
     <string name="dk_kit_ui_monitor">UI顯示實時數據</string>
-    <string name="dk_kit_time_counter">耗時</string>
+    <string name="dk_kit_time_counter">啟動耗時</string>
     <string name="dk_kit_method_cost">函數耗時</string>
     <string name="dk_kit_mock_template_preview">數據預覽</string>
     <string name="dk_kit_method_cost_desc">
@@ -99,8 +99,8 @@
     <string name="dk_frameinfo_downstream">下行流量</string>
     <string name="dk_frameinfo_upstream">上流量</string>
     <string name="dk_frameinfo_avg_value">平均值</string>
-    <string name="dk_frameinfo_big_img">大圖</string>
-    <string name="dk_frameinfo_leakcanary">leakCanary</string>
+    <string name="dk_frameinfo_big_img">大圖監控</string>
+    <string name="dk_frameinfo_leakcanary">LeakCanary</string>
     <string name="dk_tools_dbdebug">DBView</string>
 
     <string name="dk_log_info_edt_hint">輸入想要過濾的關鍵字</string>
@@ -122,7 +122,7 @@
     <string name="dk_gpsmock_hint_longlat">請輸入經緯度</string>
 
     <!--卡頓檢測-->
-    <string name="dk_kit_block_monitor">ANR 檢測</string>
+    <string name="dk_kit_block_monitor">卡頓檢測</string>
     <string name="dk_kit_block_monitor_list">ANR 列表</string>
     <string name="dk_kit_block_monitor_detail">ANR 詳情</string>
     <string name="dk_item_block_switch">ANR 檢測開關</string>

Android/doraemonkit/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="dk_category_large_image">大图检测</string>
     <string name="dk_category_ui">视觉工具</string>
     <string name="dk_category_platform">平台工具</string>
-    <string name="dk_kit_network_mock">数据Mock</string>
+    <string name="dk_kit_network_mock">接口Mock</string>
     <string name="dk_kit_health">健康体检</string>
     <string name="dk_category_weex">WEEX</string>
 
@@ -18,7 +18,7 @@
     <string name="dk_kit_service_running">运行中服务</string>
     <string name="dk_kit_list">工具列表</string>
     <string name="dk_kit_demo">demo</string>
-    <string name="dk_kit_file_explorer">沙盒游览</string>
+    <string name="dk_kit_file_explorer">沙盒浏览</string>
     <string name="dk_kit_frame_info">帧率</string>
     <string name="dk_kit_frame_info_desc">帧率检测</string>
     <string name="dk_kit_gps_mock">位置模拟</string>
@@ -38,7 +38,7 @@
     <string name="dk_kit_net_monitor_white_host_edit_toast">请先输入host</string>
 
     <string name="dk_kit_ui_monitor">UI显示实时数据</string>
-    <string name="dk_kit_time_counter">耗时</string>
+    <string name="dk_kit_time_counter">启动耗时</string>
     <string name="dk_kit_method_cost">函数耗时</string>
     <string name="dk_kit_mock_template_preview">数据预览</string>
     <string name="dk_kit_method_cost_desc">
@@ -111,8 +111,8 @@
     <string name="dk_frameinfo_upstream">上行流量</string>
     <string name="dk_frameinfo_downstream">下行流量</string>
     <string name="dk_frameinfo_avg_value">平均值</string>
-    <string name="dk_frameinfo_big_img">大图</string>
-    <string name="dk_frameinfo_leakcanary">leakCanary</string>
+    <string name="dk_frameinfo_big_img">大图监控</string>
+    <string name="dk_frameinfo_leakcanary">LeakCanary</string>
     <string name="dk_tools_dbdebug">DBView</string>
 
     <string name="dk_log_info_edt_hint">输入想要过滤的关键字</string>