zhangxinyu 5 gadi atpakaļ
vecāks
revīzija
4592fd51cc

+ 1 - 1
app/src/main/java/com/tongyu/luck/happywork/utils/ActionBarUtils.java

@@ -43,7 +43,7 @@ public class ActionBarUtils {
      */
     public static void initStatus(AppCompatActivity mContext, boolean isShowStatus, boolean isFitSystemWindows, boolean isDark) {
         ActionBarUtils.setRootViewFitsSystemWindows(mContext, isFitSystemWindows);
-        ActionBarUtils.setStatusBarColor(mContext, mContext.getResources().getColor(R.color.title_color));
+        ActionBarUtils.setStatusBarColor(mContext, mContext.getResources().getColor(R.color.white));
         //设置状态栏透明
         if (!isShowStatus)
             ActionBarUtils.setTranslucentStatus(mContext);

+ 0 - 145
baselibrary/src/main/java/com/tongyu/luck/happywork/baselibrary/utils/OSUtil.java

@@ -1,145 +0,0 @@
-package com.tongyu.luck.happywork.baselibrary.utils;
-
-import android.os.Environment;
-import android.text.TextUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-public class OSUtil {
-    //MIUI标识
-    private static final String KEY_MIUI_VERSION_CODE = "ro.miui.ui.version.code";
-    private static final String KEY_MIUI_VERSION_NAME = "ro.miui.ui.version.name";
-    private static final String KEY_MIUI_INTERNAL_STORAGE = "ro.miui.internal.storage";
-
-    //EMUI标识
-    private static final String KEY_EMUI_VERSION_CODE = "ro.build.version.emui";
-    private static final String KEY_EMUI_API_LEVEL = "ro.build.hw_emui_api_level";
-    private static final String KEY_EMUI_CONFIG_HW_SYS_VERSION = "ro.confg.hw_systemversion";
-
-    //Flyme标识
-    private static final String KEY_FLYME_ID_FALG_KEY = "ro.build.display.id";
-    private static final String KEY_FLYME_ID_FALG_VALUE_KEYWORD = "Flyme";
-    private static final String KEY_FLYME_ICON_FALG = "persist.sys.use.flyme.icon";
-    private static final String KEY_FLYME_SETUP_FALG = "ro.meizu.setupwizard.flyme";
-    private static final String KEY_FLYME_PUBLISH_FALG = "ro.flyme.published";
-
-    /**
-     * 是否是Flyme系统
-     * @return
-     */
-    public static boolean isFlyme() {
-        if(isPropertiesExist(KEY_FLYME_ICON_FALG, KEY_FLYME_SETUP_FALG, KEY_FLYME_PUBLISH_FALG)) {
-            return true;
-        }
-        try {
-            BuildProperties buildProperties = BuildProperties.newInstance();
-            if(buildProperties.containsKey(KEY_FLYME_ID_FALG_KEY)) {
-                String romName = buildProperties.getProperty(KEY_FLYME_ID_FALG_KEY);
-                if (!TextUtils.isEmpty(romName) && romName.contains(KEY_FLYME_ID_FALG_VALUE_KEYWORD)) {
-                    return true;
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    /**
-     * 是否是EMUI系统
-     * @return
-     */
-    public static boolean isEMUI() {
-        return isPropertiesExist(KEY_EMUI_VERSION_CODE, KEY_EMUI_API_LEVEL,
-                KEY_EMUI_CONFIG_HW_SYS_VERSION);
-    }
-
-    /**
-     * 是否是MIUI系统
-     * @return
-     */
-    public static boolean isMIUI() {
-        return isPropertiesExist(KEY_MIUI_VERSION_CODE, KEY_MIUI_VERSION_NAME,
-                KEY_MIUI_INTERNAL_STORAGE);
-    }
-
-    private static boolean isPropertiesExist(String... keys) {
-        if (keys == null || keys.length == 0) {
-            return false;
-        }
-        try {
-            BuildProperties properties = BuildProperties.newInstance();
-            for (String key : keys) {
-                String value = properties.getProperty(key);
-                if (value != null)
-                    return true;
-            }
-            return false;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    private static final class BuildProperties {
-
-        private final Properties properties;
-
-        private BuildProperties() throws IOException {
-            properties = new Properties();
-            // 读取系统配置信息build.prop类
-            properties.load(new FileInputStream(new File(Environment.getRootDirectory(), "build" +
-                    ".prop")));
-        }
-
-        public boolean containsKey(final Object key) {
-            return properties.containsKey(key);
-        }
-
-        public boolean containsValue(final Object value) {
-            return properties.containsValue(value);
-        }
-
-        public Set<Map.Entry<Object, Object>> entrySet() {
-            return properties.entrySet();
-        }
-
-        public String getProperty(final String name) {
-            return properties.getProperty(name);
-        }
-
-        public String getProperty(final String name, final String defaultValue) {
-            return properties.getProperty(name, defaultValue);
-        }
-
-        public boolean isEmpty() {
-            return properties.isEmpty();
-        }
-
-        public Enumeration<Object> keys() {
-            return properties.keys();
-        }
-
-        public Set<Object> keySet() {
-            return properties.keySet();
-        }
-
-        public int size() {
-            return properties.size();
-        }
-
-        public Collection<Object> values() {
-            return properties.values();
-        }
-
-        public static BuildProperties newInstance() throws IOException {
-            return new BuildProperties();
-        }
-    }
-}