update script

release_builder.sh

+rm -rf ../resGuardApks
+cd ..
+gradlew clean
+gradlew resguardAppProductGoogleplayRelease
+#cd script
+#./rename_project.sh
+#cd ../../
+#gradlew resguardAppProductGoogleplayRelease
+#cd lib_base/script
+#./reset_name.sh
\ No newline at end of file

src/main/java/tech/starwin/mvp/api/UploadApi.java

@@ -57,7 +57,7 @@ public interface UploadApi {
     @Multipart
     /*@PUT("/loanapp/verify/face") face++*/
     @PUT("/loanapp/verify/yitu")
-    Call<BasicAck> faceVerify(@Query("loanType") String loanType,
+    Observable<BasicAck> faceVerify(@Query("loanType") String loanType,
                               @Query("amount") double amount,
                               @Query("period") int period,
                               @Query("periodUnit") String periodUnit,

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

@@ -9,6 +9,13 @@ import com.google.gson.Gson;
 
 import java.io.File;
 
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.functions.Function;
+import io.reactivex.functions.Predicate;
+import io.reactivex.schedulers.Schedulers;
 import tech.starwin.LibConfig;
 import tech.starwin.base.BasePresenter;
 import tech.starwin.constants.TrackEvent;
@@ -19,7 +26,7 @@ import com.common.bean.BasicAck;
 import com.common.bean.OcrResultBean;
 import com.google.gson.JsonObject;
 
-import tech.starwin.utils.GeneralUtils;
+import tech.starwin.utils.LogUtils;
 import tech.starwin.utils.LoginManager;
 import tech.starwin.utils.MultipartBodyMaker;
 import tech.starwin.utils.PreferencesManager;
@@ -89,16 +96,12 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
         faceVerify(action, androidId, livenessId, amount, day, productId, "advance");
     }
 
+
     public void faceVerify(final String action, String androidId, String faceData, double amount, int day, long productId, String method) {
         TrackEventHelper.logEvent(TrackEvent.FACE_DETECTION);
         handleRequest(
                 apiService.faceVerify(
-                        "PAYDAY",
-                        amount,
-                        day,
-                        "D",
-                        null,
-                        null,
+                        "PAYDAY", amount, day, "D", null, null,
                         MultipartBodyMaker.makeSimplePart("delta", faceData),
                         androidId,
                         productId,
@@ -130,6 +133,44 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
                 });
     }
 
+    /**
+     * 无活体SDK 时，后台设置活体检查次数，这里连续请求若干次，直到通过
+     */
+    public void faceVerifyWithoutSDK(final String action, Context context, double amount, int day, long productId) {
+        Observable observable = Observable.fromArray(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+                .flatMap((Function<Integer, ObservableSource<BasicAck>>) integer ->
+                        apiService.faceVerify("PAYDAY", amount, day, "D", null, null,
+                                MultipartBodyMaker.makeSimplePart("delta", "null"), AppInfoUtils.getAndroidID(context), productId,
+                                !TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY), "yitu", LoginManager.get().getToken()
+                        ).onErrorReturn(throwable -> new BasicAck()))
+                .filter(basicAck -> basicAck != null && basicAck.getData() != null)
+                .take(1);
+
+
+        handleRequest(observable, new HttpObserver<BasicAck>() {
+            @Override
+            public void onStart() {
+                view.onHttpStart(action, true);
+            }
+
+            @Override
+            public void onSuccess(BasicAck data) {
+                TrackEventHelper.logEvent(TrackEvent.FACE_DETECTION_SUCCESS);
+                view.onHttpSuccess(action, data);
+            }
+
+            @Override
+            public void onError(int code, String msg) {
+                view.onHttpError(action, msg);
+            }
+
+            @Override
+            public void onFinish() {
+                view.onHttpFinish(action);
+            }
+        });
+    }
+
 
     /**
      * 上传fireBaseMessing Token

src/main/res/values-en-rUS/strings.xml

@@ -190,6 +190,8 @@
     <string name="text_loan_raiders">How to Borrow</string>
     <string name="text_repayment_raiders_2">How to repayment the Loan</string>
 
+    <string name="start_loan_tip">Are you sure you want to apply for this loan?</string>
+
 
     <string name="text_title_about">About Us</string>
     <string name="text_title_helpcenter">Help Center</string>

src/main/res/values-zh-rCN/strings.xml

@@ -120,6 +120,7 @@
     <string name="button_bank_determine">选择</string>
 
 
+
     <string name="edittext_personal_info_full_name">全名</string>
     <string name="edittext_personal_info_ktp_no">身份证号</string>
 
@@ -187,6 +188,8 @@
 
     <string name="text_temporarily_no_data">暂无数据</string>
 
+    <string name="start_loan_tip">确定要申请这笔贷款吗？</string>
+
 
     <string name="text_title_about">关于我们</string>
     <string name="text_title_helpcenter">帮助中心</string>

src/main/res/values/strings.xml

@@ -114,6 +114,8 @@
     <string name="text_days_left">Jumlah Hari Yang Tersisa</string>
     <string name="text_whats_app_id">WhatsApp ID</string>
 
+    <string name="start_loan_tip">Apakah Anda yakin ingin mengajukan pinjaman ini?</string>
+
 
     <string name="text_been_payment_text">Telah Dikembalikan: </string>
     <string name="text_total_acount">Rp642.000</string>