update yitu version

build.gradle

@@ -37,7 +37,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 3
-        versionName "1.10.m"
+        versionName "1.10.n"
     }
     buildTypes {
         release {

src/main/AndroidManifest.xml

@@ -25,7 +25,6 @@
         android:name="android.permission.VIBRATE"
         tools:node="remove" />
 
-
     <uses-permission
         android:name="android.permission.RECORD_AUDIO"
         tools:node="remove" />
@@ -39,14 +38,10 @@
         <activity
             android:name=".idcard_captor.SampleIdcardResult"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".liveness.view_controller.LivenessDetectionActivity"
             android:screenOrientation="portrait" />
 
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="a5743d4d09caed055bc5d622e1bfe69a509d1add" />
     </application>
 
 </manifest>
\ No newline at end of file

src/main/java/com/oliveapp/liveness/sample/libsaasclient/backend/RequestWithSignatureHelper.java

@@ -2,7 +2,6 @@ package com.oliveapp.liveness.sample.libsaasclient.backend;
 
 import android.os.Build;
 
-import com.oliveapp.libcommon.utility.ApplicationParameters;
 import com.oliveapp.libcommon.utility.LogUtil;
 import com.oliveapp.libcommon.utility.Metric;
 import com.oliveapp.liveness.sample.libsaasclient.datatype.AccessInfo;

src/main/java/com/oliveapp/liveness/sample/liveness/view_controller/LivenessDetectionMainActivity.java

@@ -25,9 +25,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.oliveapp.camerasdk.CameraManager;
+import com.oliveapp.camerasdk.MediaRecordConfig;
 import com.oliveapp.camerasdk.PhotoModule;
 import com.oliveapp.camerasdk.utils.CameraUtil;
-import com.oliveapp.camerasdk.MediaRecordConfig;
 import com.oliveapp.face.livenessdetectionviewsdk.event_interface.ViewUpdateEventHandlerIf;
 import com.oliveapp.face.livenessdetectionviewsdk.verification_controller.VerificationController;
 import com.oliveapp.face.livenessdetectionviewsdk.verification_controller.VerificationControllerFactory;
@@ -427,17 +427,17 @@ public abstract class LivenessDetectionMainActivity extends Activity implements
         // 改变默认的模型路径，不访问sdcard
         mLivenessDetectorConfig.sdcardPath = ApplicationParameters.STORAGE_PATH;
         mLivenessDetectorConfig.modelPath = ApplicationParameters.STORAGE_PATH + "/model";
+        /**
+         * 注意，以下代码是配合SampleApp的设置工程，请在集成时请删除
+         */
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean isDebug = sharedPrefs.getBoolean("pref_debug_mode", false);
 
         mLivenessDetectorConfig.fixedActions = true;
         mLivenessDetectorConfig.fixedActionList = Arrays.asList(1, 3);
         mLivenessDetectorConfig.minPass = 2;
         mLivenessDetectorConfig.maxFail = 1;
 
-        /**
-         * 注意，以下代码是配合SampleApp的设置工程，请在集成时请删除
-         */
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean isDebug = sharedPrefs.getBoolean("pref_debug_mode", false);
         if (isDebug) {
             int actionOne = Integer.valueOf(sharedPrefs.getString("pref_action_one_list", "3"));
             int actionTwo = Integer.valueOf(sharedPrefs.getString("pref_action_two_list", "3"));

src/main/java/com/oliveapp/liveness/sample/uicomponents/FixedAspectLayout.java

@@ -3,11 +3,8 @@ package com.oliveapp.liveness.sample.uicomponents;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.widget.FrameLayout;
 
-import com.oliveapp.libcommon.utility.LogUtil;
-import com.oliveapp.libcommon.utility.PackageNameManager;
 import com.oliveapp.liveness.sample.R;
 import com.oliveapp.liveness.sample.utils.SampleScreenDisplayHelper;
 

src/main/java/com/oliveapp/liveness/sample/utils/SampleScreenDisplayHelper.java

@@ -2,8 +2,13 @@ package com.oliveapp.liveness.sample.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
+import android.util.Log;
+
+import com.oliveapp.liveness.sample.R;
+
 /**
  * Created by cli on 1/10/17.
  */
@@ -64,6 +69,7 @@ public class SampleScreenDisplayHelper {
      * 若是手机，返回true
      */
     public static boolean ifThisIsPhone(Context context) {
+        /*
         DisplayMetrics dm = context.getResources().getDisplayMetrics();
 
         int widthPixels = dm.widthPixels;
@@ -84,6 +90,14 @@ public class SampleScreenDisplayHelper {
             }
             return false;
         }
+        */
+        if("phone".equals(context.getResources().getString(R.string.screen_type))) {
+            return true;
+        }
+        else if ("tablet".equals(context.getResources().getString(R.string.screen_type))) {
+            return false;
+        }
+        return true;
     }
 
     /**

src/main/res/values-large/screen.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="screen_type">tablet</string>
+</resources>

src/main/res/values-sw480dp/screen.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="screen_type">phone</string>
+</resources>

src/main/res/values-sw600dp/screen.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="screen_type">tablet</string>
+</resources>

src/main/res/values-sw720dp/screen.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="screen_type">tablet</string>
+</resources>

src/main/res/values-xlarge/screen.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="screen_type">tablet</string>
+</resources>

src/main/res/values/oliveapp_strings.xml

 <resources>
 
-    <string name="oliveapp_app_name">活体检测sample</string>
+    <string name="oliveapp_app_name">Sampel uji hidup</string>
 
     <string name="initialize_fail">Gagal Inisialisasi</string>
 

src/main/res/values/screen.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="screen_type">phone</string>
+</resources>