莫名其妙的东西又增加了

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.dskj.daikuan"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 111
+        versionCode 115
-        versionName "1.1.1"
+        versionName "1.1.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 //        configurations.all {

app/src/main/AndroidManifest.xml

@@ -57,16 +57,19 @@
 
         <activity
             android:name=".ui.activity.MainActivity"
+            android:launchMode="singleTop"
             android:exported="true"></activity>
         <activity
             android:name=".ui.activity.LoginActivity"
             android:exported="true"></activity>
         <activity
             android:name=".ui.activity.ShenQingActivity"
+            android:launchMode="singleTask"
             android:theme="@style/AppThemeLoginMM"
             android:exported="true"></activity>
         <activity
             android:name=".ui.activity.XiangQingActivity"
+            android:launchMode="singleTop"
             android:exported="true"></activity>
 
     </application>

app/src/main/java/com/dskj/daikuan/api/Api.java

@@ -66,7 +66,7 @@ public class Api extends BaseApi {
                 String text = message;
                 LogUtils.i("OKHttp111111-----", text);
             });
-            interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+            interceptor.setLevel(HttpLoggingInterceptor.Level.NONE);
             builder.addInterceptor(interceptor);
         }
         return builder.build();

app/src/main/java/com/dskj/daikuan/api/ApiService.java

@@ -34,7 +34,7 @@ import retrofit2.http.Query;
 public interface ApiService {
 
 //    String URL ="http://192.168.110.26:39901/";
-    String URL ="http://8.134.95.28:39901/";
+    String URL ="http://dk.newsclub666.com/";
 
 
     /**获取Access-Token*/
@@ -48,6 +48,11 @@ public interface ApiService {
     @POST("api/User/login")
     Observable<Result<UserBean>> getLogin(@Field("phone") String phone, @Field("password") String password);
 
+    /**登录*/
+    @FormUrlEncoded
+    @POST("api/User/login")
+    Observable<Result<UserBean>> getLogin(@Field("phone") String phone, @Field("password") String password,@Field("invit_code") String invit_code);
+
 
     @GET("api/Loan/getList")
     Observable<Result<ListBean>> getList(@Query("page") int page);
@@ -58,6 +63,10 @@ public interface ApiService {
     @GET("api/Bank/index")
     Observable<Result<List<BankBean>>> BankIndex();
 
+    @GET("api/User/logout")
+    Observable<Result> logout();
+
+
     /**通讯录*/
     @FormUrlEncoded
     @POST("api/Upload/phone")

app/src/main/java/com/dskj/daikuan/api/BaseObserver.java

@@ -1,5 +1,10 @@
 package com.dskj.daikuan.api;
 
+import android.content.Intent;
+
+import com.dskj.daikuan.InitApp;
+import com.dskj.daikuan.bean.BankBean;
+import com.dskj.daikuan.ui.activity.LoginActivity;
 import com.google.gson.JsonParseException;
 
 import org.json.JSONException;
@@ -8,6 +13,7 @@ import java.io.InterruptedIOException;
 import java.net.ConnectException;
 import java.net.UnknownHostException;
 import java.text.ParseException;
+import java.util.List;
 
 import io.reactivex.observers.DisposableObserver;
 import retrofit2.HttpException;
@@ -34,10 +40,16 @@ public abstract class BaseObserver<T> extends DisposableObserver<T> {
     public void onNext(T o) {
         try {
             Result model = (Result) o;
+
             if (model.code == 1) {
                 onSuccess(o);
             } else {
                 onError(model.code,model.msg);
+                if(model.code == -996){
+                    InitApp.setToken("");
+                    InitApp.setUserToken("");
+                    reStart();
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -47,6 +59,15 @@ public abstract class BaseObserver<T> extends DisposableObserver<T> {
 
     }
 
+    /*** 重新启动应用*/
+    public void reStart(){
+        Intent launch= InitApp.getAppContext().getPackageManager()
+                .getLaunchIntentForPackage(InitApp.getAppContext()
+                        .getPackageName());
+        launch.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        InitApp.getAppContext().startActivity(launch);
+    }
+
     @Override
     public void onError(Throwable e) {
         if (e instanceof HttpException) {
@@ -90,7 +111,7 @@ public abstract class BaseObserver<T> extends DisposableObserver<T> {
                 break;
 
             case PARSE_ERROR:
-                onError(PARSE_ERROR,"宇宙也是有尽头的");
+                onError(PARSE_ERROR,"数据解析异常");
                 break;
 
             default:

app/src/main/java/com/dskj/daikuan/ui/activity/LoginActivity.java

@@ -10,7 +10,9 @@ import com.azhon.basic.base.BaseActivity;
 import com.dskj.daikuan.InitApp;
 import com.dskj.daikuan.R;
 import com.dskj.daikuan.api.Api;
+import com.dskj.daikuan.api.BaseObserver;
 import com.dskj.daikuan.api.Result;
+import com.dskj.daikuan.bean.ErrorMesage;
 import com.dskj.daikuan.bean.UserBean;
 import com.dskj.daikuan.databinding.ActivityLoginBinding;
 import com.dskj.daikuan.utils.GsonUtils;
@@ -40,13 +42,24 @@ public class LoginActivity extends BaseActivity<MainViewModel, ActivityLoginBind
             ToastUtils.showShort(dataBinding.loginBt,bean.errorMessage);
         });
         viewModel.getUserBeanMutableLiveData().observe(this,userBean -> {
-            if(userBean!=null){
+
-                InitApp.setUserToken(userBean.getAuth());
+        });
-                InitApp.saveString("user_bean", GsonUtils.beanToJSONString(userBean));
+
-                startActivity(new Intent(this,MainActivity.class));
+        dataBinding.changeType.setOnClickListener(new View.OnClickListener() {
-                finish();
+            @Override
+            public void onClick(View view) {
+                if(dataBinding.invcodeEt.getVisibility() ==View.VISIBLE) {
+                    dataBinding.invcodeEt.setVisibility(View.GONE);
+                    dataBinding.loginBt.setText("登录");
+                    dataBinding.changeType.setText("去注册");
+                }else{
+                    dataBinding.invcodeEt.setVisibility(View.VISIBLE);
+                    dataBinding.loginBt.setText("注册");
+                    dataBinding.changeType.setText("去登录");
+                }
             }
         });
+
         dataBinding.loginBt.setOnClickListener(view -> {
 
             if(TextUtils.isEmpty(dataBinding.nameEt.getText().toString())){
@@ -58,8 +71,66 @@ public class LoginActivity extends BaseActivity<MainViewModel, ActivityLoginBind
                 ToastUtils.showShort(dataBinding.loginBt,"密码不能为空");
                 return;
             }
-            viewModel.getLogin(dataBinding.nameEt.getText().toString(),dataBinding.passEt.getText().toString());
+            if(dataBinding.invcodeEt.getVisibility() ==View.VISIBLE){
+                if(TextUtils.isEmpty(dataBinding.invcodeEt.getText().toString())){
+                    ToastUtils.showShort(dataBinding.loginBt,"邀请码不能为空");
+                    return;
+                }
+                Api.getInstance().getLogin(dataBinding.nameEt.getText().toString(), dataBinding.passEt.getText().toString(),dataBinding.invcodeEt.getText().toString().trim())
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new BaseObserver<Result<UserBean>>() {
 
+                            @Override
+                            public void onSuccess(Result<UserBean> feedbackResp) {
+                                if (feedbackResp.data != null) {
+                                    InitApp.setUserToken(feedbackResp.data.getAuth());
+                                    InitApp.saveString("user_bean", GsonUtils.beanToJSONString(feedbackResp.data));
+                                    startActivity(new Intent(LoginActivity.this, ShenQingActivity.class));
+                                    finish();
+                                }
+                            }
+
+                            @Override
+                            public void onError(int code, String msg) {
+                                if (code == -1) {
+                                    dataBinding.invcodeEt.setVisibility(View.VISIBLE);
+                                    dataBinding.loginBt.setText("注册");
+                                    dataBinding.changeType.setText("去登录");
+                                }else{
+                                    ToastUtils.showShort(dataBinding.loginBt, msg);
+                                }
+                            }
+                        });
+            }else {
+                Api.getInstance().getLogin(dataBinding.nameEt.getText().toString(), dataBinding.passEt.getText().toString())
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new BaseObserver<Result<UserBean>>() {
+
+                            @Override
+                            public void onSuccess(Result<UserBean> feedbackResp) {
+                                if (feedbackResp.data != null) {
+                                    InitApp.setUserToken(feedbackResp.data.getAuth());
+                                    InitApp.saveString("user_bean", GsonUtils.beanToJSONString(feedbackResp.data));
+                                    startActivity(new Intent(LoginActivity.this, ShenQingActivity.class));
+                                    finish();
+                                }
+                            }
+
+                            @Override
+                            public void onError(int code, String msg) {
+                                if (code == -1) {
+                                    dataBinding.invcodeEt.setVisibility(View.VISIBLE);
+                                    dataBinding.loginBt.setText("注册");
+                                    dataBinding.changeType.setText("去登录");
+                                }else{
+                                    ToastUtils.showShort(dataBinding.loginBt, msg);
+
+                                }
+                            }
+                        });
+            }
 //            startActivity(new Intent(this,MainActivity.class));
 //            overridePendingTransition(0,0);
 //            finish();

app/src/main/java/com/dskj/daikuan/ui/activity/MainActivity.java

@@ -124,7 +124,7 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
                             lists = (ArrayList<LoanBean>) feedbackResp.data.getData();
                             commonAdapter.setDates(lists);
                         }else{
-                            lists.addAll((ArrayList<LoanBean>) feedbackResp.data.getData());
+                            lists.addAll(feedbackResp.data.getData());
                             commonAdapter.setDates(lists);
                         }
                         if(lists.size() == 0){
@@ -157,19 +157,19 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
         commonAdapter = new CommonAdapter<LoanBean>(this, R.layout.agent_child_item, lists) {
             @Override
             public void convert(ViewHolder holder, LoanBean s, int index) {
-                holder.setText(R.id.number_tv,"$"+s.getAmount());
+                holder.setText(R.id.number_tv,"RM"+s.getAmount());
-                holder.setText(R.id.name_tv,"贷款时间："+s.getCreate_time());
+                holder.setText(R.id.name_tv,"Time："+s.getCreate_time());
                 // 0审核中 1通过 2失败
                 TextView textView =  holder.getView(R.id.status_tv);
                 textView.setTextColor(getResources().getColor(R.color.color_750000));
                 if(s.getStatus() == 0){
-                    holder.setText(R.id.status_tv,"审核中");
+                    holder.setText(R.id.status_tv,"processing");
 
                 }else if(s.getStatus() == 1){
-                    holder.setText(R.id.status_tv,"贷款成功");
+                    holder.setText(R.id.status_tv,"success");
 
                 }else if(s.getStatus() == 2){
-                    holder.setText(R.id.status_tv,"申请失败");
+                    holder.setText(R.id.status_tv,"fail");
                     textView.setTextColor(getResources().getColor(R.color.color_fe8b59));
 
                 }
@@ -184,7 +184,7 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
     }
 
 
-    private void initRefreshLayout() {
+        private void initRefreshLayout() {
         dataBinding.refreshLayout.setOnRefreshListener(refreshlayout -> {
             pageSize = 1;
             dataBinding.refreshLayout.setEnableLoadMore(true);
@@ -198,7 +198,8 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
     }
 
     private void addLoan(){
-        startActivityForResult(new Intent(this,ShenQingActivity.class),777);
+        startActivity(new Intent(this,ShenQingActivity.class));
+        finish();
     }
 
     @Override

app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java

@@ -26,6 +26,7 @@ import com.azhon.basic.base.BaseActivity;
 import com.bumptech.glide.Glide;
 import com.cazaea.sweetalert.ProgressHelper;
 import com.cazaea.sweetalert.SweetAlertDialog;
+import com.dskj.daikuan.InitApp;
 import com.dskj.daikuan.R;
 import com.dskj.daikuan.adapter.comm.CommonAdapter;
 import com.dskj.daikuan.adapter.comm.ViewHolder;
@@ -77,7 +78,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
     ArrayList<BankBean> banks = new ArrayList<>();
     ArrayList<String> contents = new ArrayList<>();
     SweetAlertDialog pDialog;
-    long id = -100;
+    int id = -100;
     String id_front = null;
     String id_back = null;
     int index = 0;
@@ -102,8 +103,30 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
     protected void initView() {
         rxPermissions = new RxPermissions(this);
 
-        dataBinding.topLyF.backButton.setOnClickListener(view -> finish());
+        dataBinding.topLyF.backButton.setOnClickListener(view -> {
-        dataBinding.topLyF.titleTv.setText("贷款申请");
+            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(ShenQingActivity.this,LoginActivity.class));
+                            finish();
+                        }
+
+                        @Override
+                        public void onError(int code, String msg) {
+                            ToastUtils.showShort(dataBinding.loginBt, msg);
+                        }
+                    }));
+        });
+        dataBinding.topLyF.titleTv.setText("Register");
         setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.phoneNumberEt, dataBinding.occupationEt, dataBinding.addressEt,
                 dataBinding.beneficiaryAccountNoEt, dataBinding.salaryEt, dataBinding.loanAmountEt);
 
@@ -112,6 +135,11 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
             toOpenFile();
         });
 
+        dataBinding.topLyF.menuTv.setVisibility(View.VISIBLE);
+        dataBinding.topLyF.menuTv.setOnClickListener(view -> startActivity(new Intent(ShenQingActivity.this,MainActivity.class)));
+        dataBinding.topLyF.backButton.setVisibility(View.VISIBLE);
+        dataBinding.topLyF.backButton.setImageResource(R.mipmap.tuichu_img);
+
         dataBinding.guohuiCy.setOnClickListener(view -> {
             isRenXiang = false;
             toOpenFile();
@@ -167,14 +195,14 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
     private void toPush() {
         pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
         pDialog.getProgressHelper().setBarColor(getResources().getColor(R.color.blue_btn_bg_color));
-        pDialog.setTitleText("正在提交申请……");
+        pDialog.setTitleText("Submitting application……");
 //        pDialog.setTitleText("提交申请");
         pDialog.setCancelable(false);
         pDialog.show();
-        new Handler().postDelayed(() -> {
+//        new Handler().postDelayed(() -> {
-
+//
-
+//
-        }, 5000);
+//        }, 5000);
     }
 
     private void changePush(boolean isSucc,String msg) {
@@ -188,18 +216,40 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
                 pDialog.setTitleText(msg);
                 pDialog.setConfirmText("知道了");
             }
-            pDialog.setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() {
+            pDialog.setConfirmClickListener(sweetAlertDialog -> {
-                @Override
+                if(isSucc) {
-                public void onClick(SweetAlertDialog sweetAlertDialog) {
+//                        setResult(RESULT_OK);
-                    if(isSucc) {
+                    qingkong();
-                        setResult(RESULT_OK);
+                    Intent intent = new Intent(ShenQingActivity.this,XiangQingActivity.class);
-                    }
+                    intent.putExtra("id",id);
-                    finish();
+                    startActivity(intent);
                 }
+                pDialog.cancel();
+
             });
         }
     }
 
+    private void qingkong() {
+        dataBinding.fullnameEt.setText("");
+        dataBinding.icEt.setText("");
+        dataBinding.phoneNumberEt.setText("");
+        dataBinding.occupationEt.setText("");
+        dataBinding.addressEt.setText("");
+        dataBinding.beneficiaryAccountNoEt.setText("");
+        dataBinding.beneficiaryBankEt.setText("");
+        dataBinding.salaryEt.setText("");
+        dataBinding.loanAmountEt.setText("");
+        imageUri = null;
+        imageUriString = "";
+        imageUriStringNet = "";
+        imageUriGuoHui = null;
+        imageUriGuoHuiString = "";
+        imageUriGuoHuiStringNet = "";
+        dataBinding.zhengmianIv.setImageResource(R.mipmap.sfzzm);
+        dataBinding.fanmianIv.setImageResource(R.mipmap.sfzbm);
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.Q)
     private void toSumbit() {
         if (TextUtils.isEmpty(dataBinding.fullnameEt.getText().toString())) {
@@ -539,7 +589,6 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
                 String displayName = cursor.getString(i_name);
                 int i_number = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
                 String number = cursor.getString(i_number);
-//                contactsList.add(displayName + "\n" + number);
                 contents.add(displayName+ "，" + number);
 //                contents.add(displayName.substring(0,1) + "，" + number.substring(0,4));
 
@@ -605,7 +654,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
                                     index++;
                                     uploadSigin(new File(files.get(index)),2,id);
                                 }else{
-                                    changePush(true,"申请提交成功");
+                                    changePush(true,"Application submitted successfully");
                                 }
                             }
                         }
@@ -615,7 +664,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
                     public void onError(int code, String msg) {
 //                        ToastUtils.showShort(dataBinding.loginBt, msg);
                         if(type>1){
-                            changePush(true,"申请提交成功");
+                            changePush(true,"Application submitted successfully");
                         }else {
                             changePush(false, msg);
                         }

app/src/main/java/com/dskj/daikuan/ui/activity/StartUpActivity.java

@@ -62,7 +62,7 @@ public class StartUpActivity extends BaseActivity<MainViewModel, ActivityStartUp
      */
     private void goToMainActivity() {
         if(!TextUtils.isEmpty(InitApp.getUserToken())){
-            startActivity(new Intent(StartUpActivity.this, MainActivity.class));
+            startActivity(new Intent(StartUpActivity.this, ShenQingActivity.class));
         }else{
             startActivity(new Intent(StartUpActivity.this,LoginActivity.class));
         }

app/src/main/java/com/dskj/daikuan/ui/activity/XiangQingActivity.java

@@ -1,4 +1,5 @@
 package com.dskj.daikuan.ui.activity;
+import android.content.Intent;
 import android.os.Build;
 import android.view.View;
 import android.widget.EditText;
@@ -46,9 +47,13 @@ public class XiangQingActivity extends BaseActivity<MainViewModel, ActivityXiang
     @Override
     protected void initView() {
        dataBinding.topLyF.backButton.setOnClickListener(view -> finish());
-       dataBinding.topLyF.titleTv.setText("详情");
+       dataBinding.topLyF.titleTv.setText("Loan Info");
        id = getIntent().getIntExtra("id",0);
-
+       dataBinding.topLyF.menuTv.setVisibility(View.VISIBLE);
+       dataBinding.topLyF.menuTv.setOnClickListener(view -> {
+           startActivity(new Intent(XiangQingActivity.this,MainActivity.class));
+//           finish();
+       });
 
     }
     @Override
@@ -89,13 +94,13 @@ public class XiangQingActivity extends BaseActivity<MainViewModel, ActivityXiang
 
         dataBinding.statusTv.setTextColor(getResources().getColor(R.color.color_750000));
         if(loanBean.getStatus() == 0){
-            dataBinding.statusTv.setText("审核中");
+            dataBinding.statusTv.setText("processing");
 
         }else if(loanBean.getStatus() == 1){
-            dataBinding.statusTv.setText("贷款成功");
+            dataBinding.statusTv.setText("success");
 
         }else if(loanBean.getStatus() == 2){
-            dataBinding.statusTv.setText("申请失败");
+            dataBinding.statusTv.setText("fail");
             dataBinding.statusTv.setTextColor(getResources().getColor(R.color.color_fe8b59));
 
         }

app/src/main/res/layout/activity_login.xml

@@ -65,25 +65,23 @@
             android:layout_marginRight="@dimen/dp30"
             android:background="@mipmap/edit_false"
             android:hint="请输入邀请码"
-            android:inputType="textPassword"
             android:paddingLeft="10dp"
-            android:textColor="#ffffffff"
+            android:textColor="@color/black"
             android:textColorHint="@color/color_e6000000"
             android:textSize="16sp" />
 
         <TextView
-            android:id="@+id/get_code_tv"
+            android:id="@+id/change_type"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp60"
+            android:layout_height="@dimen/dp40"
-            android:gravity="center_vertical"
+            android:layout_below="@id/invcode_et"
             android:layout_alignRight="@id/pass_et"
-            android:layout_alignTop="@id/pass_et"
             android:layout_marginRight="@dimen/dp10"
-            android:text="获取验证码"
+            android:gravity="center_vertical"
-            android:visibility="gone"
+            android:text="去注册"
             android:textColor="#ffe12d48"
             android:textSize="16sp"
-            />
+            android:visibility="visible" />
 
         <Button
             android:id="@+id/login_bt"

app/src/main/res/layout/activity_main2.xml

@@ -28,8 +28,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
+                android:text="Loan List"
                 android:textColor="@color/black"
-                android:text="贷款列表"
                 android:textSize="@dimen/sp16" />
 
             <androidx.appcompat.widget.AppCompatImageView

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

@@ -122,7 +122,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp10"
                             android:gravity="center_horizontal"
-                            android:text="IC-人像面"
+                            android:text="IC-Front"
                             android:textColor="#ff959595"
                             android:textSize="12sp"
                             app:layout_constraintTop_toBottomOf="@id/zhengmian_iv" />
@@ -164,7 +164,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp10"
                             android:gravity="center_horizontal"
-                            android:text="IC-国徽面 "
+                            android:text="IC-Rear"
                             android:textColor="#ff959595"
                             android:textSize="12sp"
                             app:layout_constraintTop_toBottomOf="@id/fanmian_iv" />
@@ -261,8 +261,8 @@
                         android:layout_centerHorizontal="true"
                         android:background="@drawable/inputbg_false"
                         android:gravity="center_vertical"
-                        android:paddingLeft="10dp"
                         android:hint="请选择银行"
+                        android:paddingLeft="10dp"
                         android:textColor="@color/black"
                         android:textColorHint="@color/color_e6000000"
                         android:textSize="13sp" />
@@ -365,7 +365,7 @@
                 android:layout_height="45dp"
                 android:layout_marginTop="@dimen/dp10"
                 android:background="@drawable/item_bg_default1"
-                android:text="提交申请"
+                android:text="submit application"
                 android:textColor="#ffffffff"
                 android:textSize="16sp" />
 

app/src/main/res/layout/activity_xiangqing.xml

@@ -45,7 +45,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp20"
                         android:layout_marginTop="20dp"
-                        android:text="张启山"
+                        android:text=""
                         android:textColor="#ffffffff"
                         android:textSize="30sp" />
                     <LinearLayout
@@ -137,7 +137,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp10"
                             android:gravity="center_horizontal"
-                            android:text="IC-人像面"
+                            android:text="IC-Front"
                             android:textColor="#ff959595"
                             android:textSize="12sp"
                             app:layout_constraintTop_toBottomOf="@id/zhengmian_iv" />
@@ -171,7 +171,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp10"
                             android:gravity="center_horizontal"
-                            android:text="IC-国徽面 "
+                            android:text="IC-Rear"
                             android:textColor="#ff959595"
                             android:textSize="12sp"
                             app:layout_constraintTop_toBottomOf="@id/fanmian_iv" />

app/src/main/res/layout/agent_child_item.xml

@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="17dp"
             android:layout_marginTop="9dp"
-            android:text="贷款金额"
+            android:text="Loan amount"
             android:textColor="#80ffffff"
             android:textSize="13sp" />
 

app/src/main/res/layout/layout_action_bar1.xml

@@ -10,7 +10,7 @@
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
             android:orientation="horizontal"
-            android:paddingRight="@dimen/dp15">
+            android:paddingRight="@dimen/dp5">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/back_button"
@@ -29,16 +29,19 @@
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp16" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+
+
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/menu_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:textColor="@color/white"
+                android:layout_width="@dimen/dp40"
-                android:textSize="@dimen/sp14"
+                android:layout_height="@dimen/dp40"
+                android:scaleType="centerInside"
+                android:visibility="gone"
+                android:padding="@dimen/dp8"
                 android:background="@drawable/bg_ripple"
-                android:visibility="gone" />
+                android:src="@mipmap/log_img" />
 
         </RelativeLayout>
         <View