Simugu第一波BUG修复

build.gradle

@@ -83,8 +83,8 @@ dependencies {
     api 'com.google.code.gson:gson:2.8.2'
 
     //bugly
-    api 'com.tencent.bugly:crashreport:2.6.6.1'
-    api 'com.tencent.bugly:nativecrashreport:3.3.1'
+//    api 'com.tencent.bugly:crashreport:2.6.6.1'
+//    api 'com.tencent.bugly:nativecrashreport:3.3.1'
 
     //rxjava
     api 'com.jakewharton.rxbinding2:rxbinding:2.2.0'
@@ -110,7 +110,10 @@ dependencies {
     api 'com.google.firebase:firebase-config:16.0.0'
 
     //camerakit
-    api 'com.wonderkiln:camerakit:0.13.1'
+//    api 'com.wonderkiln:camerakit:0.13.1'
+    api 'com.camerakit:camerakit:1.0.0-beta3.10'
+    api 'com.camerakit:jpegkit:0.1.0'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
 
     //facebook accountKit SDK
     api 'com.facebook.android:account-kit-sdk:4.37.0'

proguard-rules.pro

@@ -54,10 +54,15 @@
 -keep public class * extends android.app.backup.BackupAgentHelper
 -keep public class * extends android.preference.Preference
 -keep public class com.android.vending.licensing.ILicensingService
--keep public class * extends java.lang.annotation.Annotation
 #如果有引用v4包可以添加下面这行
 -keep public class * extends android.support.v4.app.Fragment
 
+#camerakit
+-dontwarn com.google.android.gms.**
+-keep class com.camerakit.** { *; }
+-keepclasseswithmembers class com.camerakit.preview.CameraSurfaceView {
+    native <methods>;
+}
 
 #忽略警告
 -ignorewarnings
@@ -332,7 +337,6 @@
 #
 -keep class com.appsflyer.** {*;}
 -keep interface com.appsflyer.** {*;}
--dontwarn com.android.installreferrer
 
 #
 -keep class java.** {*;}
@@ -376,7 +380,7 @@
 -dontwarn com.tencent.bugly.**
 -keep public class com.tencent.bugly.**{*;}
 
-#facebook accoutkit
+#icon_facebook accoutkit
 -keep class com.facebook.FacebookSdk {
    boolean isInitialized();
 }

src/main/java/tech/starwin/LibConfig.java

@@ -17,7 +17,6 @@ import com.scwang.smartrefresh.layout.api.RefreshHeader;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
-import com.tencent.bugly.crashreport.CrashReport;
 
 
 import org.litepal.LitePal;
@@ -72,6 +71,7 @@ public class LibConfig {
     public static String TONGDUN_PARENT_KEY;
     public static String APPSFLYER_DEV_KEY;
     public static String XH_CHANNEL_NAME;
+    public static String TEST_TOKEN;
     public static String LANGUAGE = "in";
     public static int HARVESTER_PORT;//
     public static int LOADING_ICON;//loading图标
@@ -117,9 +117,9 @@ public class LibConfig {
             Gateway.init(PreferencesManager.get().getGatewayInfo());
 
             //init Bugly
-            if (!TextUtils.isEmpty(BUGLY_APP_ID)) {
-                CrashReport.initCrashReport(CONTEXT, BUGLY_APP_ID, DEBUG);
-            }
+//            if (!TextUtils.isEmpty(BUGLY_APP_ID)) {
+//                CrashReport.initCrashReport(CONTEXT, BUGLY_APP_ID, DEBUG);
+//            }
 
             //init AppsFlyer
             if (!TextUtils.isEmpty(APPSFLYER_DEV_KEY)) {

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

@@ -53,6 +53,9 @@ public class GatewayInfoBean implements Serializable {
         if (gatewayInfo.admin != null && gatewayInfo.admin.size() > 0) {
             admin = gatewayInfo.admin;
         }
+        if (gatewayInfo.repay != null && gatewayInfo.repay.size() > 0) {
+            repay = gatewayInfo.repay;
+        }
         if (gatewayInfo.privacy != null && gatewayInfo.privacy.size() > 0) {
             privacy = gatewayInfo.privacy;
         }

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

@@ -45,10 +45,11 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
                     public void onSuccess(OcrResultBean data) {
                         TrackEventHelper.logEvent(TrackEvent.IDENTITY_INFO_SUBMIT);
                         OcrResultBean.KTP ktp = new Gson().fromJson(data.getData(), OcrResultBean.KTP.class);
-                        if (ktp.getResult().equals("PASS"))
+                        if (ktp != null && ktp.getResult() != null && ktp.getResult().equals("PASS")) {
                             view.onHttpSuccess(action, ktp);
-                        else
+                        } else {
                             view.onHttpError(action, ktp.getMessage());
+                        }
                     }
 
                     @Override

src/main/java/tech/starwin/mvp/ui/activity/TakePhotoActivity.java

@@ -6,18 +6,16 @@ import android.support.annotation.DrawableRes;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageButton;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.wonderkiln.camerakit.CameraKitError;
-import com.wonderkiln.camerakit.CameraKitEvent;
-import com.wonderkiln.camerakit.CameraKitEventListener;
-import com.wonderkiln.camerakit.CameraKitImage;
-import com.wonderkiln.camerakit.CameraKitVideo;
-import com.wonderkiln.camerakit.CameraView;
+
+import com.camerakit.CameraKitView;
 
 import java.io.File;
+import java.io.FileOutputStream;
 
 import tech.starwin.R;
 import tech.starwin.base.BaseActivity;
@@ -51,7 +49,7 @@ public class TakePhotoActivity extends BaseActivity {
     ImageView btnCapture;
     ImageView maskImv;
     Button mbtnCancel;
-    CameraView cameraView;
+    CameraKitView cameraView;
 
     public static String KTP_IMAGE = "ktp_img.jpg";
 
@@ -88,7 +86,29 @@ public class TakePhotoActivity extends BaseActivity {
             @Override
             public void onEventClick(View v) {
                 if (v.getId() == R.id.button_shoot) {
-                    cameraView.captureImage();
+                    cameraView.captureImage(new CameraKitView.ImageCallback() {
+                        @Override
+                        public void onImage(CameraKitView cameraKitView, byte[] bytes) {
+                            File image = FileUtils.getImageFile(getApplicationContext(), KTP_IMAGE);
+                            if (!image.exists()) {
+                                image.mkdir();
+                            }
+                            try {
+                                FileOutputStream outputStream = new FileOutputStream(image.getPath());
+                                outputStream.write(bytes);
+                                outputStream.close();
+
+                                Intent intent = new Intent();
+                                intent.putExtra("image_path", image.getAbsolutePath());
+                                setResult(RESULT_OK, intent);
+                                finish();
+                            } catch (java.io.IOException e) {
+                                e.printStackTrace();
+                            }
+
+
+                        }
+                    });
                 } else if (v.getId() == R.id.button_cancel) {
                     setResult(RESULT_CANCELED);
                     finish();
@@ -96,64 +116,31 @@ public class TakePhotoActivity extends BaseActivity {
             }
         }, mbtnCancel, btnCapture);
 
-        //拍照监听
-        cameraView.addCameraKitListener(new CameraKitEventListener() {
-            @Override
-            public void onEvent(CameraKitEvent cameraKitEvent) {
-
-            }
-
-            @Override
-            public void onError(CameraKitError cameraKitError) {
-            }
-
-            @Override
-            public void onImage(CameraKitImage cameraKitImage) {
-                Bitmap bitmap = BitmapUtils.getBitmapWithMaxLimit(cameraKitImage.getJpeg(), BITMAP_MAX_SQUARE_SIZE, PHOTO_FILE_SIZE_MAX);
-                File image = FileUtils.getImageFile(getApplicationContext(), KTP_IMAGE);
-                if (!image.exists()) {
-                    image.mkdir();
-                }
-                BitmapUtils.saveBitmapToSDCard(BitmapUtils.getHorizontalPhoto(bitmap), image, 80);
-                Intent intent = new Intent();
-                intent.putExtra("image_path", image.getAbsolutePath());
-                setResult(RESULT_OK, intent);
-                finish();
-            }
-
-            @Override
-            public void onVideo(CameraKitVideo cameraKitVideo) {
-
-            }
-        });
     }
 
 
     @Override
     protected void onStart() {
+        cameraView.onStart();
         super.onStart();
-        try {
-            cameraView.start();
-        }catch (Exception e){
-            UploadManager.uploadException(e,"camera start exception");
-        }
+    }
+
+    @Override
+    protected void onPause() {
+        cameraView.onPause();
+        super.onPause();
     }
 
     @Override
     protected void onResume() {
+        cameraView.onResume();
         super.onResume();
     }
 
     @Override
     protected void onStop() {
+        cameraView.onStop();
         super.onStop();
-        try {
-            cameraView.stop();
-        }catch (Exception e){
-
-            UploadManager.uploadException(e,"camera stop exception");
-        }
-
     }
 
     @Override

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

@@ -136,6 +136,10 @@ public class LoginManager {
      * 获取Token
      */
     public String getToken() {
+        //需要用客户的token测试时使用
+        if (!TextUtils.isEmpty(LibConfig.TEST_TOKEN)) {
+            return LibConfig.TEST_TOKEN;
+        }
         return getTokenInfo() == null ? "" : getTokenInfo().getToken();
     }
 

src/main/res/layout/activity_take_photo.xml

 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -14,12 +15,16 @@
             android:layout_height="match_parent"
             android:background="@color/gray_bg">
 
-            <com.wonderkiln.camerakit.CameraView
+            <com.camerakit.CameraKitView
                 android:id="@+id/cameraView"
+                app:camera_facing="back"
+                app:camera_flash="auto"
+                app:camera_focus="continuous"
+                app:camera_permissions="camera"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:adjustViewBounds="true"
-                android:focusableInTouchMode="true" />
+                android:keepScreenOn="true" />
 
             <LinearLayout
                 android:id="@+id/imageview_id_frame"
@@ -55,8 +60,8 @@
                         android:id="@+id/activity_takephoto_mask_imv"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_weight="1"
                         android:layout_margin="10dp"
+                        android:layout_weight="1"
                         android:focusableInTouchMode="false" />
 
                     <com.qmuiteam.qmui.widget.QMUIVerticalTextView

src/main/res/values/strings.xml

@@ -701,7 +701,7 @@
     <string name="loan_result_title_approved">Pengeluaran pinjaman berhasil</string>
     <string name="loan_result_tip_approved">Silahkan periksa rekening bank anda.\nSilahkan tepat waktu dalam pelunasan, rekening pelunasan bandingkan dengan aplikasi, jangan percaya rekening pelunasan yang diperoleh dari luar aplikasi.</string>
     <string name="text_sure">OKE</string>
-    <string name="loan_result_title_rejected">Maaf, pengajuan anda tidak disetujui!</string>
+    <string name="loan_result_title_rejected">Maaf, pengajuan Anda ditolak!</string>
     <string name="loan_close_resion">1.Informasi Anda salah\n2.Gambar tidak jelas.</string>
     <string name="loan_result_tip_rejected">Pinjaman Anda telah ditolak, Anda bisa mencoba lagi</string>
     <string name="toast_please_finish_info">Isi semua informasi sebelum mengajukan pinjaman</string>
@@ -762,7 +762,7 @@
 
 
     <string name="dialog_closed_revisi">REVISI</string>
-    <string name="dialog_closed_tips">Data perlu di Ruban karena alasan berikut, silahkan ajukan lagi setelah diperbaiki</string>
+    <string name="dialog_closed_tips">Di bawah ini tercantum alasan untuk melakukan perubahan data yang Anda telah berikan. Silahkan ajukan lagi setelah diperbaiki.</string>
     <string name="dialog_closed_check_in_inbox">Anda dapat memeriksa alasan di pusat informasi pada kanan atas layar</string>
     <string name="dialog_closed_modify">Perbaiki</string>
     <string name="camera_start_failed_tips">Aplikasi lain mungkin sedang merekam audio atau video, silahkan coba lagi dalam beberapa saat</string>