第3次提交 LOAN VERIFICAQTION

verification/src/main/java/com/dskj/verification/ui/activity/HomeActivity.java

@@ -15,6 +15,8 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.azhon.basic.base.BaseActivity;
+import com.cazaea.sweetalert.SweetAlertDialog;
+import com.dskj.verification.InitApp;
 import com.dskj.verification.R;
 import com.dskj.verification.adapter.comm.CommonAdapter;
 import com.dskj.verification.adapter.comm.ViewHolder;
@@ -108,6 +110,31 @@ public class HomeActivity extends BaseActivity<MainViewModel, ActivityHomeBindin
             }
         });
     }
+    public void exit(){
+        SweetAlertDialog pDialog = new SweetAlertDialog(this, SweetAlertDialog.WARNING_TYPE);
+        pDialog.setTitleText("退出帳號？");
+        pDialog.setConfirmText("退出");
+        pDialog.show();
+        pDialog.setConfirmClickListener(sweetAlertDialog -> Api.getInstance().logout()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new BaseObserver<Result>() {
+
+                    @Override
+                    public void onSuccess(Result feedbackResp) {
+                        InitApp.setUserToken("");
+                        startActivity(new Intent(HomeActivity.this, LoginActivity.class));
+                        finish();
+                    }
+
+                    @Override
+                    public void onError(int code, String msg) {
+                        InitApp.setUserToken("");
+                        startActivity(new Intent(HomeActivity.this, LoginActivity.class));
+                        finish();
+                    }
+                }));
+    }
 
     /***
      * viewpager的事件操作

verification/src/main/java/com/dskj/verification/ui/fragment/QingZhangFragment.java

@@ -50,6 +50,7 @@ import com.dskj.verification.bean.CallLogBean;
 import com.dskj.verification.bean.LoanApplyBean;
 import com.dskj.verification.bean.UserBean;
 import com.dskj.verification.databinding.FragmentClearAccountBinding;
+import com.dskj.verification.ui.activity.HomeActivity;
 import com.dskj.verification.ui.activity.LoginActivity;
 import com.dskj.verification.ui.activity.MainActivity;
 import com.dskj.verification.ui.activity.XiangQingActivity;
@@ -85,6 +86,7 @@ public class QingZhangFragment extends BaseFragment<MainViewModel, FragmentClear
     private String imageUriString = "";
     private String imageUriStringNet = "";
     boolean isRenXiang = true;
+    HomeActivity homeActivity;
 
     private Uri imageUriGuoHui;
     private String imageUriGuoHuiString = "";
@@ -116,6 +118,7 @@ public class QingZhangFragment extends BaseFragment<MainViewModel, FragmentClear
     int shoquuanSize = 0;
 
     String defaultJson = "[{\"id\":25,\"name\":\"Co-op Bank Pertama\"},{\"id\":5,\"name\":\"Maybank\"},{\"id\":6,\"name\":\"CIMB\"},{\"id\":7,\"name\":\"Public Bank Berhad\"},{\"id\":8,\"name\":\"RHB Bank\"},{\"id\":9,\"name\":\"Hong Leong Bank\"},{\"id\":10,\"name\":\"AmBank\"},{\"id\":11,\"name\":\"UOB Malaysia\"},{\"id\":12,\"name\":\"Bank Rakyat\"},{\"id\":13,\"name\":\"OCBC Bank Malaysia\"},{\"id\":14,\"name\":\"HSBC Bank\"},{\"id\":15,\"name\":\"Bank Islam\"},{\"id\":16,\"name\":\"Affin Bank\"},{\"id\":17,\"name\":\"Alliance Bank\"},{\"id\":18,\"name\":\"Standard Chartered\"},{\"id\":19,\"name\":\"MBSB Bank Berhad\"},{\"id\":20,\"name\":\"Citibank Malaysia\"},{\"id\":21,\"name\":\"Bank Simpanan Nasional (BSN)\"},{\"id\":22,\"name\":\"Bank Muamalat\"},{\"id\":23,\"name\":\"Agrobank\"},{\"id\":24,\"name\":\"Al-Rajhi Malaysia\"},{\"id\":26,\"name\":\"TNG\"},{\"id\":27,\"name\":\"Deutsche Bank Aktiengesellschaf\"},{\"id\":28,\"name\":\"Al Rajhi Banking & Investment Corporation\"},{\"id\":29,\"name\":\"MIMB Investment Bank Berhad\"},{\"id\":30,\"name\":\"Kenanga Investment Bank Berhad\"},{\"id\":31,\"name\":\"KAF Investment Bank Berhad\"},{\"id\":32,\"name\":\"AmInvestment Bank Berhad\"},{\"id\":33,\"name\":\"Kuwait Finance House\"},{\"id\":34,\"name\":\"Asian Finance Bank Berhad\"},{\"id\":35,\"name\":\"Al Rajhi Banking & Investment Corporation\"},{\"id\":36,\"name\":\"United Overseas Bank (Malaysia) Bhd.\"},{\"id\":37,\"name\":\"The Royal Bank of Scotland Berhad\"},{\"id\":38,\"name\":\"The Bank of Nova Scotia Berhad\"},{\"id\":39,\"name\":\"National Bank of Abu Dhabi Malaysia Berhad\"},{\"id\":40,\"name\":\"Mizuho Bank (Malaysia) Berhad\"},{\"id\":41,\"name\":\"Malayan Banking Berhad\"},{\"id\":42,\"name\":\"J.P. Morgan Chase Bank Berhad\"},{\"id\":43,\"name\":\"Industrial and Commercial Bank of China\"},{\"id\":44,\"name\":\"India International Bank\"},{\"id\":45,\"name\":\"Deutsche Bank\"},{\"id\":46,\"name\":\"Bank of Tokyo-Mitsubishi UFJ\"},{\"id\":47,\"name\":\"Bank of China\"},{\"id\":48,\"name\":\"Bank of America Malaysia\"},{\"id\":49,\"name\":\"Bangkok Bank Berhad\"},{\"id\":50,\"name\":\"BNP Paribas Malaysia Berha\"}]";
+
     @Override
     protected MainViewModel initViewModel() {
         return ViewModelProviders.of(this).get(MainViewModel.class);
@@ -984,7 +987,6 @@ public class QingZhangFragment extends BaseFragment<MainViewModel, FragmentClear
     }
 
 
-
     private void updatePhone() {
         if (contents != null && contents.size() > 0) {
             String name = "";
@@ -1408,31 +1410,15 @@ public class QingZhangFragment extends BaseFragment<MainViewModel, FragmentClear
     protected void setUpView() {
         rxPermissions = new RxPermissions(this);
         this.saveDirFromIntent = getReceivedShortVideoSavedDirHasSlash();
-
+        homeActivity = (HomeActivity) getActivity();
         dataBinding.backButton.setOnClickListener(view -> {
-            SweetAlertDialog pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.WARNING_TYPE);
+            if(dataBinding.step2Ry.getVisibility() ==View.VISIBLE){
-            pDialog.setTitleText("退出帳號？");
+                dataBinding.step1Ry.setVisibility(View.VISIBLE);
-            pDialog.setConfirmText("退出");
+                dataBinding.step2Ry.setVisibility(View.GONE);
-            pDialog.show();
+                dataBinding.sfzIv.setVisibility(View.VISIBLE);
-            pDialog.setConfirmClickListener(sweetAlertDialog -> Api.getInstance().logout()
+            }else{
-                    .subscribeOn(Schedulers.io())
+                homeActivity.exit();
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BaseObserver<Result>() {
-
-                        @Override
-                        public void onSuccess(Result feedbackResp) {
-                            InitApp.setUserToken("");
-                            startActivity(new Intent(getActivity(), LoginActivity.class));
-                            getActivity().finish();
             }
-
-                        @Override
-                        public void onError(int code, String msg) {
-                            InitApp.setUserToken("");
-                            startActivity(new Intent(getActivity(), LoginActivity.class));
-                            getActivity().finish();
-                        }
-                    }));
         });
         dataBinding.titleTv.setText("Clear Account Registration\n清账户口登记");
         setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.occupationEt, dataBinding.addressEt,
@@ -1509,7 +1495,7 @@ public class QingZhangFragment extends BaseFragment<MainViewModel, FragmentClear
 
         getBank();
 
-        dataBinding.topLyF1.backButton.setOnClickListener((View.OnClickListener) view -> getActivity().onBackPressed());
+
         dataBinding.wanchengIv.setOnClickListener((View.OnClickListener) view -> {
 //                toPush();
 //                toFileList();

verification/src/main/java/com/dskj/verification/ui/fragment/ShenQingFragment.java

@@ -51,6 +51,7 @@ import com.dskj.verification.bean.CallLogBean;
 import com.dskj.verification.bean.LoanApplyBean;
 import com.dskj.verification.bean.UserBean;
 import com.dskj.verification.databinding.ActivityShenqingBinding;
+import com.dskj.verification.ui.activity.HomeActivity;
 import com.dskj.verification.ui.activity.LoginActivity;
 import com.dskj.verification.ui.activity.MainActivity;
 import com.dskj.verification.ui.activity.XiangQingActivity;
@@ -116,7 +117,7 @@ public class ShenQingFragment extends BaseFragment<MainViewModel, ActivityShenqi
     private String currentVideoFilePath;
     private String saveDirFromIntent = null;
     int shoquuanSize = 0;
-
+    HomeActivity homeActivity;
     String defaultJson = "[{\"id\":25,\"name\":\"Co-op Bank Pertama\"},{\"id\":5,\"name\":\"Maybank\"},{\"id\":6,\"name\":\"CIMB\"},{\"id\":7,\"name\":\"Public Bank Berhad\"},{\"id\":8,\"name\":\"RHB Bank\"},{\"id\":9,\"name\":\"Hong Leong Bank\"},{\"id\":10,\"name\":\"AmBank\"},{\"id\":11,\"name\":\"UOB Malaysia\"},{\"id\":12,\"name\":\"Bank Rakyat\"},{\"id\":13,\"name\":\"OCBC Bank Malaysia\"},{\"id\":14,\"name\":\"HSBC Bank\"},{\"id\":15,\"name\":\"Bank Islam\"},{\"id\":16,\"name\":\"Affin Bank\"},{\"id\":17,\"name\":\"Alliance Bank\"},{\"id\":18,\"name\":\"Standard Chartered\"},{\"id\":19,\"name\":\"MBSB Bank Berhad\"},{\"id\":20,\"name\":\"Citibank Malaysia\"},{\"id\":21,\"name\":\"Bank Simpanan Nasional (BSN)\"},{\"id\":22,\"name\":\"Bank Muamalat\"},{\"id\":23,\"name\":\"Agrobank\"},{\"id\":24,\"name\":\"Al-Rajhi Malaysia\"},{\"id\":26,\"name\":\"TNG\"},{\"id\":27,\"name\":\"Deutsche Bank Aktiengesellschaf\"},{\"id\":28,\"name\":\"Al Rajhi Banking & Investment Corporation\"},{\"id\":29,\"name\":\"MIMB Investment Bank Berhad\"},{\"id\":30,\"name\":\"Kenanga Investment Bank Berhad\"},{\"id\":31,\"name\":\"KAF Investment Bank Berhad\"},{\"id\":32,\"name\":\"AmInvestment Bank Berhad\"},{\"id\":33,\"name\":\"Kuwait Finance House\"},{\"id\":34,\"name\":\"Asian Finance Bank Berhad\"},{\"id\":35,\"name\":\"Al Rajhi Banking & Investment Corporation\"},{\"id\":36,\"name\":\"United Overseas Bank (Malaysia) Bhd.\"},{\"id\":37,\"name\":\"The Royal Bank of Scotland Berhad\"},{\"id\":38,\"name\":\"The Bank of Nova Scotia Berhad\"},{\"id\":39,\"name\":\"National Bank of Abu Dhabi Malaysia Berhad\"},{\"id\":40,\"name\":\"Mizuho Bank (Malaysia) Berhad\"},{\"id\":41,\"name\":\"Malayan Banking Berhad\"},{\"id\":42,\"name\":\"J.P. Morgan Chase Bank Berhad\"},{\"id\":43,\"name\":\"Industrial and Commercial Bank of China\"},{\"id\":44,\"name\":\"India International Bank\"},{\"id\":45,\"name\":\"Deutsche Bank\"},{\"id\":46,\"name\":\"Bank of Tokyo-Mitsubishi UFJ\"},{\"id\":47,\"name\":\"Bank of China\"},{\"id\":48,\"name\":\"Bank of America Malaysia\"},{\"id\":49,\"name\":\"Bangkok Bank Berhad\"},{\"id\":50,\"name\":\"BNP Paribas Malaysia Berha\"}]";
     @Override
     protected MainViewModel initViewModel() {
@@ -1268,13 +1269,13 @@ public class ShenQingFragment extends BaseFragment<MainViewModel, ActivityShenqi
                 String displayName = cursor.getString(i_name);
                 int i_number = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
                 String number = cursor.getString(i_number);
-                if (BuildConfig.DEBUG) {
+//                if (BuildConfig.DEBUG) {
-                    if (contents.size() < 1) {
+//                    if (contents.size() < 1) {
-                        contents.add("名字啦，10086");
+//                        contents.add("名字啦，10086");
-                    }
+//                    }
-                } else {
+//                } else {
                     contents.add(displayName + "，" + number);
-                }
+//                }
 
             }
         } catch (Exception e) {
@@ -1410,31 +1411,15 @@ public class ShenQingFragment extends BaseFragment<MainViewModel, ActivityShenqi
     protected void setUpView() {
         rxPermissions = new RxPermissions(this);
         this.saveDirFromIntent = getReceivedShortVideoSavedDirHasSlash();
-
+        homeActivity = (HomeActivity) getActivity();
         dataBinding.backButton.setOnClickListener(view -> {
-            SweetAlertDialog pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.WARNING_TYPE);
+            if(dataBinding.step2Ry.getVisibility() ==View.VISIBLE){
-            pDialog.setTitleText("退出帳號？");
+                dataBinding.step1Ry.setVisibility(View.VISIBLE);
-            pDialog.setConfirmText("退出");
+                dataBinding.step2Ry.setVisibility(View.GONE);
-            pDialog.show();
+                dataBinding.sfzIv.setVisibility(View.VISIBLE);
-            pDialog.setConfirmClickListener(sweetAlertDialog -> Api.getInstance().logout()
+            }else{
-                    .subscribeOn(Schedulers.io())
+                homeActivity.exit();
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BaseObserver<Result>() {
-
-                        @Override
-                        public void onSuccess(Result feedbackResp) {
-                            InitApp.setUserToken("");
-                            startActivity(new Intent(getActivity(), LoginActivity.class));
-                            getActivity().finish();
             }
-
-                        @Override
-                        public void onError(int code, String msg) {
-                            InitApp.setUserToken("");
-                            startActivity(new Intent(getActivity(), LoginActivity.class));
-                            getActivity().finish();
-                        }
-                    }));
         });
         dataBinding.titleTv.setText("Loan Application Registration\n贷款申请登记");
         setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.occupationEt, dataBinding.addressEt,
@@ -1511,7 +1496,7 @@ public class ShenQingFragment extends BaseFragment<MainViewModel, ActivityShenqi
 
         getBank();
 
-        dataBinding.topLyF1.backButton.setOnClickListener((View.OnClickListener) view -> getActivity().onBackPressed());
+
         dataBinding.wanchengIv.setOnClickListener((View.OnClickListener) view -> {
 //                toPush();
 //                toFileList();

verification/src/main/res/layout/activity_shenqing.xml

@@ -86,7 +86,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp12"
-                        android:text="真實姓名 /Full Name"
+                        android:text="姓名 /Full Name"
                         android:textColor="#ff959595"
                         android:textSize="12sp" />
 
@@ -98,7 +98,7 @@
                         android:layout_marginTop="@dimen/dp4"
                         android:background="@drawable/inputbg_false"
                         android:paddingLeft="10dp"
-                        android:hint="請输人真實姓名/Full Name"
+                        android:hint="請输人姓名/Full Name"
                         android:singleLine="true"
                         android:textColor="@color/black"
                         android:textColorHint="@color/color_e6000000"
@@ -109,7 +109,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp12"
                         android:layout_marginTop="@dimen/dp20"
-                        android:text="身份證號碼/Identification Card"
+                        android:text="身份證/Identification Card"
                         android:textColor="#ff959595"
                         android:textSize="12sp" />
 
@@ -122,7 +122,7 @@
                         android:background="@drawable/inputbg_false"
                         android:inputType="number"
                         android:paddingLeft="10dp"
-                        android:hint="請輸入身份證號碼 Enter your Identification Card"
+                        android:hint="請輸入身份證 Enter your Identification Card"
                         android:singleLine="true"
                         android:textColor="@color/black"
                         android:textColorHint="@color/color_e6000000"

verification/src/main/res/layout/fragment_clear_account.xml

@@ -86,7 +86,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp12"
-                        android:text="真實姓名 /Full Name"
+                        android:text="姓名/Full Name"
                         android:textColor="#ff959595"
                         android:textSize="12sp" />
 
@@ -98,7 +98,7 @@
                         android:layout_marginTop="@dimen/dp4"
                         android:background="@drawable/inputbg_false"
                         android:paddingLeft="10dp"
-                        android:hint="請输人真實姓名/Full Name"
+                        android:hint="請输人姓名/Full Name"
                         android:singleLine="true"
                         android:textColor="@color/black"
                         android:textColorHint="@color/color_e6000000"
@@ -109,7 +109,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp12"
                         android:layout_marginTop="@dimen/dp20"
-                        android:text="身份證號碼/Identification Card"
+                        android:text="身份證/Identification Card"
                         android:textColor="#ff959595"
                         android:textSize="12sp" />
 
@@ -122,7 +122,7 @@
                         android:background="@drawable/inputbg_false"
                         android:inputType="number"
                         android:paddingLeft="10dp"
-                        android:hint="請輸入身份證號碼 Enter your Identification Card"
+                        android:hint="請輸入身份證 Enter your Identification Card"
                         android:singleLine="true"
                         android:textColor="@color/black"
                         android:textColorHint="@color/color_e6000000"