diff --git a/app/build.gradle b/app/build.gradle index e1336fd..f12cd30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.dskj.daikuan" minSdkVersion 23 targetSdkVersion 30 - versionCode 115 - versionName "1.1.5" + versionCode 116 + versionName "1.1.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // configurations.all { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 69eb4ab..ba00b5a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,12 +16,12 @@ { if(TextUtils.isEmpty(dataBinding.nameEt.getText().toString())){ - ToastUtils.showShort(dataBinding.loginBt,"账号不能为空"); + ToastUtils.showShort(dataBinding.loginBt,"Account cannot be empty"); return; } if(TextUtils.isEmpty(dataBinding.passEt.getText().toString())){ - ToastUtils.showShort(dataBinding.loginBt,"密码不能为空"); + ToastUtils.showShort(dataBinding.loginBt,"Password cannot be empty"); return; } if(dataBinding.invcodeEt.getVisibility() ==View.VISIBLE){ - if(TextUtils.isEmpty(dataBinding.invcodeEt.getText().toString())){ - ToastUtils.showShort(dataBinding.loginBt,"邀请码不能为空"); + + if(TextUtils.isEmpty(dataBinding.passEt1.getText().toString())){ + ToastUtils.showShort(dataBinding.loginBt,"Confirm Password cannot be empty"); return; } + + if(TextUtils.isEmpty(dataBinding.invcodeEt.getText().toString())){ + ToastUtils.showShort(dataBinding.loginBt,"Invitation code cannot be empty"); + return; + } + + if(!dataBinding.passEt1.getText().toString().trim().equals(dataBinding.passEt.getText().toString().trim())){ + ToastUtils.showShort(dataBinding.loginBt,"Password inconsistency"); + + return; + } + Api.getInstance().getLogin(dataBinding.nameEt.getText().toString(), dataBinding.passEt.getText().toString(),dataBinding.invcodeEt.getText().toString().trim()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -95,8 +112,10 @@ public class LoginActivity extends BaseActivity addLoan()); dataBinding.tijiaoBt.setOnClickListener(view -> addLoan()); + dataBinding.backButton.setOnClickListener(view -> addLoan()); } - private void changeDate() { + private void changeDate(boolean isFirst) { if(isNeeDate){ dataBinding.refreshLayout.setVisibility(View.VISIBLE); dataBinding.nodateRy.setVisibility(View.GONE); - dataBinding.menuTv.setVisibility(View.VISIBLE); + if(!isFirst) { + dataBinding.menuTv.setVisibility(View.VISIBLE); + } initList(); }else{ @@ -132,7 +135,7 @@ public class MainActivity extends BaseActivity { SweetAlertDialog pDialog = new SweetAlertDialog(this, SweetAlertDialog.WARNING_TYPE); - pDialog.setTitleText("退出当前账号?"); - pDialog.setConfirmText("退出"); + pDialog.setTitleText("Exit the current account?"); + pDialog.setConfirmText("Exit"); pDialog.show(); pDialog.setConfirmClickListener(sweetAlertDialog -> Api.getInstance().logout() .subscribeOn(Schedulers.io()) @@ -210,11 +210,11 @@ public class ShenQingActivity extends BaseActivity { if(isSucc) { @@ -253,61 +253,61 @@ public class ShenQingActivity extends BaseActivity + android:src="@mipmap/logo_1" /> + + + android:textSize="16sp" + android:visibility="gone" /> @@ -91,7 +109,7 @@ android:layout_centerHorizontal="true" android:layout_marginTop="70dp" android:background="@drawable/item_bg_default1" - android:text="登录" + android:text="login" android:textColor="#ffffffff" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml index aafb44c..de826ae 100644 --- a/app/src/main/res/layout/activity_main2.xml +++ b/app/src/main/res/layout/activity_main2.xml @@ -22,6 +22,14 @@ android:layout_height="?actionBarSize" android:orientation="horizontal" android:paddingRight="@dimen/dp15"> + - + - 记账 + CASH´N GO 文件权限已禁用 定位权限已禁用