From 773e8ac77bdfb600f084097fb848ecc5f5137cde Mon Sep 17 00:00:00 2001
From: wanglikun7342 <wanglikun7342@gmail.com>
Date: Wed, 26 Dec 2018 11:29:59 +0800
Subject: [PATCH] =?UTF-8?q?bug[]:=20=E5=B8=83=E5=B1=80=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=BC=80=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E8=B5=84=E6=BA=90=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doraemonkit/src/main/AndroidManifest.xml  | 29 ++++---------------
 .../alignruler/AlignRulerInfoFloatPage.java   |  2 +-
 .../alignruler/AlignRulerMarkerFloatPage.java |  2 +-
 .../alignruler/AlignRulerSettingFragment.java |  2 +-
 .../kit/blockmonitor/BlockListAdapter.java    |  2 +-
 .../kit/blockmonitor/BlockListFragment.java   |  2 +-
 .../blockmonitor/BlockMonitorFragment.java    |  2 +-
 .../kit/colorpick/ColorPickerFloatPage.java   |  4 +--
 .../colorpick/ColorPickerInfoFloatPage.java   |  2 +-
 .../colorpick/ColorPickerSettingFragment.java |  2 +-
 .../kit/common/PerformanceFragment.java       |  2 +-
 .../kit/cpu/CpuMainPageFragment.java          |  2 +-
 .../kit/crash/CrashCaptureFragment.java       |  2 +-
 .../kit/crash/CrashCaptureMainFragment.java   |  2 +-
 .../kit/crash/CrashDetailFragment.java        |  2 +-
 .../kit/dataclean/DataCleanFragment.java      |  2 +-
 .../fileexplorer/FileExplorerFragment.java    |  2 +-
 .../kit/fileexplorer/ImageDetailFragment.java |  2 +-
 .../kit/fileexplorer/TextDetailFragment.java  |  2 +-
 .../kit/frameInfo/FrameInfoFragment.java      |  2 +-
 .../kit/gpsmock/GpsMockFragment.java          |  2 +-
 .../kit/logInfo/LogInfoFloatPage.java         |  2 +-
 .../kit/logInfo/LogInfoSettingFragment.java   |  2 +-
 .../network/ui/NetWorkMainPagerFragment.java  |  2 +-
 .../network/ui/NetWorkMonitorFragment.java    |  2 +-
 .../kit/network/ui/NetWorkSummaryView.java    |  4 +--
 .../kit/network/ui/NetworkDetailFragment.java |  2 +-
 .../kit/network/ui/NetworkDetailView.java     |  2 +-
 .../kit/network/ui/NetworkListAdapter.java    |  2 +-
 .../kit/network/ui/NetworkListView.java       |  4 +--
 .../kit/ram/RamMainPageFragment.java          |  2 +-
 .../kit/sysinfo/SysInfoFragment.java          |  2 +-
 .../kit/sysinfo/SysInfoItemAdapter.java       |  4 +--
 .../kit/viewcheck/ViewCheckDrawFloatPage.java |  2 +-
 .../kit/viewcheck/ViewCheckFloatPage.java     |  2 +-
 .../kit/viewcheck/ViewCheckFragment.java      |  2 +-
 .../kit/viewcheck/ViewCheckInfoFloatPage.java |  2 +-
 .../kit/webdoor/WebDoorFragment.java          |  2 +-
 .../doraemonkit/ui/FloatIconPage.java         |  2 +-
 .../doraemonkit/ui/KitFloatPage.java          |  2 +-
 .../doraemonkit/ui/chart/BarChart.java        |  2 +-
 .../ui/crash/CrashCaptureAdapter.java         |  2 +-
 .../ui/fileexplorer/FileInfoAdapter.java      |  2 +-
 .../ui/fileexplorer/TextContentAdapter.java   |  2 +-
 .../ui/frameinfo/PerformanceDataAdapter.java  |  2 +-
 .../doraemonkit/ui/kit/GroupKitAdapter.java   |  4 +--
 .../doraemonkit/ui/kit/KitAdapter.java        |  2 +-
 .../ui/loginfo/LogItemAdapter.java            |  2 +-
 .../ui/realtime/widget/LineChart.java         |  2 +-
 .../ui/setting/SettingItemAdapter.java        |  2 +-
 .../ui/webdoor/WebDoorHistoryAdapter.java     |  2 +-
 .../doraemonkit/util/DeviceUtils.java         | 12 ++++----
 ...info.xml => dk_float_align_ruler_info.xml} |  0
 ...er.xml => dk_float_align_ruler_marker.xml} |  0
 ...r_picker.xml => dk_float_color_picker.xml} |  0
 ...nfo.xml => dk_float_color_picker_info.xml} |  0
 .../{float_kit.xml => dk_float_kit.xml}       |  0
 ...unch_icon.xml => dk_float_launch_icon.xml} |  0
 ...oat_log_info.xml => dk_float_log_info.xml} |  0
 ...view_check.xml => dk_float_view_check.xml} |  0
 ..._draw.xml => dk_float_view_check_draw.xml} |  0
 ..._info.xml => dk_float_view_check_info.xml} |  0
 ...ml => dk_fragment_align_ruler_setting.xml} |  0
 ...ck_list.xml => dk_fragment_block_list.xml} |  0
 ...ml => dk_fragment_block_monitor_index.xml} |  0
 ...l => dk_fragment_color_picker_setting.xml} |  0
 ..._log.xml => dk_fragment_cpu_cache_log.xml} |  2 +-
 ...page.xml => dk_fragment_cpu_main_page.xml} |  0
 ...ture.xml => dk_fragment_crash_capture.xml} |  0
 ...xml => dk_fragment_crash_capture_main.xml} |  0
 ....xml => dk_fragment_crash_detail_info.xml} |  0
 ...a_clean.xml => dk_fragment_data_clean.xml} |  0
 ...orer.xml => dk_fragment_file_explorer.xml} |  0
 ...me_info.xml => dk_fragment_frame_info.xml} |  0
 ..._gps_mock.xml => dk_fragment_gps_mock.xml} |  0
 ...etail.xml => dk_fragment_image_detail.xml} |  0
 ...g.xml => dk_fragment_log_info_setting.xml} |  0
 ...ger.xml => dk_fragment_net_main_pager.xml} |  4 +--
 ...onitor.xml => dk_fragment_net_monitor.xml} |  0
 ...=> dk_fragment_network_monitor_detail.xml} |  2 +-
 ...l => dk_fragment_network_monitor_list.xml} |  0
 ...l => dk_fragment_network_summary_page.xml} |  0
 ..._sys_info.xml => dk_fragment_sys_info.xml} |  0
 ...detail.xml => dk_fragment_text_detail.xml} |  0
 ...w_check.xml => dk_fragment_view_check.xml} |  0
 ..._web_door.xml => dk_fragment_web_door.xml} |  0
 ...em_bar_chart.xml => dk_item_bar_chart.xml} |  0
 ..._block_list.xml => dk_item_block_list.xml} |  0
 ...em_close_kit.xml => dk_item_close_kit.xml} |  0
 ..._capture.xml => dk_item_crash_capture.xml} |  0
 ...em_file_info.xml => dk_item_file_info.xml} |  0
 ...em_group_kit.xml => dk_item_group_kit.xml} |  0
 .../layout/{item_kit.xml => dk_item_kit.xml}  |  0
 .../layout/{item_log.xml => dk_item_log.xml}  |  0
 ...work_list.xml => dk_item_network_list.xml} |  0
 ...ail.xml => dk_item_performance_detail.xml} |  0
 .../{item_setting.xml => dk_item_setting.xml} |  0
 ...item_sys_info.xml => dk_item_sys_info.xml} |  0
 ...em_sys_title.xml => dk_item_sys_title.xml} |  0
 ...t_content.xml => dk_item_text_content.xml} |  0
 ...em_tips_view.xml => dk_item_tips_view.xml} |  0
 ...story.xml => dk_item_web_door_history.xml} |  0
 ..._line_chart.xml => dk_view_line_chart.xml} |  0
 ...=> dk_view_network_detail_pager_title.xml} |  2 +-
 ...equest.xml => dk_view_network_request.xml} |  0
 ...out.xml => dk_view_network_tab_layout.xml} |  0
 106 files changed, 71 insertions(+), 90 deletions(-)
 rename Android/doraemonkit/src/main/res/layout/{float_align_ruler_info.xml => dk_float_align_ruler_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_align_ruler_marker.xml => dk_float_align_ruler_marker.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_color_picker.xml => dk_float_color_picker.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_color_picker_info.xml => dk_float_color_picker_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_kit.xml => dk_float_kit.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_launch_icon.xml => dk_float_launch_icon.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_log_info.xml => dk_float_log_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_view_check.xml => dk_float_view_check.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_view_check_draw.xml => dk_float_view_check_draw.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{float_view_check_info.xml => dk_float_view_check_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_align_ruler_setting.xml => dk_fragment_align_ruler_setting.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_block_list.xml => dk_fragment_block_list.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_block_monitor_index.xml => dk_fragment_block_monitor_index.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_color_picker_setting.xml => dk_fragment_color_picker_setting.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_cpu_cache_log.xml => dk_fragment_cpu_cache_log.xml} (94%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_cpu_main_page.xml => dk_fragment_cpu_main_page.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_crash_capture.xml => dk_fragment_crash_capture.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_crash_capture_main.xml => dk_fragment_crash_capture_main.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_crash_detail_info.xml => dk_fragment_crash_detail_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_data_clean.xml => dk_fragment_data_clean.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_file_explorer.xml => dk_fragment_file_explorer.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_frame_info.xml => dk_fragment_frame_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_gps_mock.xml => dk_fragment_gps_mock.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_image_detail.xml => dk_fragment_image_detail.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_log_info_setting.xml => dk_fragment_log_info_setting.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_net_main_pager.xml => dk_fragment_net_main_pager.xml} (93%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_net_monitor.xml => dk_fragment_net_monitor.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_network_monitor_detail.xml => dk_fragment_network_monitor_detail.xml} (91%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_network_monitor_list.xml => dk_fragment_network_monitor_list.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_network_summary_page.xml => dk_fragment_network_summary_page.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_sys_info.xml => dk_fragment_sys_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_text_detail.xml => dk_fragment_text_detail.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_view_check.xml => dk_fragment_view_check.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{fragment_web_door.xml => dk_fragment_web_door.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_bar_chart.xml => dk_item_bar_chart.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_block_list.xml => dk_item_block_list.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_close_kit.xml => dk_item_close_kit.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_crash_capture.xml => dk_item_crash_capture.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_file_info.xml => dk_item_file_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_group_kit.xml => dk_item_group_kit.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_kit.xml => dk_item_kit.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_log.xml => dk_item_log.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_network_list.xml => dk_item_network_list.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_performance_detail.xml => dk_item_performance_detail.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_setting.xml => dk_item_setting.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_sys_info.xml => dk_item_sys_info.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_sys_title.xml => dk_item_sys_title.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_text_content.xml => dk_item_text_content.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_tips_view.xml => dk_item_tips_view.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{item_web_door_history.xml => dk_item_web_door_history.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{view_line_chart.xml => dk_view_line_chart.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{view_network_detail_pager_title.xml => dk_view_network_detail_pager_title.xml} (96%)
 rename Android/doraemonkit/src/main/res/layout/{view_network_request.xml => dk_view_network_request.xml} (100%)
 rename Android/doraemonkit/src/main/res/layout/{view_network_tab_layout.xml => dk_view_network_tab_layout.xml} (100%)

diff --git a/Android/doraemonkit/src/main/AndroidManifest.xml b/Android/doraemonkit/src/main/AndroidManifest.xml
index 9dc266bf..ca0b32a1 100644
--- a/Android/doraemonkit/src/main/AndroidManifest.xml
+++ b/Android/doraemonkit/src/main/AndroidManifest.xml
@@ -2,36 +2,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.didichuxing.doraemonkit">
 
+    <!-- Window -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
 
     <!-- Network -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_GPS" />
-
-    <!-- Location -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-    <!-- 锁屏界面显示订单消息 -->
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-
-    <!-- Other -->
+    <!-- IO -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <!-- Setting -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
         <activity
@@ -61,5 +45,4 @@
                 <!--android:resource="@xml/debug_accessibility_service_config" />-->
         <!--</service>-->
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerInfoFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerInfoFloatPage.java
index 6fb4f731..46cc7918 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerInfoFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerInfoFloatPage.java
@@ -35,7 +35,7 @@ public class AlignRulerInfoFloatPage extends BaseFloatPage implements AlignRuler
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_align_ruler_info, view, false);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_align_ruler_info, view, false);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerMarkerFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerMarkerFloatPage.java
index ac4d3dcd..0b054616 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerMarkerFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerMarkerFloatPage.java
@@ -29,7 +29,7 @@ public class AlignRulerMarkerFloatPage extends BaseFloatPage implements View.OnT
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_align_ruler_marker, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_align_ruler_marker, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerSettingFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerSettingFragment.java
index 123189d5..820045de 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerSettingFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerSettingFragment.java
@@ -64,6 +64,6 @@ public class AlignRulerSettingFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_align_ruler_setting;
+        return R.layout.dk_fragment_align_ruler_setting;
     }
 }
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListAdapter.java
index cf6e611a..32459c14 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListAdapter.java
@@ -30,7 +30,7 @@ public class BlockListAdapter extends AbsRecyclerAdapter<AbsViewBinder<BlockInfo
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_block_list, parent, false);
+        return inflater.inflate(R.layout.dk_item_block_list, parent, false);
     }
 
     private class ItemViewHolder extends AbsViewBinder<BlockInfo> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
index 8499cbdb..290359f7 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
@@ -35,7 +35,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_block_list;
+        return R.layout.dk_fragment_block_list;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockMonitorFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockMonitorFragment.java
index 5367ca9d..7d13983d 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockMonitorFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockMonitorFragment.java
@@ -24,7 +24,7 @@ public class BlockMonitorFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_block_monitor_index;
+        return R.layout.dk_fragment_block_monitor_index;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerFloatPage.java
index 7f4cc8d9..fafb16fd 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerFloatPage.java
@@ -2,10 +2,8 @@ package com.didichuxing.doraemonkit.kit.colorpick;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.PixelFormat;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -48,7 +46,7 @@ public class ColorPickerFloatPage extends BaseFloatPage implements View.OnTouchL
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_color_picker, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_color_picker, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerInfoFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerInfoFloatPage.java
index 7ede50f2..7d51a96d 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerInfoFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerInfoFloatPage.java
@@ -40,7 +40,7 @@ public class ColorPickerInfoFloatPage extends BaseFloatPage implements View.OnTo
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_color_picker_info, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_color_picker_info, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerSettingFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerSettingFragment.java
index 2fe08462..d286ca71 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerSettingFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerSettingFragment.java
@@ -106,6 +106,6 @@ public class ColorPickerSettingFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_color_picker_setting;
+        return R.layout.dk_fragment_color_picker_setting;
     }
 }
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceFragment.java
index b41d17b6..2c7a75f8 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceFragment.java
@@ -38,7 +38,7 @@ public class PerformanceFragment extends BaseFragment {
     @Override
 
     protected int onRequestLayout() {
-        return R.layout.fragment_cpu_cache_log;
+        return R.layout.dk_fragment_cpu_cache_log;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/cpu/CpuMainPageFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/cpu/CpuMainPageFragment.java
index d821aa3e..1d10cdea 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/cpu/CpuMainPageFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/cpu/CpuMainPageFragment.java
@@ -29,7 +29,7 @@ public class CpuMainPageFragment extends BaseFragment implements OnFloatPageChan
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_cpu_main_page;
+        return R.layout.dk_fragment_cpu_main_page;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java
index 20afce14..0b1d0775 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java
@@ -27,7 +27,7 @@ public class CrashCaptureFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_crash_capture;
+        return R.layout.dk_fragment_crash_capture;
     }
 
     private void initView() {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureMainFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureMainFragment.java
index 38d3fe3a..a31bbfc4 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureMainFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureMainFragment.java
@@ -17,7 +17,7 @@ import com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar;
 public class CrashCaptureMainFragment extends BaseFragment {
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_crash_capture_main;
+        return R.layout.dk_fragment_crash_capture_main;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java
index 6cc149b7..39868945 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java
@@ -30,7 +30,7 @@ public class CrashDetailFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_crash_detail_info;
+        return R.layout.dk_fragment_crash_detail_info;
     }
 
     private void initView() {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/dataclean/DataCleanFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/dataclean/DataCleanFragment.java
index 384ef2db..fbbe94a7 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/dataclean/DataCleanFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/dataclean/DataCleanFragment.java
@@ -29,7 +29,7 @@ public class DataCleanFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_data_clean;
+        return R.layout.dk_fragment_data_clean;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/FileExplorerFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/FileExplorerFragment.java
index 3328b935..8e4aa73b 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/FileExplorerFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/FileExplorerFragment.java
@@ -98,7 +98,7 @@ public class FileExplorerFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_file_explorer;
+        return R.layout.dk_fragment_file_explorer;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/ImageDetailFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/ImageDetailFragment.java
index 2ec27739..c24e201d 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/ImageDetailFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/ImageDetailFragment.java
@@ -46,7 +46,7 @@ public class ImageDetailFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_image_detail;
+        return R.layout.dk_fragment_image_detail;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/TextDetailFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/TextDetailFragment.java
index d634379a..6848c7f2 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/TextDetailFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/fileexplorer/TextDetailFragment.java
@@ -73,7 +73,7 @@ public class TextDetailFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_text_detail;
+        return R.layout.dk_fragment_text_detail;
     }
 
     private static class FileReadTask extends AsyncTask<File, String, Void> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/frameInfo/FrameInfoFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/frameInfo/FrameInfoFragment.java
index 965f4000..8a72f9dc 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/frameInfo/FrameInfoFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/frameInfo/FrameInfoFragment.java
@@ -33,7 +33,7 @@ public class FrameInfoFragment extends BaseFragment implements OnFloatPageChange
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_frame_info;
+        return R.layout.dk_fragment_frame_info;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/gpsmock/GpsMockFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/gpsmock/GpsMockFragment.java
index 9733c190..31589812 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/gpsmock/GpsMockFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/gpsmock/GpsMockFragment.java
@@ -165,6 +165,6 @@ public class GpsMockFragment extends BaseFragment implements SettingItemAdapter.
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_gps_mock;
+        return R.layout.dk_fragment_gps_mock;
     }
 }
\ No newline at end of file
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoFloatPage.java
index f71f6f64..f1767ce2 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoFloatPage.java
@@ -63,7 +63,7 @@ public class LogInfoFloatPage extends BaseFloatPage implements LogInfoManager.On
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_log_info, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_log_info, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoSettingFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoSettingFragment.java
index 286a35d3..b07503ad 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoSettingFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/logInfo/LogInfoSettingFragment.java
@@ -59,6 +59,6 @@ public class LogInfoSettingFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_log_info_setting;
+        return R.layout.dk_fragment_log_info_setting;
     }
 }
\ No newline at end of file
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMainPagerFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMainPagerFragment.java
index eb3c2aef..b5483a9c 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMainPagerFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMainPagerFragment.java
@@ -22,7 +22,7 @@ public class NetWorkMainPagerFragment extends BaseFragment implements View.OnCli
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_net_main_pager;
+        return R.layout.dk_fragment_net_main_pager;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMonitorFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMonitorFragment.java
index 07be4b83..0a0a0cea 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMonitorFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkMonitorFragment.java
@@ -25,7 +25,7 @@ public class NetWorkMonitorFragment extends BaseFragment implements OnFloatPageC
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_net_monitor;
+        return R.layout.dk_fragment_net_monitor;
     }
 
 
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkSummaryView.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkSummaryView.java
index 020f84ad..452cf8cc 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkSummaryView.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetWorkSummaryView.java
@@ -21,13 +21,13 @@ public class NetWorkSummaryView extends LinearLayout {
 
     public NetWorkSummaryView(Context context) {
         super(context);
-        inflate(context, R.layout.fragment_network_summary_page, this);
+        inflate(context, R.layout.dk_fragment_network_summary_page, this);
         initView();
     }
 
     public NetWorkSummaryView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        inflate(context, R.layout.fragment_network_summary_page, this);
+        inflate(context, R.layout.dk_fragment_network_summary_page, this);
         initView();
     }
 
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailFragment.java
index fc02a3f4..993e52b4 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailFragment.java
@@ -31,7 +31,7 @@ public class NetworkDetailFragment extends BaseFragment implements View.OnClickL
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_network_monitor_detail;
+        return R.layout.dk_fragment_network_monitor_detail;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java
index ad90be54..e73b225a 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java
@@ -35,7 +35,7 @@ public class NetworkDetailView extends LinearLayout {
 
     public NetworkDetailView(Context context) {
         super(context);
-        inflate(context, R.layout.view_network_request, this);
+        inflate(context, R.layout.dk_view_network_request, this);
         url = findViewById(R.id.tv_url);
         method = findViewById(R.id.tv_method);
         size = findViewById(R.id.tv_data_size);
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListAdapter.java
index 4910cecd..80d94bd3 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListAdapter.java
@@ -41,7 +41,7 @@ public class NetworkListAdapter extends AbsRecyclerAdapter<AbsViewBinder<Network
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_network_list, parent, false);
+        return inflater.inflate(R.layout.dk_item_network_list, parent, false);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListView.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListView.java
index 24a20d5e..99f6e5f2 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListView.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkListView.java
@@ -34,14 +34,14 @@ public class NetworkListView extends LinearLayout implements OnNetworkInfoUpdate
 
     public NetworkListView(Context context) {
         super(context);
-        inflate(context, R.layout.fragment_network_monitor_list, this);
+        inflate(context, R.layout.dk_fragment_network_monitor_list, this);
         initView();
         initData();
     }
 
     public NetworkListView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        inflate(context, R.layout.fragment_network_monitor_list, this);
+        inflate(context, R.layout.dk_fragment_network_monitor_list, this);
         initView();
         initData();
     }
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/ram/RamMainPageFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/ram/RamMainPageFragment.java
index 6d8baaf1..b53292b5 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/ram/RamMainPageFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/ram/RamMainPageFragment.java
@@ -29,7 +29,7 @@ public class RamMainPageFragment extends BaseFragment implements OnFloatPageChan
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_cpu_main_page;
+        return R.layout.dk_fragment_cpu_main_page;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoFragment.java
index c638dd78..ac60025d 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoFragment.java
@@ -36,7 +36,7 @@ public class SysInfoFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_sys_info;
+        return R.layout.dk_fragment_sys_info;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoItemAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoItemAdapter.java
index 65e388c8..60010974 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoItemAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/sysinfo/SysInfoItemAdapter.java
@@ -46,9 +46,9 @@ public class SysInfoItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<SysInfo
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
         if (viewType == TYPE_TITLE) {
-            return inflater.inflate(R.layout.item_sys_title, parent, false);
+            return inflater.inflate(R.layout.dk_item_sys_title, parent, false);
         } else {
-            return inflater.inflate(R.layout.item_sys_info, parent, false);
+            return inflater.inflate(R.layout.dk_item_sys_info, parent, false);
         }
     }
 
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckDrawFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckDrawFloatPage.java
index b77a0b11..62797a90 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckDrawFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckDrawFloatPage.java
@@ -36,7 +36,7 @@ public class ViewCheckDrawFloatPage extends BaseFloatPage implements ViewCheckFl
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_view_check_draw, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_view_check_draw, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFloatPage.java
index 4248369c..2b4eacd7 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFloatPage.java
@@ -40,7 +40,7 @@ public class ViewCheckFloatPage extends BaseFloatPage implements View.OnTouchLis
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_view_check, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_view_check, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFragment.java
index 3466ab9c..391d6b4a 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckFragment.java
@@ -27,7 +27,7 @@ public class ViewCheckFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_view_check;
+        return R.layout.dk_fragment_view_check;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckInfoFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckInfoFloatPage.java
index c30e4cff..acf25b2b 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckInfoFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/viewcheck/ViewCheckInfoFloatPage.java
@@ -52,7 +52,7 @@ public class ViewCheckInfoFloatPage extends BaseFloatPage implements ViewCheckFl
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_view_check_info, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_view_check_info, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/webdoor/WebDoorFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/webdoor/WebDoorFragment.java
index 6ab2366b..1195db8f 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/webdoor/WebDoorFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/webdoor/WebDoorFragment.java
@@ -32,7 +32,7 @@ public class WebDoorFragment extends BaseFragment {
 
     @Override
     protected int onRequestLayout() {
-        return R.layout.fragment_web_door;
+        return R.layout.dk_fragment_web_door;
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/FloatIconPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/FloatIconPage.java
index e16ca9dc..bde433d6 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/FloatIconPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/FloatIconPage.java
@@ -40,7 +40,7 @@ public class FloatIconPage extends BaseFloatPage implements View.OnTouchListener
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_launch_icon, view, false);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_launch_icon, view, false);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/KitFloatPage.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/KitFloatPage.java
index 6663c3ec..e51a311c 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/KitFloatPage.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/KitFloatPage.java
@@ -27,7 +27,7 @@ public class KitFloatPage extends BaseFloatPage{
 
     @Override
     protected View onCreateView(Context context, ViewGroup view) {
-        return LayoutInflater.from(context).inflate(R.layout.float_kit, null);
+        return LayoutInflater.from(context).inflate(R.layout.dk_float_kit, null);
     }
 
     @Override
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/chart/BarChart.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/chart/BarChart.java
index 52556660..235b446d 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/chart/BarChart.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/chart/BarChart.java
@@ -41,7 +41,7 @@ public class BarChart extends LinearLayout {
     }
 
     private void initView() {
-        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.item_bar_chart, this, true);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.dk_item_bar_chart, this, true);
         markFirst = inflate.findViewById(R.id.mark_first);
         markSecond = inflate.findViewById(R.id.mark_second);
         markThird = inflate.findViewById(R.id.mark_third);
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java
index 48a37bd6..3f9e6ff3 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java
@@ -36,7 +36,7 @@ public class CrashCaptureAdapter extends BaseAdapter {
     public View getView(int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder;
         if (convertView == null) {
-            convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_crash_capture, parent, false);
+            convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.dk_item_crash_capture, parent, false);
             viewHolder = new ViewHolder(convertView);
             convertView.setTag(viewHolder);
         } else {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/FileInfoAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/FileInfoAdapter.java
index fd6a85c5..7c08c2bf 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/FileInfoAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/FileInfoAdapter.java
@@ -31,7 +31,7 @@ public class FileInfoAdapter extends AbsRecyclerAdapter<AbsViewBinder<FileInfo>,
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_file_info, parent, false);
+        return inflater.inflate(R.layout.dk_item_file_info, parent, false);
     }
 
     public class FileInfoViewHolder extends AbsViewBinder<FileInfo> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/TextContentAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/TextContentAdapter.java
index 28113054..a9df58f6 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/TextContentAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/fileexplorer/TextContentAdapter.java
@@ -27,7 +27,7 @@ public class TextContentAdapter extends AbsRecyclerAdapter<AbsViewBinder<String>
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_text_content, parent, false);
+        return inflater.inflate(R.layout.dk_item_text_content, parent, false);
     }
 
     private class TextContentViewHolder extends AbsViewBinder<String> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/frameinfo/PerformanceDataAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/frameinfo/PerformanceDataAdapter.java
index efb88a96..a7c7ebff 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/frameinfo/PerformanceDataAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/frameinfo/PerformanceDataAdapter.java
@@ -25,7 +25,7 @@ public class PerformanceDataAdapter extends AbsRecyclerAdapter<AbsViewBinder<Per
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_performance_detail, parent, false);
+        return inflater.inflate(R.layout.dk_item_performance_detail, parent, false);
     }
 
     public class PerformanceItemViewHolder extends AbsViewBinder<PerformanceData> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/GroupKitAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/GroupKitAdapter.java
index 088a5e44..4ff765d8 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/GroupKitAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/GroupKitAdapter.java
@@ -37,9 +37,9 @@ public class GroupKitAdapter extends AbsRecyclerAdapter<AbsViewBinder<List<KitIt
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
         if (viewType == Category.CLOSE) {
-            return inflater.inflate(R.layout.item_close_kit, parent, false);
+            return inflater.inflate(R.layout.dk_item_close_kit, parent, false);
         } else {
-            return inflater.inflate(R.layout.item_group_kit, parent, false);
+            return inflater.inflate(R.layout.dk_item_group_kit, parent, false);
         }
     }
 
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/KitAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/KitAdapter.java
index 0237060e..07507bbc 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/KitAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/kit/KitAdapter.java
@@ -30,7 +30,7 @@ public class KitAdapter extends AbsRecyclerAdapter<AbsViewBinder<KitItem>, KitIt
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_kit, parent, false);
+        return inflater.inflate(R.layout.dk_item_kit, parent, false);
     }
 
     public class KitViewHolder extends AbsViewBinder<KitItem> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/loginfo/LogItemAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/loginfo/LogItemAdapter.java
index 384754a1..ab69fb59 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/loginfo/LogItemAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/loginfo/LogItemAdapter.java
@@ -31,7 +31,7 @@ public class LogItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<LogInfoItem
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_log, parent, false);
+        return inflater.inflate(R.layout.dk_item_log, parent, false);
     }
 
     public class LogInfoViewHolder extends AbsViewBinder<LogInfoItem> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/realtime/widget/LineChart.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/realtime/widget/LineChart.java
index 2989c711..f016749a 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/realtime/widget/LineChart.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/realtime/widget/LineChart.java
@@ -29,7 +29,7 @@ public class LineChart extends FrameLayout {
     }
 
     private void initView(Context context) {
-        inflate(context, R.layout.view_line_chart, this);
+        inflate(context, R.layout.dk_view_line_chart, this);
         mTitle = findViewById(R.id.tv_title);
         mLine = findViewById(R.id.line_chart_view);
     }
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/setting/SettingItemAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/setting/SettingItemAdapter.java
index ee699b23..b3304f97 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/setting/SettingItemAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/setting/SettingItemAdapter.java
@@ -32,7 +32,7 @@ public class SettingItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<Setting
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_setting, parent, false);
+        return inflater.inflate(R.layout.dk_item_setting, parent, false);
     }
 
     public class SettingItemViewHolder extends AbsViewBinder<SettingItem> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/webdoor/WebDoorHistoryAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/webdoor/WebDoorHistoryAdapter.java
index b3b8709e..8a36c92b 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/webdoor/WebDoorHistoryAdapter.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/webdoor/WebDoorHistoryAdapter.java
@@ -28,7 +28,7 @@ public class WebDoorHistoryAdapter extends AbsRecyclerAdapter<AbsViewBinder<Stri
 
     @Override
     protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
-        return inflater.inflate(R.layout.item_web_door_history, parent, false);
+        return inflater.inflate(R.layout.dk_item_web_door_history, parent, false);
     }
 
     public class WebDoorHistoryViewHolder extends AbsViewBinder<String> {
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DeviceUtils.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DeviceUtils.java
index c44b42ec..fcc22b5a 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DeviceUtils.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DeviceUtils.java
@@ -238,7 +238,7 @@ public class DeviceUtils {
      * @return 手机链接wifi的路由器的名字
      */
     public static String getWifiSSID(Context context) {
-        WifiManager mWifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        WifiManager mWifi = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         if (mWifi.isWifiEnabled()) {
             WifiInfo wifiInfo = mWifi.getConnectionInfo();
             return wifiInfo.getSSID();
@@ -250,7 +250,7 @@ public class DeviceUtils {
      * @return 手机链接wifi的路由器的mac地址
      */
     public static String getWifiBSSID(Context context) {
-        WifiManager mWifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        WifiManager mWifi = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         if (mWifi.isWifiEnabled()) {
             WifiInfo wifiInfo = mWifi.getConnectionInfo();
             return wifiInfo.getBSSID();
@@ -289,9 +289,9 @@ public class DeviceUtils {
      * @return 手机mac地址
      */
     public static String getDeviceMac(Context context) {
-        WifiManager mWifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        if (mWifi.isWifiEnabled()) {
-            WifiInfo wifiInfo = mWifi.getConnectionInfo();
+        WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        if (wifiManager != null && wifiManager.isWifiEnabled()) {
+            WifiInfo wifiInfo = wifiManager.getConnectionInfo();
             return wifiInfo.getMacAddress();
         }
         return "";
@@ -322,7 +322,7 @@ public class DeviceUtils {
      * @return
      */
     public static boolean isWifiEnabled(Context context) {
-        WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        WifiManager wm = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         return (wm != null)
                 && (wm.getWifiState() == WifiManager.WIFI_STATE_ENABLED || wm.getWifiState() == WifiManager.WIFI_STATE_ENABLING);
     }
diff --git a/Android/doraemonkit/src/main/res/layout/float_align_ruler_info.xml b/Android/doraemonkit/src/main/res/layout/dk_float_align_ruler_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_align_ruler_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_align_ruler_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_align_ruler_marker.xml b/Android/doraemonkit/src/main/res/layout/dk_float_align_ruler_marker.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_align_ruler_marker.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_align_ruler_marker.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_color_picker.xml b/Android/doraemonkit/src/main/res/layout/dk_float_color_picker.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_color_picker.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_color_picker.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_color_picker_info.xml b/Android/doraemonkit/src/main/res/layout/dk_float_color_picker_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_color_picker_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_color_picker_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_kit.xml b/Android/doraemonkit/src/main/res/layout/dk_float_kit.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_kit.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_kit.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_launch_icon.xml b/Android/doraemonkit/src/main/res/layout/dk_float_launch_icon.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_launch_icon.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_launch_icon.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_log_info.xml b/Android/doraemonkit/src/main/res/layout/dk_float_log_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_log_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_log_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_view_check.xml b/Android/doraemonkit/src/main/res/layout/dk_float_view_check.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_view_check.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_view_check.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_view_check_draw.xml b/Android/doraemonkit/src/main/res/layout/dk_float_view_check_draw.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_view_check_draw.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_view_check_draw.xml
diff --git a/Android/doraemonkit/src/main/res/layout/float_view_check_info.xml b/Android/doraemonkit/src/main/res/layout/dk_float_view_check_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/float_view_check_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_float_view_check_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_align_ruler_setting.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_align_ruler_setting.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_align_ruler_setting.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_align_ruler_setting.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_block_list.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_block_list.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_block_monitor_index.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_block_monitor_index.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_block_monitor_index.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_block_monitor_index.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_color_picker_setting.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_color_picker_setting.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_color_picker_setting.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_color_picker_setting.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_cpu_cache_log.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_cpu_cache_log.xml
similarity index 94%
rename from Android/doraemonkit/src/main/res/layout/fragment_cpu_cache_log.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_cpu_cache_log.xml
index 7e77c7b5..217b7356 100644
--- a/Android/doraemonkit/src/main/res/layout/fragment_cpu_cache_log.xml
+++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_cpu_cache_log.xml
@@ -14,7 +14,7 @@
         app:leftText="@string/dk_back"
         app:title="@string/dk_cpu_title_cache_log" />
 
-    <include layout="@layout/item_tips_view" />
+    <include layout="@layout/dk_item_tips_view" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/data_show"
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_cpu_main_page.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_cpu_main_page.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_cpu_main_page.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_cpu_main_page.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_crash_capture.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_crash_capture.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_crash_capture_main.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_crash_capture_main.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_crash_detail_info.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_crash_detail_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_data_clean.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_data_clean.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_data_clean.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_data_clean.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_file_explorer.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_file_explorer.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_file_explorer.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_file_explorer.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_frame_info.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_frame_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_frame_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_frame_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_gps_mock.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_gps_mock.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_image_detail.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_image_detail.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_image_detail.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_image_detail.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_log_info_setting.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_log_info_setting.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_log_info_setting.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_log_info_setting.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_net_main_pager.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_net_main_pager.xml
similarity index 93%
rename from Android/doraemonkit/src/main/res/layout/fragment_net_main_pager.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_net_main_pager.xml
index cdb81d78..20b0b868 100644
--- a/Android/doraemonkit/src/main/res/layout/fragment_net_main_pager.xml
+++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_net_main_pager.xml
@@ -33,14 +33,14 @@
 
         <include
             android:id="@+id/tab_summary"
-            layout="@layout/view_network_tab_layout"
+            layout="@layout/dk_view_network_tab_layout"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"/>
 
         <include
             android:id="@+id/tab_list"
-            layout="@layout/view_network_tab_layout"
+            layout="@layout/dk_view_network_tab_layout"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"/>
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_net_monitor.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_net_monitor.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_net_monitor.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_net_monitor.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_network_monitor_detail.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_network_monitor_detail.xml
similarity index 91%
rename from Android/doraemonkit/src/main/res/layout/fragment_network_monitor_detail.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_network_monitor_detail.xml
index f48818f1..0d2b7646 100644
--- a/Android/doraemonkit/src/main/res/layout/fragment_network_monitor_detail.xml
+++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_network_monitor_detail.xml
@@ -16,7 +16,7 @@
 
     <View style="@style/DK.Divider"/>
 
-    <include layout="@layout/view_network_detail_pager_title"/>
+    <include layout="@layout/dk_view_network_detail_pager_title"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/network_viewpager"
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_network_monitor_list.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_network_monitor_list.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_network_monitor_list.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_network_monitor_list.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_network_summary_page.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_network_summary_page.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_network_summary_page.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_network_summary_page.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_sys_info.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_sys_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_sys_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_sys_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_text_detail.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_text_detail.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_text_detail.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_text_detail.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_view_check.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_view_check.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_view_check.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_view_check.xml
diff --git a/Android/doraemonkit/src/main/res/layout/fragment_web_door.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/fragment_web_door.xml
rename to Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_bar_chart.xml b/Android/doraemonkit/src/main/res/layout/dk_item_bar_chart.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_bar_chart.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_bar_chart.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_block_list.xml b/Android/doraemonkit/src/main/res/layout/dk_item_block_list.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_block_list.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_block_list.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_close_kit.xml b/Android/doraemonkit/src/main/res/layout/dk_item_close_kit.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_close_kit.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_close_kit.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_crash_capture.xml b/Android/doraemonkit/src/main/res/layout/dk_item_crash_capture.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_crash_capture.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_crash_capture.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_file_info.xml b/Android/doraemonkit/src/main/res/layout/dk_item_file_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_file_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_file_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_group_kit.xml b/Android/doraemonkit/src/main/res/layout/dk_item_group_kit.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_group_kit.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_group_kit.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_kit.xml b/Android/doraemonkit/src/main/res/layout/dk_item_kit.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_kit.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_kit.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_log.xml b/Android/doraemonkit/src/main/res/layout/dk_item_log.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_log.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_log.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_network_list.xml b/Android/doraemonkit/src/main/res/layout/dk_item_network_list.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_network_list.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_network_list.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_performance_detail.xml b/Android/doraemonkit/src/main/res/layout/dk_item_performance_detail.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_performance_detail.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_performance_detail.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_setting.xml b/Android/doraemonkit/src/main/res/layout/dk_item_setting.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_setting.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_setting.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_sys_info.xml b/Android/doraemonkit/src/main/res/layout/dk_item_sys_info.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_sys_info.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_sys_info.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_sys_title.xml b/Android/doraemonkit/src/main/res/layout/dk_item_sys_title.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_sys_title.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_sys_title.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_text_content.xml b/Android/doraemonkit/src/main/res/layout/dk_item_text_content.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_text_content.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_text_content.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_tips_view.xml b/Android/doraemonkit/src/main/res/layout/dk_item_tips_view.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_tips_view.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_tips_view.xml
diff --git a/Android/doraemonkit/src/main/res/layout/item_web_door_history.xml b/Android/doraemonkit/src/main/res/layout/dk_item_web_door_history.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/item_web_door_history.xml
rename to Android/doraemonkit/src/main/res/layout/dk_item_web_door_history.xml
diff --git a/Android/doraemonkit/src/main/res/layout/view_line_chart.xml b/Android/doraemonkit/src/main/res/layout/dk_view_line_chart.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/view_line_chart.xml
rename to Android/doraemonkit/src/main/res/layout/dk_view_line_chart.xml
diff --git a/Android/doraemonkit/src/main/res/layout/view_network_detail_pager_title.xml b/Android/doraemonkit/src/main/res/layout/dk_view_network_detail_pager_title.xml
similarity index 96%
rename from Android/doraemonkit/src/main/res/layout/view_network_detail_pager_title.xml
rename to Android/doraemonkit/src/main/res/layout/dk_view_network_detail_pager_title.xml
index aaeba7fb..d16e45d4 100644
--- a/Android/doraemonkit/src/main/res/layout/view_network_detail_pager_title.xml
+++ b/Android/doraemonkit/src/main/res/layout/dk_view_network_detail_pager_title.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="44dp"
     android:clickable="true"
-    tools:showIn="@layout/fragment_network_monitor_detail">
+    tools:showIn="@layout/dk_fragment_network_monitor_detail">
 
     <RelativeLayout
         android:layout_width="0dp"
diff --git a/Android/doraemonkit/src/main/res/layout/view_network_request.xml b/Android/doraemonkit/src/main/res/layout/dk_view_network_request.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/view_network_request.xml
rename to Android/doraemonkit/src/main/res/layout/dk_view_network_request.xml
diff --git a/Android/doraemonkit/src/main/res/layout/view_network_tab_layout.xml b/Android/doraemonkit/src/main/res/layout/dk_view_network_tab_layout.xml
similarity index 100%
rename from Android/doraemonkit/src/main/res/layout/view_network_tab_layout.xml
rename to Android/doraemonkit/src/main/res/layout/dk_view_network_tab_layout.xml
-- 
GitLab