xuhuixiang/daikuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

莫名其妙的东西又增加了

Browse Source
This commit is contained in:
xuhuixiang
2023-04-12 11:04:32 +08:00
parent a752455c41
commit bb77114a15
14 changed files with 108 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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 {

4
app/src/main/AndroidManifest.xml
View File

@@ -16,12 +16,12 @@
<application
android:name=".InitApp"
android:allowBackup="true"
android:icon="@mipmap/logo_img"
android:icon="@mipmap/logo_2"
android:label="@string/app_name"
android:largeHeap="true"
android:networkSecurityConfig="@xml/network_security_config"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/logo_img"
android:roundIcon="@mipmap/logo_2"
android:supportsRtl="true"
android:theme="@style/AppThemeLogin"
android:usesCleartextTraffic="true"

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

@@ -50,12 +50,16 @@ public class LoginActivity extends BaseActivity<MainViewModel, ActivityLoginBind
public void onClick(View view) {
if(dataBinding.invcodeEt.getVisibility() ==View.VISIBLE) {
dataBinding.invcodeEt.setVisibility(View.GONE);
dataBinding.loginBt.setText("登录");
dataBinding.changeType.setText("去注册");
dataBinding.passEt1.setVisibility(View.GONE);
dataBinding.loginBt.setText("Login");
dataBinding.changeType.setText("Register");
}else{
dataBinding.invcodeEt.setVisibility(View.VISIBLE);
dataBinding.loginBt.setText("注册");
dataBinding.changeType.setText("去登录");
dataBinding.passEt1.setVisibility(View.VISIBLE);
dataBinding.loginBt.setText("register");
dataBinding.changeType.setText("Login");
}
}
});
@@ -63,19 +67,32 @@ public class LoginActivity extends BaseActivity<MainViewModel, ActivityLoginBind
dataBinding.loginBt.setOnClickListener(view -> {
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<MainViewModel, ActivityLoginBind
public void onError(int code, String msg) {
if (code == -1) {
dataBinding.invcodeEt.setVisibility(View.VISIBLE);
dataBinding.loginBt.setText("注册");
dataBinding.changeType.setText("去登录");
dataBinding.passEt1.setVisibility(View.VISIBLE);
dataBinding.loginBt.setText("register");
dataBinding.changeType.setText("Login");
}else{
ToastUtils.showShort(dataBinding.loginBt, msg);
}
@@ -122,8 +141,9 @@ public class LoginActivity extends BaseActivity<MainViewModel, ActivityLoginBind
public void onError(int code, String msg) {
if (code == -1) {
dataBinding.invcodeEt.setVisibility(View.VISIBLE);
dataBinding.loginBt.setText("注册");
dataBinding.changeType.setText("去登录");
dataBinding.passEt1.setVisibility(View.VISIBLE);
dataBinding.loginBt.setText("register");
dataBinding.changeType.setText("Login");
}else{
ToastUtils.showShort(dataBinding.loginBt, msg);

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

@@ -83,17 +83,20 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
rxPermissions = new RxPermissions(this);
initRefreshLayout();
dataBinding.refreshLayout.autoRefresh();
changeDate();
changeDate(true);
dataBinding.menuTv.setOnClickListener(view -> 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<MainViewModel, ActivityMain2Bindi
}else{
isNeeDate = true;
}
changeDate();
changeDate(false);
if (lists.size() == feedbackResp.data.getTotal()) {
dataBinding.refreshLayout.finishLoadMoreWithNoMoreData();
}
@@ -146,7 +149,7 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
}else{
isNeeDate = true;
}
changeDate();
changeDate(false);
}
});
}

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

@@ -105,8 +105,8 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
dataBinding.topLyF.backButton.setOnClickListener(view -> {
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<MainViewModel, ActivityShenqi
if(isSucc) {
pDialog.changeAlertType(SweetAlertDialog.SUCCESS_TYPE);
pDialog.setTitleText(msg);
pDialog.setConfirmText("完成");
pDialog.setConfirmText("ok");
}else{
pDialog.changeAlertType(SweetAlertDialog.ERROR_TYPE);
pDialog.setTitleText(msg);
pDialog.setConfirmText("知道了");
pDialog.setConfirmText("ok");
}
pDialog.setConfirmClickListener(sweetAlertDialog -> {
if(isSucc) {
@@ -253,61 +253,61 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
@RequiresApi(api = Build.VERSION_CODES.Q)
private void toSumbit() {
if (TextUtils.isEmpty(dataBinding.fullnameEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "姓名不能为空");
ToastUtils.showShort(dataBinding.loginBt, "Name cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.icEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "大马卡不能为空");
ToastUtils.showShort(dataBinding.loginBt, "IC cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.phoneNumberEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "电话号码不能为空");
ToastUtils.showShort(dataBinding.loginBt, "Phone number cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.occupationEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "职业不能为空");
ToastUtils.showShort(dataBinding.loginBt, "Occupation cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.addressEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "地址不能为空");
ToastUtils.showShort(dataBinding.loginBt, "Address cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.beneficiaryBankEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "收款银行不能为空");
ToastUtils.showShort(dataBinding.loginBt, "Beneficiary Bank cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.beneficiaryAccountNoEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "户口号码不能为空");
ToastUtils.showShort(dataBinding.loginBt, "Beneficiary Account No cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.salaryEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "薪水不能为空");
ToastUtils.showShort(dataBinding.loginBt, "Salary cannot be empty");
return;
}
if (TextUtils.isEmpty(dataBinding.loanAmountEt.getText().toString())) {
ToastUtils.showShort(dataBinding.loginBt, "贷款金额不能为空");
ToastUtils.showShort(dataBinding.loginBt, "The loan amount cannot be empty");
return;
}
if (imageUri == null) {
ToastUtils.showShort(dataBinding.loginBt, "大马卡正面不能为空");
ToastUtils.showShort(dataBinding.loginBt, "IC-Front cannot be empty");
return;
}
if (imageUriGuoHui == null) {
ToastUtils.showShort(dataBinding.loginBt, "大马卡背面不能为空");
ToastUtils.showShort(dataBinding.loginBt, "IC-Rear cannot be empty");
return;
}
// toApply();

42
app/src/main/res/layout/activity_login.xml
View File

@@ -15,11 +15,11 @@
android:fitsSystemWindows="true">
<ImageView
android:layout_width="@dimen/dp100"
android:layout_height="@dimen/dp100"
android:layout_width="@dimen/dp120"
android:layout_height="@dimen/dp120"
android:layout_centerHorizontal="true"
android:layout_marginTop="74dp"
android:src="@mipmap/logo_img" />
android:src="@mipmap/logo_1" />
<EditText
android:id="@+id/name_et"
@@ -27,10 +27,10 @@
android:layout_height="@dimen/dp60"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp30"
android:layout_marginTop="240dp"
android:layout_marginTop="200dp"
android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false"
android:hint="请输入您的账号/手机号"
android:hint="Number "
android:paddingLeft="10dp"
android:textColor="@color/black"
android:textColorHint="@color/color_e6000000"
@@ -46,29 +46,47 @@
android:layout_marginTop="26dp"
android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false"
android:hint="请输入您的密码"
android:hint="Password"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:textColor="@color/black"
android:textColorHint="@color/color_e6000000"
android:textSize="16sp" />
<EditText
android:id="@+id/pass_et1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp60"
android:layout_below="@id/pass_et"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp30"
android:layout_marginTop="26dp"
android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false"
android:hint="Confirm Password"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:visibility="gone"
android:textColor="@color/black"
android:textColorHint="@color/color_e6000000"
android:textSize="16sp" />
<EditText
android:id="@+id/invcode_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp60"
android:layout_below="@id/pass_et"
android:layout_below="@id/pass_et1"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp30"
android:layout_marginTop="26dp"
android:visibility="gone"
android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false"
android:hint="请输入邀请码"
android:hint="Invitation code"
android:paddingLeft="10dp"
android:textColor="@color/black"
android:textColorHint="@color/color_e6000000"
android:textSize="16sp" />
android:textSize="16sp"
android:visibility="gone" />
<TextView
android:id="@+id/change_type"
@@ -78,7 +96,7 @@
android:layout_alignRight="@id/pass_et"
android:layout_marginRight="@dimen/dp10"
android:gravity="center_vertical"
android:text="去注册"
android:text="Register"
android:textColor="#ffe12d48"
android:textSize="16sp"
android:visibility="visible" />
@@ -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" />

10
app/src/main/res/layout/activity_main2.xml
View File

@@ -22,6 +22,14 @@
android:layout_height="?actionBarSize"
android:orientation="horizontal"
android:paddingRight="@dimen/dp15">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/back_button"
android:layout_width="@dimen/dp40"
android:layout_height="@dimen/dp40"
android:layout_centerVertical="true"
android:scaleType="centerInside"
android:background="@drawable/bg_ripple"
android:src="@mipmap/ic_black_back" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_tv"
@@ -64,7 +72,7 @@
<Button
android:layout_width="210dp"
android:layout_height="50dp"
android:text="申请贷款"
android:text="Apply for a loan"
android:textSize="@dimen/sp16"
android:background="@drawable/item_bg_default1"
android:layout_centerHorizontal="true"

18
app/src/main/res/layout/activity_start_up.xml
View File

@@ -19,15 +19,15 @@
android:fitsSystemWindows="true"
tools:context=".ui.activity.StartUpActivity">
<com.dskj.daikuan.ui.view.CircleImageView
android:layout_width="@dimen/dp100"
android:layout_height="@dimen/dp100"
android:layout_centerHorizontal="true"
android:src="@mipmap/logo_img"
android:layout_marginTop="74dp"
app:ease_border_color="@color/color_F8F8F8"
app:ease_border_width="1dp"
app:es_shape_type="round" />
<com.dskj.daikuan.ui.view.CircleImageView
android:layout_width="@dimen/dp120"
android:layout_height="@dimen/dp120"
android:layout_centerHorizontal="true"
android:layout_marginTop="74dp"
android:src="@mipmap/logo_1"
app:ease_border_color="@color/color_F8F8F8"
app:ease_border_width="1dp"
app:es_shape_type="round" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.2 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/logo_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/logo_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

2
app/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<resources>
<string name="app_name">记账</string>
<string name="app_name">CASH´N GO</string>
<string name="file_permission_font_txt">文件权限已禁用</string>
<string name="locat_permission_font_txt">定位权限已禁用</string>