Skip to content

Commit c61628e

Browse files
author
jyuesong
committed
fix flyme bug
1 parent 314740b commit c61628e

3 files changed

Lines changed: 8 additions & 12 deletions

File tree

app/src/main/java/com/jiang/android/pushdemo/MainActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ public void onAlias(Context context, String alias) {
8383
protected void onCreate(Bundle savedInstanceState) {
8484
super.onCreate(savedInstanceState);
8585
setContentView(R.layout.activity_main);
86-
// if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
87-
// ActivityCompat.requestPermissions(this,
88-
// new String[]{android.Manifest.permission.READ_PHONE_STATE},
89-
// 100);
90-
// }
86+
if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
87+
ActivityCompat.requestPermissions(this,
88+
new String[]{android.Manifest.permission.READ_PHONE_STATE},
89+
100);
90+
}
9191

9292
//android.permission.WRITE_SETTINGS
9393
if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_SETTINGS) != PackageManager.PERMISSION_GRANTED) {

push/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
defaultConfig {
99
minSdkVersion 11
1010
targetSdkVersion 24
11-
versionCode 3
12-
versionName "1.1.0"
11+
versionCode 4
12+
versionName "1.1.1"
1313
ndk {
1414
abiFilters 'armeabi', 'armeabi-v7a', 'armeabi-v8a'
1515

push/src/main/java/com/jiang/android/push/utils/RomUtil.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ public class RomUtil {
1515
private static final String KEY_MIUI_HANDY_MODE_SF = "ro.miui.has_handy_mode_sf";
1616
private static final String KEY_MIUI_REAL_BLUR = "ro.miui.has_real_blur";
1717

18-
private static final String KEY_FLYME_BUILD_USER = "ro.build.user";
1918
private static final String KEY_FLYME_ICON = "persist.sys.use.flyme.icon";
2019
private static final String KEY_FLYME_PUBLISHED = "ro.flyme.published";
21-
private static final String KEY_FLYME_DISPLAY_ID = "ro.build.display.id";
2220
private static final String KEY_FLYME_FLYME = "ro.meizu.setupwizard.flyme";
2321

2422

@@ -64,10 +62,8 @@ private static boolean isMIUI() {
6462
private static boolean isFlyme() {
6563
try {
6664
final BuildProperties prop = BuildProperties.newInstance();
67-
return prop.containsKey(KEY_FLYME_BUILD_USER)
68-
|| prop.containsKey(KEY_FLYME_ICON)
65+
return prop.containsKey(KEY_FLYME_ICON)
6966
|| prop.containsKey(KEY_FLYME_PUBLISHED)
70-
|| prop.containsKey(KEY_FLYME_DISPLAY_ID)
7167
|| prop.containsKey(KEY_FLYME_FLYME);
7268
} catch (final IOException e) {
7369
return false;

0 commit comments

Comments
 (0)