修复权限被绕过BUG

src/main/java/tech/starwin/mvp/beans/HistoryLoanAppInfoBean.java

@@ -2,8 +2,6 @@ package tech.starwin.mvp.beans;
 
 import android.os.Parcelable;
 
-import java.io.Serializable;
-
 /**
  * @作者:XJY
  * @创建日期: 2017/3/15 14:58
@@ -13,7 +11,7 @@ import java.io.Serializable;
  * @更新描述:${TODO}
  */
 
-public class HistoryLoanAppInfoBean extends LoanAppBeanFather implements Parcelable {
+public class HistoryLoanAppInfoBean extends LatestLoanAppBean implements Parcelable {
 
 
     /**

src/main/java/tech/starwin/mvp/presenter/UploadPresenter.java

@@ -73,6 +73,10 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
      * 上传依图 截取得帧图片
      */
     public void faceVerify(final String action, Context context, double amount, int day, long productId) {
+        faceVerify(action, context, PreferencesManager.get().getVerificationData(), amount, day, productId);
+    }
+
+    public void faceVerify(final String action, Context context, String faceData, double amount, int day, long productId) {
         TrackEventHelper.logEvent(TrackEvent.FACE_DETECTION);
         handleRequest(
                 apiService.faceVerify(
@@ -82,7 +86,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
                         "D",
                         null,
                         null,
-                        MultipartBodyMaker.makeSimplePart("delta", PreferencesManager.get().getVerificationData()),
+                        MultipartBodyMaker.makeSimplePart("delta", faceData),
                         AppInfoUtils.getAndroidID(context),
                         productId,
                         LoginManager.get().getToken()

src/main/java/tech/starwin/utils/BrandUtils.java

+package tech.starwin.utils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * 网络资源
+ */
+public class BrandUtils {
+
+    /**
+     * 华为
+     */
+    public static final String SYS_EMUI = "sys_emui";
+    /**
+     * 小米
+     */
+    public static final String SYS_MIUI = "sys_miui";
+    /**
+     * 魅族
+     */
+    public static final String SYS_FLYME = "sys_flyme";
+
+    public static final String SYS_OPPO = "sys_oppo";
+    public static final String SYS_VIVO = "sys_vivo";
+    public static final String SYS_SAMSUNG = "sys_samsung";
+    public static final String SYS_HTC = "sys_htc";
+    public static final String SYS_LG = "sys_lg";
+    public static final String SYS_ZTE = "sys_zte";
+    /**
+     * 锤子
+     */
+    public static final String SYS_SMARTISAN = "sys_smartisan";
+    public static final String SYS_360 = "sys_360";
+
+    public static final String KEY_OPPO_ROM = "ro.build.version.opporom";
+    public static final String KEY_VIVO_VERSION = "ro.vivo.os.version";
+    public static final String KEY_SMARTISAN_VERSION = "ro.smartisan.version";
+    public static final String KEY_360_MANUFACTURER = "QIKU";
+    public static final String KEY_360_MANUFACTURER2 = "360";
+    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";
+    private static final String KEY_EMUI_API_LEVEL = "ro.build.hw_emui_api_level";
+    private static final String KEY_EMUI_VERSION = "ro.build.version.emui";
+    private static final String KEY_EMUI_CONFIG_HW_SYS_VERSION = "ro.confg.hw_systemversion";
+    private static final int CODE_REQUEST_CAMERA_PERMISSIONS = 1521;
+
+    private static SystemInfo systemInfoInstance;
+
+    public static SystemInfo getSystemInfo() {
+        if (systemInfoInstance == null) {
+            synchronized (BrandUtils.class) {
+                if (systemInfoInstance == null) {
+                    systemInfoInstance = new SystemInfo();
+                    getSystem(systemInfoInstance);
+                }
+            }
+        }
+        return systemInfoInstance;
+    }
+
+    /**
+     * 获取系统信息
+     *
+     * @param info
+     */
+    private static void getSystem(SystemInfo info) {
+        try {
+            Properties prop = new Properties();
+            prop.load(new FileInputStream(new File(Environment.getRootDirectory(), "build.prop")));
+            if (prop.getProperty(KEY_MIUI_VERSION_CODE, null) != null
+                    || prop.getProperty(KEY_MIUI_VERSION_NAME, null) != null
+                    || prop.getProperty(KEY_MIUI_INTERNAL_STORAGE, null) != null) {
+                info.os = SYS_MIUI;//小米
+                info.versionCode = Integer.valueOf(prop.getProperty(KEY_MIUI_VERSION_CODE, "0"));
+                info.versionName = prop.getProperty(KEY_MIUI_VERSION_NAME, "V0");
+            } else if (prop.getProperty(KEY_EMUI_API_LEVEL, null) != null
+                    || prop.getProperty(KEY_EMUI_VERSION, null) != null
+                    || prop.getProperty(KEY_EMUI_CONFIG_HW_SYS_VERSION, null) != null) {
+                info.os = SYS_EMUI;//华为
+                info.versionCode = Integer.valueOf(prop.getProperty(KEY_EMUI_API_LEVEL, "0"));
+                info.versionName = prop.getProperty(KEY_EMUI_VERSION, "unknown");
+            } else if (getMeizuFlymeOSFlag().toLowerCase().contains("flyme")) {
+                info.os = SYS_FLYME;//魅族
+                info.versionCode = 0;
+                info.versionName = "unknown";
+            } else if (prop.getProperty(KEY_OPPO_ROM, null) != null) {
+                info.os = SYS_OPPO;
+                info.versionCode = 0;
+                info.versionName = "unknown";
+            }else if (prop.getProperty(KEY_VIVO_VERSION,null) != null){
+                info.os = SYS_VIVO;
+                info.versionCode = 0;
+                info.versionName = prop.getProperty(KEY_VIVO_VERSION,null);
+            }else if (prop.getProperty(KEY_SMARTISAN_VERSION,null) != null){
+                info.os = SYS_SMARTISAN;
+                info.versionCode = 0;
+                info.versionName = prop.getProperty(KEY_SMARTISAN_VERSION,null);
+            }else if(Build.MANUFACTURER != null
+                    && (Build.MANUFACTURER.equalsIgnoreCase(KEY_360_MANUFACTURER)
+                    || Build.MANUFACTURER.equalsIgnoreCase(KEY_360_MANUFACTURER2))){
+                info.os = SYS_360;
+                info.versionCode = 0;
+                info.versionName = prop.getProperty(KEY_SMARTISAN_VERSION,null);
+            }else{
+                String manufacturer = Build.MANUFACTURER;
+                if (manufacturer != null) {
+                    String lManuf = manufacturer.toLowerCase();
+                    if (lManuf.contains("htc")) {
+                        info.os = SYS_HTC;
+                    }else if (lManuf.contains("samsung")){
+                        info.os = SYS_SAMSUNG;
+                    }else if(lManuf.contains("lg")){
+                        info.os = SYS_LG;
+                    }else if (lManuf.contains("zte")){
+                        info.os = SYS_ZTE;
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static String getMeizuFlymeOSFlag() {
+        return getSystemProperty("ro.build.display.id", "");
+    }
+
+    private static String getSystemProperty(String key, String defaultValue) {
+        try {
+            Class<?> clz = Class.forName("android.os.SystemProperties");
+            Method get = clz.getMethod("get", String.class, String.class);
+            return (String) get.invoke(clz, key, defaultValue);
+        } catch (Exception e) {
+        }
+        return defaultValue;
+    }
+
+    /**
+     * 跳转应用设置中心
+     *
+     * @param activity
+     */
+    public static void settingPermissionActivity(Activity activity) {
+        //判断是否为小米系统
+        if (TextUtils.equals(getSystemInfo().getOs(), BrandUtils.SYS_MIUI)) {
+            Intent miuiIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+            miuiIntent.putExtra("extra_pkgname", activity.getPackageName());
+            //检测是否有能接受该Intent的Activity存在
+            List<ResolveInfo> resolveInfos = activity.getPackageManager().queryIntentActivities(miuiIntent, PackageManager.MATCH_DEFAULT_ONLY);
+            if (resolveInfos.size() > 0) {
+                activity.startActivityForResult(miuiIntent, CODE_REQUEST_CAMERA_PERMISSIONS);
+                return;
+            }
+        }
+        //如果不是小米系统 则打开Android系统的应用设置页
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
+        intent.setData(uri);
+        activity.startActivityForResult(intent, CODE_REQUEST_CAMERA_PERMISSIONS);
+    }
+
+    public static class SystemInfo {
+        private String os = "android";
+        private String versionName = Build.VERSION.RELEASE;
+        private int versionCode = Build.VERSION.SDK_INT;
+
+        public String getOs() {
+            return os;
+        }
+
+        public String getVersionName() {
+            return versionName;
+        }
+
+        public int getVersionCode() {
+            return versionCode;
+        }
+
+        @Override
+        public String toString() {
+            return "SystemInfo{" +
+                    "os='" + os + '\'' +
+                    ", versionName='" + versionName + '\'' +
+                    ", versionCode=" + versionCode +
+                    '}';
+        }
+    }
+}
\ No newline at end of file

src/main/java/tech/starwin/utils/context_utils/ActivityJumper.java

 package tech.starwin.utils.context_utils;
 
 import android.app.Activity;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.provider.Settings;
 import android.provider.Telephony;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 
+import com.tbruyelle.rxpermissions2.Permission;
+
 import java.io.Serializable;
 import java.util.List;
 
 import tech.starwin.LibConfig;
 import tech.starwin.R;
+import tech.starwin.utils.BrandUtils;
+import tech.starwin.utils.LogUtils;
 import tech.starwin.utils.ui_utils.DialogFactory;
 import tech.starwin.utils.ui_utils.DialogManager;
 
@@ -26,6 +35,7 @@ import tech.starwin.utils.ui_utils.DialogManager;
 public class ActivityJumper {
     private static String GP_APP_DETAIL_URL = "https://play.google.com/store/apps/details?id=";
     private Intent intent;
+    private static int REQUEST_PERMISSION_CODE = 0x000AF00;
     /**
      * 发起跳转的Context
      */
@@ -99,6 +109,61 @@ public class ActivityJumper {
         startGooglePlay(context, LibConfig.APPLICATION_ID);
     }
 
+    /**
+     * 跳转应用设置中心
+     *
+     * @param activity
+     */
+    public static void toPermissionSetting(Activity activity, String... permissions) {
+        try {
+            //判断是否为小米系统
+            if (TextUtils.equals(BrandUtils.getSystemInfo().getOs(), BrandUtils.SYS_MIUI)) {
+                Intent miuiIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+                miuiIntent.putExtra("extra_pkgname", activity.getPackageName());
+                //检测是否有能接受该Intent的Activity存在
+                List<ResolveInfo> resolveInfos = activity.getPackageManager().queryIntentActivities(miuiIntent, PackageManager.MATCH_DEFAULT_ONLY);
+                if (resolveInfos.size() > 0) {
+                    activity.startActivityForResult(miuiIntent, REQUEST_PERMISSION_CODE);
+                    return;
+                }
+            }
+            //如果不是小米系统 则打开Android系统的应用设置页
+            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
+            intent.setData(uri);
+            intent.putExtra("go settion permission", permissions);
+            activity.startActivityForResult(intent, REQUEST_PERMISSION_CODE);
+        } catch (Throwable e) {
+            LogUtils.e("to setting permission activity error:", e.getMessage());
+        }
+    }
+
+
+    /**
+     * 打开GPS
+     *
+     * @param context
+     */
+    public static final void openGPS(Context context) {
+        LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+        boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+        if (!gps && !network) {
+            Intent GPSIntent = new Intent();
+            GPSIntent.setClassName("com.android.settings",
+                    "com.android.settings.widget.SettingsAppWidgetProvider");
+            GPSIntent.addCategory("android.intent.category.ALTERNATIVE");
+            GPSIntent.setData(Uri.parse("custom:3"));
+            try {
+                PendingIntent.getBroadcast(context, 0, GPSIntent, 0).send();
+            } catch (PendingIntent.CanceledException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+
     public static void startGooglePlay(Context context, String packageName) {
         try {
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(GP_APP_DETAIL_URL + packageName));

src/main/java/tech/starwin/utils/context_utils/PermissionsHelper.java

@@ -48,6 +48,14 @@ import tech.starwin.utils.ui_utils.DialogFactory;
  * 权限管理
  */
 public class PermissionsHelper {
+    public static String[] MUST_PERMISSIONS = new String[]{
+            Manifest.permission.READ_CONTACTS,
+            Manifest.permission.READ_CALL_LOG,
+            Manifest.permission.READ_SMS,
+            Manifest.permission.ACCESS_COARSE_LOCATION,//粗精度定位
+            Manifest.permission.ACCESS_FINE_LOCATION,//卫星定位
+            Manifest.permission.READ_PHONE_STATE
+    };
 
     /**
      * 摄像头权限
@@ -56,19 +64,22 @@ public class PermissionsHelper {
         checkPermission(activity, new String[]{Manifest.permission.CAMERA,
                 Manifest.permission.READ_EXTERNAL_STORAGE,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.RECORD_AUDIO,
-                Manifest.permission.ACCESS_FINE_LOCATION}, listener);
+                Manifest.permission.RECORD_AUDIO}, listener);
     }
 
     /**
-     * 联系人和短信权限
+     * 所有权限
      */
-    public static void checkContactAndSmsPermission(FragmentActivity activity, OnPermissionListener listener) {
+    public static void getAllPermissions(FragmentActivity activity, OnPermissionListener listener) {
         checkPermission(activity, new String[]{Manifest.permission.READ_CONTACTS,
                 Manifest.permission.READ_CALL_LOG,
                 Manifest.permission.READ_SMS,
-                Manifest.permission.RECEIVE_SMS,
-                Manifest.permission.RECEIVE_MMS}, listener);
+                Manifest.permission.ACCESS_COARSE_LOCATION,//粗精度定位
+                Manifest.permission.ACCESS_FINE_LOCATION,//卫星定位
+                Manifest.permission.READ_PHONE_STATE, Manifest.permission.CAMERA,
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                Manifest.permission.RECORD_AUDIO}, listener);
     }
 
     /**
@@ -221,6 +232,14 @@ public class PermissionsHelper {
         return false;
     }
 
+    public static String[] getPermissionStr(Permission... permissions) {
+        String[] permissionStr = new String[permissions.length];
+        for (int i = 0; i < permissions.length; i++) {
+            permissionStr[i] = permissions[i].name;
+        }
+        return permissionStr;
+    }
+
 
     public static void gotoPermissionSetting(Context context) {
         try {