From 093e9c07218faa0868efc7ada01c1214183ec4de Mon Sep 17 00:00:00 2001 From: xuhuixiang Date: Mon, 17 Apr 2023 13:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=AB=E5=90=8D=E5=85=B6=E5=A6=99=E7=9A=84?= =?UTF-8?q?=E4=B8=9C=E8=A5=BF=E5=8F=88=E5=A2=9E=E5=8A=A0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../daikuan/ui/activity/LoginActivity.java | 20 +- .../daikuan/ui/activity/MainActivity.java | 4 +- .../daikuan/ui/activity/ShenQingActivity.java | 36 ++-- .../ui/activity/XiangQingActivity.java | 4 +- app/src/main/res/drawable/inputbg_false.xml | 2 +- app/src/main/res/drawable/inputbg_true.xml | 2 +- app/src/main/res/drawable/item_bg_default.xml | 6 +- .../main/res/drawable/item_bg_default1.xml | 6 +- .../main/res/drawable/item_bg_default2.xml | 25 +++ app/src/main/res/layout/activity_login.xml | 14 +- app/src/main/res/layout/activity_main2.xml | 4 +- app/src/main/res/layout/activity_shenqing.xml | 174 ++++++++++++------ .../main/res/layout/activity_xiangqing.xml | 19 +- .../main/res/layout/layout_action_bar1.xml | 1 + app/src/main/res/mipmap-xxhdpi/add_img.png | Bin 2042 -> 1683 bytes app/src/main/res/mipmap-xxhdpi/login_bot.png | Bin 99809 -> 118686 bytes app/src/main/res/mipmap-xxhdpi/luzhi_img.png | Bin 18413 -> 18602 bytes app/src/main/res/mipmap-xxhdpi/luzhi_img1.png | Bin 14133 -> 14628 bytes .../main/res/mipmap-xxhdpi/sfz_add_img.png | Bin 4817 -> 4680 bytes .../main/res/mipmap-xxhdpi/shenfenz_img.png | Bin 0 -> 154196 bytes app/src/main/res/mipmap-xxhdpi/top_bg.png | Bin 48097 -> 49579 bytes app/src/main/res/values-night/colors.xml | 4 +- app/src/main/res/values/colors.xml | 4 +- 24 files changed, 218 insertions(+), 111 deletions(-) create mode 100644 app/src/main/res/drawable/item_bg_default2.xml create mode 100644 app/src/main/res/mipmap-xxhdpi/shenfenz_img.png diff --git a/app/build.gradle b/app/build.gradle index 8ccf0b6..4509f61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.dskj.daikuan" minSdkVersion 23 targetSdkVersion 30 - versionCode 119 - versionName "1.1.9" + versionCode 120 + versionName "1.2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // configurations.all { diff --git a/app/src/main/java/com/dskj/daikuan/ui/activity/LoginActivity.java b/app/src/main/java/com/dskj/daikuan/ui/activity/LoginActivity.java index f2831a0..d5b1579 100644 --- a/app/src/main/java/com/dskj/daikuan/ui/activity/LoginActivity.java +++ b/app/src/main/java/com/dskj/daikuan/ui/activity/LoginActivity.java @@ -161,25 +161,33 @@ public class LoginActivity extends BaseActivity { if (hasFocus) { - dataBinding.nameEt.setBackgroundResource(R.mipmap.edit_true); + dataBinding.nameEt.setBackgroundResource(R.drawable.inputbg_true); } else { - dataBinding.nameEt.setBackgroundResource(R.mipmap.edit_false); + dataBinding.nameEt.setBackgroundResource(R.drawable.inputbg_false); } }); dataBinding.passEt.setOnFocusChangeListener((v, hasFocus) -> { if (hasFocus) { - dataBinding.passEt.setBackgroundResource(R.mipmap.edit_true); + dataBinding.passEt.setBackgroundResource(R.drawable.inputbg_true); } else { - dataBinding.passEt.setBackgroundResource(R.mipmap.edit_false); + dataBinding.passEt.setBackgroundResource(R.drawable.inputbg_false); } }); dataBinding.invcodeEt.setOnFocusChangeListener((v, hasFocus) -> { if (hasFocus) { - dataBinding.invcodeEt.setBackgroundResource(R.mipmap.edit_true); + dataBinding.invcodeEt.setBackgroundResource(R.drawable.inputbg_true); } else { - dataBinding.invcodeEt.setBackgroundResource(R.mipmap.edit_false); + dataBinding.invcodeEt.setBackgroundResource(R.drawable.inputbg_false); + } + }); + + dataBinding.passEt1.setOnFocusChangeListener((v, hasFocus) -> { + if (hasFocus) { + dataBinding.passEt1.setBackgroundResource(R.drawable.inputbg_true); + } else { + dataBinding.passEt1.setBackgroundResource(R.drawable.inputbg_false); } }); } diff --git a/app/src/main/java/com/dskj/daikuan/ui/activity/MainActivity.java b/app/src/main/java/com/dskj/daikuan/ui/activity/MainActivity.java index 5e5268d..6293cae 100644 --- a/app/src/main/java/com/dskj/daikuan/ui/activity/MainActivity.java +++ b/app/src/main/java/com/dskj/daikuan/ui/activity/MainActivity.java @@ -164,7 +164,7 @@ public class MainActivity extends BaseActivity{ diff --git a/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java b/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java index 5dbfee6..220717a 100644 --- a/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java +++ b/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java @@ -132,7 +132,7 @@ public class ShenQingActivity extends BaseActivity { + dataBinding.backButton.setOnClickListener(view -> { SweetAlertDialog pDialog = new SweetAlertDialog(this, SweetAlertDialog.WARNING_TYPE); pDialog.setTitleText("Exit the current account？"); pDialog.setConfirmText("Exit"); @@ -155,7 +155,7 @@ public class ShenQingActivity extends BaseActivity startActivity(new Intent(ShenQingActivity.this,MainActivity.class))); - dataBinding.topLyF.backButton.setVisibility(View.VISIBLE); - dataBinding.topLyF.backButton.setImageResource(R.mipmap.tuichu_img); + dataBinding.menuTv.setVisibility(View.VISIBLE); + dataBinding.menuTv.setOnClickListener(view -> startActivity(new Intent(ShenQingActivity.this,MainActivity.class))); + dataBinding.backButton.setVisibility(View.VISIBLE); + dataBinding.backButton.setImageResource(R.mipmap.tuichu_img); dataBinding.guohuiCy.setOnClickListener(view -> { isRenXiang = false; @@ -290,7 +290,7 @@ public class ShenQingActivity extends BaseActivity { @@ -438,6 +439,7 @@ public class ShenQingActivity extends BaseActivity { LogUtils.i("1111111111111"); + dataBinding.sfzIv.setVisibility(View.GONE); if (!isRecording) { LogUtils.i("222222222222"); startRecording(); @@ -447,16 +449,19 @@ public class ShenQingActivity extends BaseActivity { - dataBinding.wanchengIv.setVisibility(View.GONE); - dataBinding.chongxinTv.setVisibility(View.GONE); +// dataBinding.wanchengIv.setVisibility(View.GONE); +// dataBinding.chongxinTv.setVisibility(View.GONE); + dataBinding.succLy.setVisibility(View.GONE); + dataBinding.luzhiIv.setVisibility(View.VISIBLE); initSuf(); dataBinding.playerIv.setVisibility(View.GONE); @@ -756,8 +761,10 @@ public class ShenQingActivity extends BaseActivity { if (hasFocus) { editText.setBackgroundResource(R.drawable.inputbg_true); - editText.setTextColor(getResources().getColor(R.color.color_e12d48)); + editText.setTextColor(getResources().getColor(R.color.colorPrimary)); } else { editText.setBackgroundResource(R.drawable.inputbg_false); editText.setTextColor(getResources().getColor(R.color.black)); diff --git a/app/src/main/java/com/dskj/daikuan/ui/activity/XiangQingActivity.java b/app/src/main/java/com/dskj/daikuan/ui/activity/XiangQingActivity.java index f54f50f..cd920d2 100644 --- a/app/src/main/java/com/dskj/daikuan/ui/activity/XiangQingActivity.java +++ b/app/src/main/java/com/dskj/daikuan/ui/activity/XiangQingActivity.java @@ -92,7 +92,7 @@ public class XiangQingActivity extends BaseActivity - + diff --git a/app/src/main/res/drawable/inputbg_true.xml b/app/src/main/res/drawable/inputbg_true.xml index 11417f4..ce1738b 100644 --- a/app/src/main/res/drawable/inputbg_true.xml +++ b/app/src/main/res/drawable/inputbg_true.xml @@ -16,7 +16,7 @@ android:endColor="@color/transparent" android:type="linear" android:useLevel="true" /> - + diff --git a/app/src/main/res/drawable/item_bg_default.xml b/app/src/main/res/drawable/item_bg_default.xml index 4e85c89..ce166d1 100644 --- a/app/src/main/res/drawable/item_bg_default.xml +++ b/app/src/main/res/drawable/item_bg_default.xml @@ -12,11 +12,11 @@ - + diff --git a/app/src/main/res/drawable/item_bg_default1.xml b/app/src/main/res/drawable/item_bg_default1.xml index 7dc802e..37faff8 100644 --- a/app/src/main/res/drawable/item_bg_default1.xml +++ b/app/src/main/res/drawable/item_bg_default1.xml @@ -12,11 +12,11 @@ - + diff --git a/app/src/main/res/drawable/item_bg_default2.xml b/app/src/main/res/drawable/item_bg_default2.xml new file mode 100644 index 0000000..9ccde7e --- /dev/null +++ b/app/src/main/res/drawable/item_bg_default2.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index e342459..ae0eec7 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -29,7 +29,7 @@ android:layout_marginLeft="@dimen/dp30" android:layout_marginTop="200dp" android:layout_marginRight="@dimen/dp30" - android:background="@mipmap/edit_false" + android:background="@drawable/inputbg_false" android:hint="Number " android:paddingLeft="10dp" android:textColor="@color/black" @@ -45,7 +45,7 @@ android:layout_marginLeft="@dimen/dp30" android:layout_marginTop="26dp" android:layout_marginRight="@dimen/dp30" - android:background="@mipmap/edit_false" + android:background="@drawable/inputbg_false" android:hint="Password" android:inputType="textPassword" android:paddingLeft="10dp" @@ -62,7 +62,7 @@ android:layout_marginLeft="@dimen/dp30" android:layout_marginTop="26dp" android:layout_marginRight="@dimen/dp30" - android:background="@mipmap/edit_false" + android:background="@drawable/inputbg_false" android:hint="Confirm Password" android:inputType="textPassword" android:paddingLeft="10dp" @@ -80,7 +80,7 @@ android:layout_marginLeft="@dimen/dp30" android:layout_marginTop="26dp" android:layout_marginRight="@dimen/dp30" - android:background="@mipmap/edit_false" + android:background="@drawable/inputbg_false" android:hint="Invitation code" android:paddingLeft="10dp" android:textColor="@color/black" @@ -109,7 +109,7 @@ android:src="@mipmap/login_bot" /> - diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml index de826ae..3c445bb 100644 --- a/app/src/main/res/layout/activity_main2.xml +++ b/app/src/main/res/layout/activity_main2.xml @@ -89,7 +89,7 @@ android:layout_below="@id/top_ly_f" android:layout_marginTop="@dimen/dp10" android:visibility="gone" - app:srlAccentColor="@color/color_e12d48"> + app:srlAccentColor="@color/colorPrimary"> + app:srlAccentColor="@color/colorPrimary" /> diff --git a/app/src/main/res/layout/activity_shenqing.xml b/app/src/main/res/layout/activity_shenqing.xml index 09e1b0b..1799651 100644 --- a/app/src/main/res/layout/activity_shenqing.xml +++ b/app/src/main/res/layout/activity_shenqing.xml @@ -23,15 +23,53 @@ android:orientation="vertical" android:visibility="visible"> - + + + + + + + + + + + @@ -116,9 +154,10 @@ @@ -207,7 +247,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp15" - android:text="职业/Occupation：" + android:text="职业/Pekerjaan：" android:textColor="#ff959595" android:textSize="13sp" /> @@ -229,7 +269,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp15" - android:text="地址/Address：" + android:text="地址/Alamat：" android:textColor="#ff959595" android:textSize="13sp" /> @@ -252,7 +292,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp15" - android:text="收款银行/Beneficiary Bank：" + android:text="收款银行//Bank Penerima:" android:textColor="#ff959595" android:textSize="13sp" /> @@ -268,7 +308,7 @@ android:layout_centerHorizontal="true" android:background="@drawable/inputbg_false" android:gravity="center_vertical" - android:hint="请选择银行" + android:hint="Select Bank" android:paddingLeft="10dp" android:textColor="@color/black" android:textColorHint="@color/color_e6000000" @@ -287,7 +327,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp15" - android:text="户口号码 /Beneficiary Account No:" + android:text="户口号码 /No Akaun Penerima:" android:textColor="#ff959595" android:textSize="13sp" /> @@ -310,7 +350,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp15" - android:text="薪水/salary：" + android:text="薪水/Gaji：" android:textColor="#ff959595" android:textSize="13sp" /> @@ -333,7 +373,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp15" - android:text="贷款金额/Loan amount :" + android:text="贷款金额/Jumlah pinjaman:" android:textColor="#ff959595" android:textSize="13sp" /> @@ -396,34 +436,45 @@ + android:layout_width="220dp" + android:layout_height="320dp"> + + + android:layout_width="220dp" + android:layout_height="320dp" /> + + android:layout_width="220dp" + android:layout_height="320dp" + android:visibility="gone" /> + + android:layout_width="60dp" + android:layout_height="60dp" + android:layout_centerInParent="true" + android:src="@mipmap/player_btn" + android:visibility="gone" /> + + @@ -431,10 +482,10 @@ @@ -443,9 +494,12 @@ android:id="@+id/name_tv_step2" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/dp20" android:layout_marginTop="@dimen/dp12" - android:text="我张三想申请RM20,000贷款来自GreatFinance" - android:textColor="#ffe12d48" + android:layout_marginRight="@dimen/dp20" + android:gravity="center" + android:text="Saya name xxx ingin memohon loan RM2000" + android:textColor="@color/colorPrimary" android:textSize="14sp" /> @@ -463,26 +517,38 @@ android:layout_height="100dp" android:layout_centerInParent="true" android:src="@mipmap/luzhi_img" /> - - + android:orientation="vertical" + android:layout_height="100dp"> +