Skip to content

Commit 773e8ac

Browse files
wanglikun7342wanglikun7342
committed
bug[]: 布局文件全部增加前缀避免资源覆盖问题
1 parent ad72f7a commit 773e8ac

106 files changed

Lines changed: 71 additions & 90 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Android/doraemonkit/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,20 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.didichuxing.doraemonkit">
44

5+
<!-- Window -->
56
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
6-
<uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
77

88
<!-- Network -->
99
<uses-permission android:name="android.permission.INTERNET" />
10-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
11-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
12-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
13-
<uses-permission android:name="android.permission.ACCESS_GPS" />
14-
15-
<!-- Location -->
16-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
17-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
1810

19-
<!-- 锁屏界面显示订单消息 -->
20-
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
21-
22-
<!-- Other -->
11+
<!-- IO -->
2312
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
2413
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
14+
15+
<!-- Setting -->
16+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
17+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
2518
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
26-
<uses-permission android:name="android.permission.CALL_PHONE" />
27-
<uses-permission android:name="android.permission.WAKE_LOCK" />
28-
<uses-permission android:name="android.permission.VIBRATE" />
29-
<uses-permission android:name="android.permission.GET_TASKS" />
30-
<uses-permission android:name="android.permission.CAMERA" />
31-
<uses-permission android:name="android.permission.FLASHLIGHT" />
32-
<uses-permission android:name="android.permission.READ_CONTACTS" />
33-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
34-
<uses-permission android:name="android.permission.INTERNET" />
3519

3620
<application>
3721
<activity
@@ -61,5 +45,4 @@
6145
<!--android:resource="@xml/debug_accessibility_service_config" />-->
6246
<!--</service>-->
6347
</application>
64-
6548
</manifest>

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerInfoFloatPage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected void onDestroy() {
3535

3636
@Override
3737
protected View onCreateView(Context context, ViewGroup view) {
38-
return LayoutInflater.from(context).inflate(R.layout.float_align_ruler_info, view, false);
38+
return LayoutInflater.from(context).inflate(R.layout.dk_float_align_ruler_info, view, false);
3939
}
4040

4141
@Override

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerMarkerFloatPage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class AlignRulerMarkerFloatPage extends BaseFloatPage implements View.OnT
2929

3030
@Override
3131
protected View onCreateView(Context context, ViewGroup view) {
32-
return LayoutInflater.from(context).inflate(R.layout.float_align_ruler_marker, null);
32+
return LayoutInflater.from(context).inflate(R.layout.dk_float_align_ruler_marker, null);
3333
}
3434

3535
@Override

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/alignruler/AlignRulerSettingFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ public void onSettingItemSwitch(View view, SettingItem data, boolean on) {
6464

6565
@Override
6666
protected int onRequestLayout() {
67-
return R.layout.fragment_align_ruler_setting;
67+
return R.layout.dk_fragment_align_ruler_setting;
6868
}
6969
}

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected AbsViewBinder<BlockInfo> createViewHolder(View view, int viewType) {
3030

3131
@Override
3232
protected View createView(LayoutInflater inflater, ViewGroup parent, int viewType) {
33-
return inflater.inflate(R.layout.item_block_list, parent, false);
33+
return inflater.inflate(R.layout.dk_item_block_list, parent, false);
3434
}
3535

3636
private class ItemViewHolder extends AbsViewBinder<BlockInfo> {

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
3535

3636
@Override
3737
protected int onRequestLayout() {
38-
return R.layout.fragment_block_list;
38+
return R.layout.dk_fragment_block_list;
3939
}
4040

4141
@Override

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockMonitorFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class BlockMonitorFragment extends BaseFragment {
2424

2525
@Override
2626
protected int onRequestLayout() {
27-
return R.layout.fragment_block_monitor_index;
27+
return R.layout.dk_fragment_block_monitor_index;
2828
}
2929

3030
@Override

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerFloatPage.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import android.content.Context;
44
import android.graphics.Bitmap;
5-
import android.graphics.PixelFormat;
65
import android.os.Build;
76
import android.support.annotation.RequiresApi;
8-
import android.view.Gravity;
97
import android.view.LayoutInflater;
108
import android.view.MotionEvent;
119
import android.view.View;
@@ -48,7 +46,7 @@ private void initView() {
4846

4947
@Override
5048
protected View onCreateView(Context context, ViewGroup view) {
51-
return LayoutInflater.from(context).inflate(R.layout.float_color_picker, null);
49+
return LayoutInflater.from(context).inflate(R.layout.dk_float_color_picker, null);
5250
}
5351

5452
@Override

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerInfoFloatPage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected void onCreate(Context context) {
4040

4141
@Override
4242
protected View onCreateView(Context context, ViewGroup view) {
43-
return LayoutInflater.from(context).inflate(R.layout.float_color_picker_info, null);
43+
return LayoutInflater.from(context).inflate(R.layout.dk_float_color_picker_info, null);
4444
}
4545

4646
@Override

‎Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ColorPickerSettingFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ private void showColorPicker(Intent data) {
106106

107107
@Override
108108
protected int onRequestLayout() {
109-
return R.layout.fragment_color_picker_setting;
109+
return R.layout.dk_fragment_color_picker_setting;
110110
}
111111
}

0 commit comments

Comments
 (0)