提交 773e8ac7 编写于 作者: 糕冷羊's avatar 糕冷羊

bug[]: 布局文件全部增加前缀避免资源覆盖问题

上级 ad72f7a8
...@@ -2,36 +2,20 @@ ...@@ -2,36 +2,20 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.didichuxing.doraemonkit"> package="com.didichuxing.doraemonkit">
<!-- Window -->
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
<!-- Network --> <!-- Network -->
<uses-permission android:name="android.permission.INTERNET" /> <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" />
<!-- 锁屏界面显示订单消息 --> <!-- IO -->
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<!-- Other -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_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.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> <application>
<activity <activity
...@@ -61,5 +45,4 @@ ...@@ -61,5 +45,4 @@
<!--android:resource="@xml/debug_accessibility_service_config" />--> <!--android:resource="@xml/debug_accessibility_service_config" />-->
<!--</service>--> <!--</service>-->
</application> </application>
</manifest> </manifest>
\ No newline at end of file
...@@ -35,7 +35,7 @@ public class AlignRulerInfoFloatPage extends BaseFloatPage implements AlignRuler ...@@ -35,7 +35,7 @@ public class AlignRulerInfoFloatPage extends BaseFloatPage implements AlignRuler
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -29,7 +29,7 @@ public class AlignRulerMarkerFloatPage extends BaseFloatPage implements View.OnT ...@@ -29,7 +29,7 @@ public class AlignRulerMarkerFloatPage extends BaseFloatPage implements View.OnT
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -64,6 +64,6 @@ public class AlignRulerSettingFragment extends BaseFragment { ...@@ -64,6 +64,6 @@ public class AlignRulerSettingFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_align_ruler_setting; return R.layout.dk_fragment_align_ruler_setting;
} }
} }
...@@ -30,7 +30,7 @@ public class BlockListAdapter extends AbsRecyclerAdapter<AbsViewBinder<BlockInfo ...@@ -30,7 +30,7 @@ public class BlockListAdapter extends AbsRecyclerAdapter<AbsViewBinder<BlockInfo
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { private class ItemViewHolder extends AbsViewBinder<BlockInfo> {
......
...@@ -35,7 +35,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate ...@@ -35,7 +35,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_block_list; return R.layout.dk_fragment_block_list;
} }
@Override @Override
......
...@@ -24,7 +24,7 @@ public class BlockMonitorFragment extends BaseFragment { ...@@ -24,7 +24,7 @@ public class BlockMonitorFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_block_monitor_index; return R.layout.dk_fragment_block_monitor_index;
} }
@Override @Override
......
...@@ -2,10 +2,8 @@ package com.didichuxing.doraemonkit.kit.colorpick; ...@@ -2,10 +2,8 @@ package com.didichuxing.doraemonkit.kit.colorpick;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.PixelFormat;
import android.os.Build; import android.os.Build;
import android.support.annotation.RequiresApi; import android.support.annotation.RequiresApi;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
...@@ -48,7 +46,7 @@ public class ColorPickerFloatPage extends BaseFloatPage implements View.OnTouchL ...@@ -48,7 +46,7 @@ public class ColorPickerFloatPage extends BaseFloatPage implements View.OnTouchL
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -40,7 +40,7 @@ public class ColorPickerInfoFloatPage extends BaseFloatPage implements View.OnTo ...@@ -40,7 +40,7 @@ public class ColorPickerInfoFloatPage extends BaseFloatPage implements View.OnTo
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -106,6 +106,6 @@ public class ColorPickerSettingFragment extends BaseFragment { ...@@ -106,6 +106,6 @@ public class ColorPickerSettingFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_color_picker_setting; return R.layout.dk_fragment_color_picker_setting;
} }
} }
...@@ -38,7 +38,7 @@ public class PerformanceFragment extends BaseFragment { ...@@ -38,7 +38,7 @@ public class PerformanceFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_cpu_cache_log; return R.layout.dk_fragment_cpu_cache_log;
} }
@Override @Override
......
...@@ -29,7 +29,7 @@ public class CpuMainPageFragment extends BaseFragment implements OnFloatPageChan ...@@ -29,7 +29,7 @@ public class CpuMainPageFragment extends BaseFragment implements OnFloatPageChan
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_cpu_main_page; return R.layout.dk_fragment_cpu_main_page;
} }
@Override @Override
......
...@@ -27,7 +27,7 @@ public class CrashCaptureFragment extends BaseFragment { ...@@ -27,7 +27,7 @@ public class CrashCaptureFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_crash_capture; return R.layout.dk_fragment_crash_capture;
} }
private void initView() { private void initView() {
......
...@@ -17,7 +17,7 @@ import com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar; ...@@ -17,7 +17,7 @@ import com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar;
public class CrashCaptureMainFragment extends BaseFragment { public class CrashCaptureMainFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_crash_capture_main; return R.layout.dk_fragment_crash_capture_main;
} }
@Override @Override
......
...@@ -30,7 +30,7 @@ public class CrashDetailFragment extends BaseFragment { ...@@ -30,7 +30,7 @@ public class CrashDetailFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_crash_detail_info; return R.layout.dk_fragment_crash_detail_info;
} }
private void initView() { private void initView() {
......
...@@ -29,7 +29,7 @@ public class DataCleanFragment extends BaseFragment { ...@@ -29,7 +29,7 @@ public class DataCleanFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_data_clean; return R.layout.dk_fragment_data_clean;
} }
@Override @Override
......
...@@ -98,7 +98,7 @@ public class FileExplorerFragment extends BaseFragment { ...@@ -98,7 +98,7 @@ public class FileExplorerFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_file_explorer; return R.layout.dk_fragment_file_explorer;
} }
@Override @Override
......
...@@ -46,7 +46,7 @@ public class ImageDetailFragment extends BaseFragment { ...@@ -46,7 +46,7 @@ public class ImageDetailFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_image_detail; return R.layout.dk_fragment_image_detail;
} }
@Override @Override
......
...@@ -73,7 +73,7 @@ public class TextDetailFragment extends BaseFragment { ...@@ -73,7 +73,7 @@ public class TextDetailFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { 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> { private static class FileReadTask extends AsyncTask<File, String, Void> {
......
...@@ -33,7 +33,7 @@ public class FrameInfoFragment extends BaseFragment implements OnFloatPageChange ...@@ -33,7 +33,7 @@ public class FrameInfoFragment extends BaseFragment implements OnFloatPageChange
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_frame_info; return R.layout.dk_fragment_frame_info;
} }
@Override @Override
......
...@@ -165,6 +165,6 @@ public class GpsMockFragment extends BaseFragment implements SettingItemAdapter. ...@@ -165,6 +165,6 @@ public class GpsMockFragment extends BaseFragment implements SettingItemAdapter.
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_gps_mock; return R.layout.dk_fragment_gps_mock;
} }
} }
\ No newline at end of file
...@@ -63,7 +63,7 @@ public class LogInfoFloatPage extends BaseFloatPage implements LogInfoManager.On ...@@ -63,7 +63,7 @@ public class LogInfoFloatPage extends BaseFloatPage implements LogInfoManager.On
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -59,6 +59,6 @@ public class LogInfoSettingFragment extends BaseFragment { ...@@ -59,6 +59,6 @@ public class LogInfoSettingFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_log_info_setting; return R.layout.dk_fragment_log_info_setting;
} }
} }
\ No newline at end of file
...@@ -22,7 +22,7 @@ public class NetWorkMainPagerFragment extends BaseFragment implements View.OnCli ...@@ -22,7 +22,7 @@ public class NetWorkMainPagerFragment extends BaseFragment implements View.OnCli
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_net_main_pager; return R.layout.dk_fragment_net_main_pager;
} }
@Override @Override
......
...@@ -25,7 +25,7 @@ public class NetWorkMonitorFragment extends BaseFragment implements OnFloatPageC ...@@ -25,7 +25,7 @@ public class NetWorkMonitorFragment extends BaseFragment implements OnFloatPageC
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_net_monitor; return R.layout.dk_fragment_net_monitor;
} }
......
...@@ -21,13 +21,13 @@ public class NetWorkSummaryView extends LinearLayout { ...@@ -21,13 +21,13 @@ public class NetWorkSummaryView extends LinearLayout {
public NetWorkSummaryView(Context context) { public NetWorkSummaryView(Context context) {
super(context); super(context);
inflate(context, R.layout.fragment_network_summary_page, this); inflate(context, R.layout.dk_fragment_network_summary_page, this);
initView(); initView();
} }
public NetWorkSummaryView(Context context, @Nullable AttributeSet attrs) { public NetWorkSummaryView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs); super(context, attrs);
inflate(context, R.layout.fragment_network_summary_page, this); inflate(context, R.layout.dk_fragment_network_summary_page, this);
initView(); initView();
} }
......
...@@ -31,7 +31,7 @@ public class NetworkDetailFragment extends BaseFragment implements View.OnClickL ...@@ -31,7 +31,7 @@ public class NetworkDetailFragment extends BaseFragment implements View.OnClickL
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_network_monitor_detail; return R.layout.dk_fragment_network_monitor_detail;
} }
@Override @Override
......
...@@ -35,7 +35,7 @@ public class NetworkDetailView extends LinearLayout { ...@@ -35,7 +35,7 @@ public class NetworkDetailView extends LinearLayout {
public NetworkDetailView(Context context) { public NetworkDetailView(Context context) {
super(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); url = findViewById(R.id.tv_url);
method = findViewById(R.id.tv_method); method = findViewById(R.id.tv_method);
size = findViewById(R.id.tv_data_size); size = findViewById(R.id.tv_data_size);
......
...@@ -41,7 +41,7 @@ public class NetworkListAdapter extends AbsRecyclerAdapter<AbsViewBinder<Network ...@@ -41,7 +41,7 @@ public class NetworkListAdapter extends AbsRecyclerAdapter<AbsViewBinder<Network
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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 @Override
......
...@@ -34,14 +34,14 @@ public class NetworkListView extends LinearLayout implements OnNetworkInfoUpdate ...@@ -34,14 +34,14 @@ public class NetworkListView extends LinearLayout implements OnNetworkInfoUpdate
public NetworkListView(Context context) { public NetworkListView(Context context) {
super(context); super(context);
inflate(context, R.layout.fragment_network_monitor_list, this); inflate(context, R.layout.dk_fragment_network_monitor_list, this);
initView(); initView();
initData(); initData();
} }
public NetworkListView(Context context, @Nullable AttributeSet attrs) { public NetworkListView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs); super(context, attrs);
inflate(context, R.layout.fragment_network_monitor_list, this); inflate(context, R.layout.dk_fragment_network_monitor_list, this);
initView(); initView();
initData(); initData();
} }
......
...@@ -29,7 +29,7 @@ public class RamMainPageFragment extends BaseFragment implements OnFloatPageChan ...@@ -29,7 +29,7 @@ public class RamMainPageFragment extends BaseFragment implements OnFloatPageChan
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_cpu_main_page; return R.layout.dk_fragment_cpu_main_page;
} }
@Override @Override
......
...@@ -36,7 +36,7 @@ public class SysInfoFragment extends BaseFragment { ...@@ -36,7 +36,7 @@ public class SysInfoFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_sys_info; return R.layout.dk_fragment_sys_info;
} }
@Override @Override
......
...@@ -46,9 +46,9 @@ public class SysInfoItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<SysInfo ...@@ -46,9 +46,9 @@ public class SysInfoItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<SysInfo
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
if (viewType == TYPE_TITLE) { 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 { } else {
return inflater.inflate(R.layout.item_sys_info, parent, false); return inflater.inflate(R.layout.dk_item_sys_info, parent, false);
} }
} }
......
...@@ -36,7 +36,7 @@ public class ViewCheckDrawFloatPage extends BaseFloatPage implements ViewCheckFl ...@@ -36,7 +36,7 @@ public class ViewCheckDrawFloatPage extends BaseFloatPage implements ViewCheckFl
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -40,7 +40,7 @@ public class ViewCheckFloatPage extends BaseFloatPage implements View.OnTouchLis ...@@ -40,7 +40,7 @@ public class ViewCheckFloatPage extends BaseFloatPage implements View.OnTouchLis
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -27,7 +27,7 @@ public class ViewCheckFragment extends BaseFragment { ...@@ -27,7 +27,7 @@ public class ViewCheckFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_view_check; return R.layout.dk_fragment_view_check;
} }
@Override @Override
......
...@@ -52,7 +52,7 @@ public class ViewCheckInfoFloatPage extends BaseFloatPage implements ViewCheckFl ...@@ -52,7 +52,7 @@ public class ViewCheckInfoFloatPage extends BaseFloatPage implements ViewCheckFl
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -32,7 +32,7 @@ public class WebDoorFragment extends BaseFragment { ...@@ -32,7 +32,7 @@ public class WebDoorFragment extends BaseFragment {
@Override @Override
protected int onRequestLayout() { protected int onRequestLayout() {
return R.layout.fragment_web_door; return R.layout.dk_fragment_web_door;
} }
@Override @Override
......
...@@ -40,7 +40,7 @@ public class FloatIconPage extends BaseFloatPage implements View.OnTouchListener ...@@ -40,7 +40,7 @@ public class FloatIconPage extends BaseFloatPage implements View.OnTouchListener
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -27,7 +27,7 @@ public class KitFloatPage extends BaseFloatPage{ ...@@ -27,7 +27,7 @@ public class KitFloatPage extends BaseFloatPage{
@Override @Override
protected View onCreateView(Context context, ViewGroup view) { 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 @Override
......
...@@ -41,7 +41,7 @@ public class BarChart extends LinearLayout { ...@@ -41,7 +41,7 @@ public class BarChart extends LinearLayout {
} }
private void initView() { 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); markFirst = inflate.findViewById(R.id.mark_first);
markSecond = inflate.findViewById(R.id.mark_second); markSecond = inflate.findViewById(R.id.mark_second);
markThird = inflate.findViewById(R.id.mark_third); markThird = inflate.findViewById(R.id.mark_third);
......
...@@ -36,7 +36,7 @@ public class CrashCaptureAdapter extends BaseAdapter { ...@@ -36,7 +36,7 @@ public class CrashCaptureAdapter extends BaseAdapter {
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder viewHolder; ViewHolder viewHolder;
if (convertView == null) { 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); viewHolder = new ViewHolder(convertView);
convertView.setTag(viewHolder); convertView.setTag(viewHolder);
} else { } else {
......
...@@ -31,7 +31,7 @@ public class FileInfoAdapter extends AbsRecyclerAdapter<AbsViewBinder<FileInfo>, ...@@ -31,7 +31,7 @@ public class FileInfoAdapter extends AbsRecyclerAdapter<AbsViewBinder<FileInfo>,
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { public class FileInfoViewHolder extends AbsViewBinder<FileInfo> {
......
...@@ -27,7 +27,7 @@ public class TextContentAdapter extends AbsRecyclerAdapter<AbsViewBinder<String> ...@@ -27,7 +27,7 @@ public class TextContentAdapter extends AbsRecyclerAdapter<AbsViewBinder<String>
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { private class TextContentViewHolder extends AbsViewBinder<String> {
......
...@@ -25,7 +25,7 @@ public class PerformanceDataAdapter extends AbsRecyclerAdapter<AbsViewBinder<Per ...@@ -25,7 +25,7 @@ public class PerformanceDataAdapter extends AbsRecyclerAdapter<AbsViewBinder<Per
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { public class PerformanceItemViewHolder extends AbsViewBinder<PerformanceData> {
......
...@@ -37,9 +37,9 @@ public class GroupKitAdapter extends AbsRecyclerAdapter<AbsViewBinder<List<KitIt ...@@ -37,9 +37,9 @@ public class GroupKitAdapter extends AbsRecyclerAdapter<AbsViewBinder<List<KitIt
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
if (viewType == Category.CLOSE) { 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 { } else {
return inflater.inflate(R.layout.item_group_kit, parent, false); return inflater.inflate(R.layout.dk_item_group_kit, parent, false);
} }
} }
......
...@@ -30,7 +30,7 @@ public class KitAdapter extends AbsRecyclerAdapter<AbsViewBinder<KitItem>, KitIt ...@@ -30,7 +30,7 @@ public class KitAdapter extends AbsRecyclerAdapter<AbsViewBinder<KitItem>, KitIt
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { public class KitViewHolder extends AbsViewBinder<KitItem> {
......
...@@ -31,7 +31,7 @@ public class LogItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<LogInfoItem ...@@ -31,7 +31,7 @@ public class LogItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<LogInfoItem
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { public class LogInfoViewHolder extends AbsViewBinder<LogInfoItem> {
......
...@@ -29,7 +29,7 @@ public class LineChart extends FrameLayout { ...@@ -29,7 +29,7 @@ public class LineChart extends FrameLayout {
} }
private void initView(Context context) { 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); mTitle = findViewById(R.id.tv_title);
mLine = findViewById(R.id.line_chart_view); mLine = findViewById(R.id.line_chart_view);
} }
......
...@@ -32,7 +32,7 @@ public class SettingItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<Setting ...@@ -32,7 +32,7 @@ public class SettingItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<Setting
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { public class SettingItemViewHolder extends AbsViewBinder<SettingItem> {
......
...@@ -28,7 +28,7 @@ public class WebDoorHistoryAdapter extends AbsRecyclerAdapter<AbsViewBinder<Stri ...@@ -28,7 +28,7 @@ public class WebDoorHistoryAdapter extends AbsRecyclerAdapter<AbsViewBinder<Stri
@Override @Override
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) { 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> { public class WebDoorHistoryViewHolder extends AbsViewBinder<String> {
......
...@@ -238,7 +238,7 @@ public class DeviceUtils { ...@@ -238,7 +238,7 @@ public class DeviceUtils {
* @return 手机链接wifi的路由器的名字 * @return 手机链接wifi的路由器的名字
*/ */
public static String getWifiSSID(Context context) { 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()) { if (mWifi.isWifiEnabled()) {
WifiInfo wifiInfo = mWifi.getConnectionInfo(); WifiInfo wifiInfo = mWifi.getConnectionInfo();
return wifiInfo.getSSID(); return wifiInfo.getSSID();
...@@ -250,7 +250,7 @@ public class DeviceUtils { ...@@ -250,7 +250,7 @@ public class DeviceUtils {
* @return 手机链接wifi的路由器的mac地址 * @return 手机链接wifi的路由器的mac地址
*/ */
public static String getWifiBSSID(Context context) { 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()) { if (mWifi.isWifiEnabled()) {
WifiInfo wifiInfo = mWifi.getConnectionInfo(); WifiInfo wifiInfo = mWifi.getConnectionInfo();
return wifiInfo.getBSSID(); return wifiInfo.getBSSID();
...@@ -289,9 +289,9 @@ public class DeviceUtils { ...@@ -289,9 +289,9 @@ public class DeviceUtils {
* @return 手机mac地址 * @return 手机mac地址
*/ */
public static String getDeviceMac(Context context) { public static String getDeviceMac(Context context) {
WifiManager mWifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
if (mWifi.isWifiEnabled()) { if (wifiManager != null && wifiManager.isWifiEnabled()) {
WifiInfo wifiInfo = mWifi.getConnectionInfo(); WifiInfo wifiInfo = wifiManager.getConnectionInfo();
return wifiInfo.getMacAddress(); return wifiInfo.getMacAddress();
} }
return ""; return "";
...@@ -322,7 +322,7 @@ public class DeviceUtils { ...@@ -322,7 +322,7 @@ public class DeviceUtils {
* @return * @return
*/ */
public static boolean isWifiEnabled(Context context) { 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) return (wm != null)
&& (wm.getWifiState() == WifiManager.WIFI_STATE_ENABLED || wm.getWifiState() == WifiManager.WIFI_STATE_ENABLING); && (wm.getWifiState() == WifiManager.WIFI_STATE_ENABLED || wm.getWifiState() == WifiManager.WIFI_STATE_ENABLING);
} }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
app:leftText="@string/dk_back" app:leftText="@string/dk_back"
app:title="@string/dk_cpu_title_cache_log" /> 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.support.v7.widget.RecyclerView
android:id="@+id/data_show" android:id="@+id/data_show"
......
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
<include <include
android:id="@+id/tab_summary" android:id="@+id/tab_summary"
layout="@layout/view_network_tab_layout" layout="@layout/dk_view_network_tab_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"/>
<include <include
android:id="@+id/tab_list" android:id="@+id/tab_list"
layout="@layout/view_network_tab_layout" layout="@layout/dk_view_network_tab_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<View style="@style/DK.Divider"/> <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.support.v4.view.ViewPager
android:id="@+id/network_viewpager" android:id="@+id/network_viewpager"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册