add liveness motion

app_build.gradle

@@ -38,7 +38,7 @@ android {
             ndk {
                 if ("${tongdun_parent_key}".size() > 5) {
                     abiFilters 'armeabi-v7a'
-                }else{
+                } else {
                     abiFilters 'armeabi-v7a', 'arm64-v8a'//,'armeabi'//,  'arm64-v8a', 'x86'
                 }
             }
@@ -59,6 +59,17 @@ dependencies {
             executable 'sh' args "-c", "./sdk_manager.py close TD"
         }
     }
+    exec {
+        //活体选择
+        workingDir = "../lib_base/script/code"
+        try {
+            executable 'sh' args "-c", "./choose_liveness.sh ${liveness}"
+        } catch (Exception e) {
+            executable 'sh' args "-c", "./choose_liveness.sh yitu"
+        }
+    }
+
+
 
 //    def startParams = getGradle().getStartParameter().getTaskRequests()[0]
 //    if(startParams!=null && startParams.getArgs().toString().contains("Website")){

script/code/choose_liveness.sh

+cd ..
+if [[ ${1} == 'motion' ]];then
+    ./sdk_manager.py open MOTION
+    ./sdk_manager.py close ADVANCE
+    ./sdk_manager.py close YITU
+
+elif [[ ${1} == 'advance' ]];then
+    ./sdk_manager.py open ADVANCE
+    ./sdk_manager.py close MOTION
+    ./sdk_manager.py close YITU
+
+else
+    ./sdk_manager.py open YITU
+    ./sdk_manager.py close MOTION
+    ./sdk_manager.py close ADVANCE
+fi
\ No newline at end of file

src/main/java/com/common/bean/DisplayBean.java

@@ -22,6 +22,9 @@ public class DisplayBean implements Serializable {
     private String advancePictureQualitySecretKey;
     private String restUrlSignKey;
 
+    private String motionAppKey;
+    private String motionSecret;
+
     private AccountKitInfo accountKitInfo;
 
 
@@ -153,4 +156,20 @@ public class DisplayBean implements Serializable {
     public void setTongDunFlag(boolean tongDunFlag) {
         this.tongDunFlag = tongDunFlag;
     }
+
+    public String getMotionAppKey() {
+        return motionAppKey;
+    }
+
+    public void setMotionAppKey(String motionAppKey) {
+        this.motionAppKey = motionAppKey;
+    }
+
+    public String getMotionSecret() {
+        return motionSecret;
+    }
+
+    public void setMotionSecret(String motionSecret) {
+        this.motionSecret = motionSecret;
+    }
 }

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

@@ -95,14 +95,21 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
 
 
     /**
-     * 上传依图 截取得帧图片
+     * 上传依图 活体照片
      */
     public void faceVerify(final String action, Context context, double amount, int day, long productId) {
         faceVerify(action, AppInfoUtils.getAndroidID(context), PreferencesManager.get().getVerificationData(), amount, day, productId, "yitu");
     }
 
     /**
-     * 上传advance 活体图片
+     * 上传motion 活体照片
+     */
+    public void faceVerifyMotion(final String action, Context context, String faceData, double amount, int day, long productId) {
+        faceVerify(action, AppInfoUtils.getAndroidID(context), faceData, amount, day, productId, "motion");
+    }
+
+    /**
+     * 上传advance 活体照片
      */
     public void advanceFaceVerify(final String action, String androidId, String faceData, double amount, int day, long productId) {
         String livenessId = new Gson().fromJson(faceData, JsonObject.class).get("livenessId").toString().replace("\"", "");