莫名其妙的东西又增加了

This commit is contained in:
xuhuixiang
2023-04-17 13:38:26 +08:00
parent e7cf41ab71
commit 093e9c0721
24 changed files with 218 additions and 111 deletions

View File

@@ -10,8 +10,8 @@ android {
applicationId "com.dskj.daikuan" applicationId "com.dskj.daikuan"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 119 versionCode 120
versionName "1.1.9" versionName "1.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// configurations.all { // configurations.all {

View File

@@ -161,25 +161,33 @@ public class LoginActivity extends BaseActivity<MainViewModel, ActivityLoginBind
dataBinding.nameEt.setOnFocusChangeListener((v, hasFocus) -> { dataBinding.nameEt.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) { if (hasFocus) {
dataBinding.nameEt.setBackgroundResource(R.mipmap.edit_true); dataBinding.nameEt.setBackgroundResource(R.drawable.inputbg_true);
} else { } else {
dataBinding.nameEt.setBackgroundResource(R.mipmap.edit_false); dataBinding.nameEt.setBackgroundResource(R.drawable.inputbg_false);
} }
}); });
dataBinding.passEt.setOnFocusChangeListener((v, hasFocus) -> { dataBinding.passEt.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) { if (hasFocus) {
dataBinding.passEt.setBackgroundResource(R.mipmap.edit_true); dataBinding.passEt.setBackgroundResource(R.drawable.inputbg_true);
} else { } else {
dataBinding.passEt.setBackgroundResource(R.mipmap.edit_false); dataBinding.passEt.setBackgroundResource(R.drawable.inputbg_false);
} }
}); });
dataBinding.invcodeEt.setOnFocusChangeListener((v, hasFocus) -> { dataBinding.invcodeEt.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) { if (hasFocus) {
dataBinding.invcodeEt.setBackgroundResource(R.mipmap.edit_true); dataBinding.invcodeEt.setBackgroundResource(R.drawable.inputbg_true);
} else { } 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);
} }
}); });
} }

View File

@@ -164,7 +164,7 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
holder.setText(R.id.name_tv,"Time"+s.getCreate_time()); holder.setText(R.id.name_tv,"Time"+s.getCreate_time());
// 0审核中 1通过 2失败 // 0审核中 1通过 2失败
TextView textView = holder.getView(R.id.status_tv); TextView textView = holder.getView(R.id.status_tv);
textView.setTextColor(getResources().getColor(R.color.color_750000)); textView.setTextColor(getResources().getColor(R.color.white));
if(s.getStatus() == 0){ if(s.getStatus() == 0){
holder.setText(R.id.status_tv,"processing"); holder.setText(R.id.status_tv,"processing");
@@ -173,7 +173,7 @@ public class MainActivity extends BaseActivity<MainViewModel, ActivityMain2Bindi
}else if(s.getStatus() == 2){ }else if(s.getStatus() == 2){
holder.setText(R.id.status_tv,"fail"); holder.setText(R.id.status_tv,"fail");
textView.setTextColor(getResources().getColor(R.color.color_fe8b59)); textView.setTextColor(getResources().getColor(R.color.color_search_2));
} }
holder.getView(R.id.big_ly).setOnClickListener(view ->{ holder.getView(R.id.big_ly).setOnClickListener(view ->{

View File

@@ -132,7 +132,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
rxPermissions = new RxPermissions(this); rxPermissions = new RxPermissions(this);
this.saveDirFromIntent = getReceivedShortVideoSavedDirHasSlash(); this.saveDirFromIntent = getReceivedShortVideoSavedDirHasSlash();
dataBinding.topLyF.backButton.setOnClickListener(view -> { dataBinding.backButton.setOnClickListener(view -> {
SweetAlertDialog pDialog = new SweetAlertDialog(this, SweetAlertDialog.WARNING_TYPE); SweetAlertDialog pDialog = new SweetAlertDialog(this, SweetAlertDialog.WARNING_TYPE);
pDialog.setTitleText("Exit the current account"); pDialog.setTitleText("Exit the current account");
pDialog.setConfirmText("Exit"); pDialog.setConfirmText("Exit");
@@ -155,7 +155,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
} }
})); }));
}); });
dataBinding.topLyF.titleTv.setText("Register"); dataBinding.titleTv.setText("Register");
setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.phoneNumberEt, dataBinding.occupationEt, dataBinding.addressEt, setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.phoneNumberEt, dataBinding.occupationEt, dataBinding.addressEt,
dataBinding.beneficiaryAccountNoEt, dataBinding.salaryEt, dataBinding.loanAmountEt); dataBinding.beneficiaryAccountNoEt, dataBinding.salaryEt, dataBinding.loanAmountEt);
@@ -164,10 +164,10 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
toOpenFile(); toOpenFile();
}); });
dataBinding.topLyF.menuTv.setVisibility(View.VISIBLE); dataBinding.menuTv.setVisibility(View.VISIBLE);
dataBinding.topLyF.menuTv.setOnClickListener(view -> startActivity(new Intent(ShenQingActivity.this,MainActivity.class))); dataBinding.menuTv.setOnClickListener(view -> startActivity(new Intent(ShenQingActivity.this,MainActivity.class)));
dataBinding.topLyF.backButton.setVisibility(View.VISIBLE); dataBinding.backButton.setVisibility(View.VISIBLE);
dataBinding.topLyF.backButton.setImageResource(R.mipmap.tuichu_img); dataBinding.backButton.setImageResource(R.mipmap.tuichu_img);
dataBinding.guohuiCy.setOnClickListener(view -> { dataBinding.guohuiCy.setOnClickListener(view -> {
isRenXiang = false; isRenXiang = false;
@@ -290,7 +290,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
private void toPush() { private void toPush() {
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE); pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(getResources().getColor(R.color.blue_btn_bg_color)); pDialog.getProgressHelper().setBarColor(getResources().getColor(R.color.colorPrimary));
pDialog.setTitleText("Submitting application……"); pDialog.setTitleText("Submitting application……");
// pDialog.setTitleText("提交申请"); // pDialog.setTitleText("提交申请");
pDialog.setCancelable(false); pDialog.setCancelable(false);
@@ -318,6 +318,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
completeRecording(false, -1000); completeRecording(false, -1000);
dataBinding.step1Ry.setVisibility(View.VISIBLE); dataBinding.step1Ry.setVisibility(View.VISIBLE);
dataBinding.step2Ry.setVisibility(View.GONE); dataBinding.step2Ry.setVisibility(View.GONE);
dataBinding.sfzIv.setVisibility(View.VISIBLE);
qingkong(); qingkong();
new Handler().postDelayed(() -> { new Handler().postDelayed(() -> {
@@ -438,6 +439,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
initSuf(); initSuf();
dataBinding.luzhiIv.setOnClickListener(view -> { dataBinding.luzhiIv.setOnClickListener(view -> {
LogUtils.i("1111111111111"); LogUtils.i("1111111111111");
dataBinding.sfzIv.setVisibility(View.GONE);
if (!isRecording) { if (!isRecording) {
LogUtils.i("222222222222"); LogUtils.i("222222222222");
startRecording(); startRecording();
@@ -447,16 +449,19 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
completeRecording(false, -1); completeRecording(false, -1);
} }
}); });
dataBinding.wanchengIv.setVisibility(View.GONE); // dataBinding.wanchengIv.setVisibility(View.GONE);
dataBinding.chongxinTv.setVisibility(View.GONE); // dataBinding.chongxinTv.setVisibility(View.GONE);
dataBinding.succLy.setVisibility(View.GONE);
dataBinding.luzhiIv.setVisibility(View.VISIBLE); dataBinding.luzhiIv.setVisibility(View.VISIBLE);
dataBinding.playerIv.setVisibility(View.GONE); dataBinding.playerIv.setVisibility(View.GONE);
dataBinding.videoView.setVisibility(View.GONE); dataBinding.videoView.setVisibility(View.GONE);
dataBinding.chongxinTv.setOnClickListener(view -> { dataBinding.chongxinTv.setOnClickListener(view -> {
dataBinding.wanchengIv.setVisibility(View.GONE); // dataBinding.wanchengIv.setVisibility(View.GONE);
dataBinding.chongxinTv.setVisibility(View.GONE); // dataBinding.chongxinTv.setVisibility(View.GONE);
dataBinding.succLy.setVisibility(View.GONE);
dataBinding.luzhiIv.setVisibility(View.VISIBLE); dataBinding.luzhiIv.setVisibility(View.VISIBLE);
initSuf(); initSuf();
dataBinding.playerIv.setVisibility(View.GONE); dataBinding.playerIv.setVisibility(View.GONE);
@@ -756,8 +761,10 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
LogUtils.i( "【视频录制】视频录制完成(时长:"+recordDuration+"ms),保存路径是:" + this.currentVideoFilePath); LogUtils.i( "【视频录制】视频录制完成(时长:"+recordDuration+"ms),保存路径是:" + this.currentVideoFilePath);
if(_recordDuration!=-1000) { if(_recordDuration!=-1000) {
dataBinding.luzhiIv.setVisibility(View.GONE); dataBinding.luzhiIv.setVisibility(View.GONE);
dataBinding.wanchengIv.setVisibility(View.VISIBLE); // dataBinding.wanchengIv.setVisibility(View.VISIBLE);
dataBinding.chongxinTv.setVisibility(View.VISIBLE); // dataBinding.chongxinTv.setVisibility(View.VISIBLE);
dataBinding.succLy.setVisibility(View.VISIBLE);
dataBinding.playerIv.setVisibility(View.VISIBLE); dataBinding.playerIv.setVisibility(View.VISIBLE);
} }
@@ -829,6 +836,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
completeRecording(false, -1000); completeRecording(false, -1000);
dataBinding.step1Ry.setVisibility(View.VISIBLE); dataBinding.step1Ry.setVisibility(View.VISIBLE);
dataBinding.step2Ry.setVisibility(View.GONE); dataBinding.step2Ry.setVisibility(View.GONE);
dataBinding.sfzIv.setVisibility(View.VISIBLE);
}else{ }else{
super.onBackPressed(); super.onBackPressed();
@@ -1019,7 +1027,7 @@ public class ShenQingActivity extends BaseActivity<MainViewModel, ActivityShenqi
editText.setOnFocusChangeListener((v, hasFocus) -> { editText.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) { if (hasFocus) {
editText.setBackgroundResource(R.drawable.inputbg_true); editText.setBackgroundResource(R.drawable.inputbg_true);
editText.setTextColor(getResources().getColor(R.color.color_e12d48)); editText.setTextColor(getResources().getColor(R.color.colorPrimary));
} else { } else {
editText.setBackgroundResource(R.drawable.inputbg_false); editText.setBackgroundResource(R.drawable.inputbg_false);
editText.setTextColor(getResources().getColor(R.color.black)); editText.setTextColor(getResources().getColor(R.color.black));

View File

@@ -92,7 +92,7 @@ public class XiangQingActivity extends BaseActivity<MainViewModel, ActivityXiang
dataBinding.statusTv.setTextColor(getResources().getColor(R.color.color_750000)); dataBinding.statusTv.setTextColor(getResources().getColor(R.color.white));
if(loanBean.getStatus() == 0){ if(loanBean.getStatus() == 0){
dataBinding.statusTv.setText("processing"); dataBinding.statusTv.setText("processing");
@@ -101,7 +101,7 @@ public class XiangQingActivity extends BaseActivity<MainViewModel, ActivityXiang
}else if(loanBean.getStatus() == 2){ }else if(loanBean.getStatus() == 2){
dataBinding.statusTv.setText("fail"); dataBinding.statusTv.setText("fail");
dataBinding.statusTv.setTextColor(getResources().getColor(R.color.color_fe8b59)); dataBinding.statusTv.setTextColor(getResources().getColor(R.color.color_search_2));
} }

View File

@@ -16,7 +16,7 @@
android:endColor="@color/transparent" android:endColor="@color/transparent"
android:type="linear" android:type="linear"
android:useLevel="true" /> android:useLevel="true" />
<stroke android:color="#000019" android:width="1dp"/> <stroke android:color="#E1CFCF" android:width="0.5dp"/>
<corners <corners
android:radius="5dp" /> android:radius="5dp" />
</shape> </shape>

View File

@@ -16,7 +16,7 @@
android:endColor="@color/transparent" android:endColor="@color/transparent"
android:type="linear" android:type="linear"
android:useLevel="true" /> android:useLevel="true" />
<stroke android:color="@color/color_e12d48" android:width="1dp"/> <stroke android:color="@color/colorPrimary" android:width="1dp"/>
<corners <corners
android:radius="5dp" /> android:radius="5dp" />
</shape> </shape>

View File

@@ -12,11 +12,11 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<gradient <gradient
android:angle="180" android:angle="180"
android:startColor="#E12D48" android:startColor="@color/colorPrimary"
android:endColor="#E12D48" android:endColor="@color/colorPrimary"
android:type="linear" android:type="linear"
android:useLevel="true" /> android:useLevel="true" />
<stroke android:color="#E12D48" android:width="0.5dp"/> <stroke android:color="@color/colorPrimary" android:width="0.5dp"/>
<corners <corners
android:radius="10dp" /> android:radius="10dp" />
</shape> </shape>

View File

@@ -12,11 +12,11 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<gradient <gradient
android:angle="180" android:angle="180"
android:startColor="#E12D48" android:startColor="#47A0C2"
android:endColor="#E12D48" android:endColor="#47A0C2"
android:type="linear" android:type="linear"
android:useLevel="true" /> android:useLevel="true" />
<stroke android:color="#E12D48" android:width="0.5dp"/> <stroke android:color="#47A0C2" android:width="0.5dp"/>
<corners <corners
android:radius="5dp" /> android:radius="5dp" />
</shape> </shape>

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white">
<item android:id="@android:id/mask">
<shape>
<solid android:color="@color/transparent" />
<corners android:radius="@dimen/dp5" />
</shape>
</item>
<!-- 默认显⽰效果-->
<item>
<shape android:shape="rectangle">
<gradient
android:angle="180"
android:startColor="@color/transparent"
android:endColor="@color/transparent"
android:type="linear"
android:useLevel="true" />
<stroke android:color="#47A0C2" android:width="1dp"/>
<corners
android:radius="5dp" />
</shape>
</item>
</ripple>

View File

@@ -29,7 +29,7 @@
android:layout_marginLeft="@dimen/dp30" android:layout_marginLeft="@dimen/dp30"
android:layout_marginTop="200dp" android:layout_marginTop="200dp"
android:layout_marginRight="@dimen/dp30" android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false" android:background="@drawable/inputbg_false"
android:hint="Number " android:hint="Number "
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textColor="@color/black" android:textColor="@color/black"
@@ -45,7 +45,7 @@
android:layout_marginLeft="@dimen/dp30" android:layout_marginLeft="@dimen/dp30"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"
android:layout_marginRight="@dimen/dp30" android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false" android:background="@drawable/inputbg_false"
android:hint="Password" android:hint="Password"
android:inputType="textPassword" android:inputType="textPassword"
android:paddingLeft="10dp" android:paddingLeft="10dp"
@@ -62,7 +62,7 @@
android:layout_marginLeft="@dimen/dp30" android:layout_marginLeft="@dimen/dp30"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"
android:layout_marginRight="@dimen/dp30" android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false" android:background="@drawable/inputbg_false"
android:hint="Confirm Password" android:hint="Confirm Password"
android:inputType="textPassword" android:inputType="textPassword"
android:paddingLeft="10dp" android:paddingLeft="10dp"
@@ -80,7 +80,7 @@
android:layout_marginLeft="@dimen/dp30" android:layout_marginLeft="@dimen/dp30"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"
android:layout_marginRight="@dimen/dp30" android:layout_marginRight="@dimen/dp30"
android:background="@mipmap/edit_false" android:background="@drawable/inputbg_false"
android:hint="Invitation code" android:hint="Invitation code"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textColor="@color/black" android:textColor="@color/black"
@@ -109,7 +109,7 @@
android:src="@mipmap/login_bot" /> android:src="@mipmap/login_bot" />
<TextView <Button
android:id="@+id/change_type" android:id="@+id/change_type"
android:layout_width="210dp" android:layout_width="210dp"
@@ -118,9 +118,9 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp30" android:layout_marginTop="@dimen/dp30"
android:background="@drawable/item_bg_default2"
android:gravity="center" android:gravity="center"
android:background="@mipmap/edit_false" android:textColor="@color/colorPrimary"
android:textColor="@color/black"
android:textSize="16sp" android:textSize="16sp"
android:visibility="visible" /> android:visibility="visible" />

View File

@@ -89,7 +89,7 @@
android:layout_below="@id/top_ly_f" android:layout_below="@id/top_ly_f"
android:layout_marginTop="@dimen/dp10" android:layout_marginTop="@dimen/dp10"
android:visibility="gone" android:visibility="gone"
app:srlAccentColor="@color/color_e12d48"> app:srlAccentColor="@color/colorPrimary">
<com.dskj.daikuan.ui.view.BezierCircleHeader <com.dskj.daikuan.ui.view.BezierCircleHeader
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -107,7 +107,7 @@
<com.scwang.smart.refresh.footer.ClassicsFooter <com.scwang.smart.refresh.footer.ClassicsFooter
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:srlAccentColor="@color/color_e12d48" /> app:srlAccentColor="@color/colorPrimary" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout> </com.scwang.smart.refresh.layout.SmartRefreshLayout>

View File

@@ -23,15 +23,53 @@
android:orientation="vertical" android:orientation="vertical"
android:visibility="visible"> android:visibility="visible">
<include <RelativeLayout
android:id="@+id/top_ly_f" android:id="@+id/top_vvvv"
layout="@layout/layout_action_bar1" /> android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:orientation="horizontal"
android:paddingRight="@dimen/dp5">
<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:tint="@color/colorPrimary"
android:background="@drawable/bg_ripple"
android:src="@mipmap/ic_black_back" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textColor="@color/black"
android:textSize="@dimen/sp16" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/menu_tv"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_width="@dimen/dp40"
android:layout_height="@dimen/dp40"
android:scaleType="centerInside"
android:visibility="gone"
android:padding="@dimen/dp8"
android:tint="@color/colorPrimary"
android:background="@drawable/bg_ripple"
android:src="@mipmap/log_img" />
</RelativeLayout>
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/top_ly_f" android:layout_below="@id/top_vvvv"
android:overScrollMode="never"> android:overScrollMode="never">
<LinearLayout <LinearLayout
@@ -46,7 +84,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="姓名/Full Name" android:text="姓名/Nama Penuh"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -116,9 +154,10 @@
</com.dskj.daikuan.ui.view.CircleImageView> </com.dskj.daikuan.ui.view.CircleImageView>
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="@dimen/dp35"
android:layout_height="wrap_content" android:layout_height="@dimen/dp35"
android:src="@mipmap/sfz_add_img" android:scaleType="fitXY"
android:src="@mipmap/add_img"
app:layout_constraintBottom_toBottomOf="@id/zhengmian_iv" app:layout_constraintBottom_toBottomOf="@id/zhengmian_iv"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
@@ -158,9 +197,10 @@
</com.dskj.daikuan.ui.view.CircleImageView> </com.dskj.daikuan.ui.view.CircleImageView>
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="@dimen/dp35"
android:layout_height="wrap_content" android:layout_height="@dimen/dp35"
android:src="@mipmap/sfz_add_img" android:src="@mipmap/add_img"
android:scaleType="fitXY"
app:layout_constraintBottom_toBottomOf="@id/fanmian_iv" app:layout_constraintBottom_toBottomOf="@id/fanmian_iv"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
@@ -183,7 +223,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:layout_marginTop="@dimen/dp15" android:layout_marginTop="@dimen/dp15"
android:text="电话号码/Phone number" android:text="电话号码/Nombor telefon"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -207,7 +247,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:layout_marginTop="@dimen/dp15" android:layout_marginTop="@dimen/dp15"
android:text="职业/Occupation" android:text="职业/Pekerjaan"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -229,7 +269,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:layout_marginTop="@dimen/dp15" android:layout_marginTop="@dimen/dp15"
android:text="地址/Address" android:text="地址/Alamat"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -252,7 +292,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:layout_marginTop="@dimen/dp15" android:layout_marginTop="@dimen/dp15"
android:text="收款银行/Beneficiary Bank" android:text="收款银行//Bank Penerima:"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -268,7 +308,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/inputbg_false" android:background="@drawable/inputbg_false"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="请选择银行" android:hint="Select Bank"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textColorHint="@color/color_e6000000" android:textColorHint="@color/color_e6000000"
@@ -287,7 +327,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:layout_marginTop="@dimen/dp15" android:layout_marginTop="@dimen/dp15"
android:text="户口号码 /Beneficiary Account No:" android:text="户口号码 /No Akaun Penerima:"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -310,7 +350,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:layout_marginTop="@dimen/dp15" android:layout_marginTop="@dimen/dp15"
android:text="薪水/salary" android:text="薪水/Gaji"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -333,7 +373,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:layout_marginTop="@dimen/dp15" android:layout_marginTop="@dimen/dp15"
android:text="贷款金额/Loan amount :" android:text="贷款金额/Jumlah pinjaman:"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" /> android:textSize="13sp" />
@@ -396,34 +436,45 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/top_ly_f1"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="37dp" android:layout_marginTop="37dp"
android:layout_below="@id/top_ly_f1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="258dp" android:layout_width="220dp"
android:layout_height="386dp"> android:layout_height="320dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<SurfaceView <SurfaceView
android:id="@+id/common_short_video_record_ac_record_surfaceView" android:id="@+id/common_short_video_record_ac_record_surfaceView"
android:layout_width="258dp" android:layout_width="220dp"
android:layout_height="386dp" /> android:layout_height="320dp" />
<VideoView <VideoView
android:id="@+id/videoView" android:id="@+id/videoView"
android:visibility="gone" android:layout_width="220dp"
android:layout_width="258dp" android:layout_height="320dp"
android:layout_height="386dp" /> android:visibility="gone" />
<ImageView <ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:id="@+id/player_iv" android:id="@+id/player_iv"
android:visibility="gone" android:layout_width="60dp"
android:src="@mipmap/player_btn"/> android:layout_height="60dp"
android:layout_centerInParent="true"
android:src="@mipmap/player_btn"
android:visibility="gone" />
<ImageView
android:id="@+id/sfz_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:src="@mipmap/shenfenz_img" />
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
@@ -431,10 +482,10 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="34dp"
android:gravity="center"
android:layout_marginLeft="@dimen/dp20" android:layout_marginLeft="@dimen/dp20"
android:layout_marginTop="34dp"
android:layout_marginRight="@dimen/dp20" android:layout_marginRight="@dimen/dp20"
android:gravity="center"
android:text="Sila pegang kad IC pengenalan anda dan katakan pada kamera cakap" android:text="Sila pegang kad IC pengenalan anda dan katakan pada kamera cakap"
android:textColor="#ff767676" android:textColor="#ff767676"
android:textSize="18sp" /> android:textSize="18sp" />
@@ -443,9 +494,12 @@
android:id="@+id/name_tv_step2" android:id="@+id/name_tv_step2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp20"
android:layout_marginTop="@dimen/dp12" android:layout_marginTop="@dimen/dp12"
android:text="我张三想申请RM20,000贷款来自GreatFinance" android:layout_marginRight="@dimen/dp20"
android:textColor="#ffe12d48" android:gravity="center"
android:text="Saya name xxx ingin memohon loan RM2000"
android:textColor="@color/colorPrimary"
android:textSize="14sp" /> android:textSize="14sp" />
@@ -463,26 +517,38 @@
android:layout_height="100dp" android:layout_height="100dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="@mipmap/luzhi_img" /> android:src="@mipmap/luzhi_img" />
<LinearLayout
<ImageView android:id="@+id/succ_ly"
android:id="@+id/wancheng_iv" android:layout_width="match_parent"
android:layout_width="100dp" android:gravity="center"
android:layout_height="100dp"
android:visibility="gone" android:visibility="gone"
android:layout_centerInParent="true" android:orientation="vertical"
android:src="@mipmap/wancheng_img" /> android:layout_height="100dp">
<Button
android:id="@+id/wancheng_iv"
android:layout_width="250dp"
android:layout_height="45dp"
android:layout_marginTop="@dimen/dp10"
android:layout_centerHorizontal="true"
android:background="@drawable/item_bg_default1"
android:text="submit application"
android:textColor="#ffffffff"
android:textSize="16sp" />
<TextView <TextView
android:id="@+id/chongxin_tv" android:id="@+id/chongxin_tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp36" android:visibility="visible"
android:visibility="gone"
android:layout_toRightOf="@id/wancheng_iv" android:layout_toRightOf="@id/wancheng_iv"
android:text="Record Again" android:text="Record Again"
android:textColor="#ffe12d48" android:textColor="#767676"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

View File

@@ -60,7 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginLeft="@dimen/dp20" android:layout_marginLeft="@dimen/dp20"
android:text="姓名/Full Name" android:text="姓名/Nama Penuh"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
@@ -70,8 +70,7 @@
android:layout_below="@id/name_tv" android:layout_below="@id/name_tv"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="17dp" android:layout_marginRight="17dp"
android:text="贷款审批中" android:textColor="@color/color_search_2"
android:textColor="#ff750000"
android:textSize="13sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>
@@ -183,7 +182,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="电话号码/Phone number" android:text="电话号码/Nombor telefon"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" android:textSize="13sp"
/> />
@@ -206,7 +205,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="职业/Occupation" android:text="职业/Pekerjaan"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" android:textSize="13sp"
/> />
@@ -228,7 +227,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="地址/Address" android:text="地址/Alamat"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" android:textSize="13sp"
/> />
@@ -251,7 +250,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="收款银行/Beneficiary Bank" android:text="收款银行/Bank Penerima"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" android:textSize="13sp"
/> />
@@ -286,7 +285,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="户口号码 /Beneficiary Account No:" android:text="户口号码 /No Akaun Penerima:"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" android:textSize="13sp"
/> />
@@ -309,7 +308,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="薪水/salary" android:text="薪水/Gaji"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" android:textSize="13sp"
/> />
@@ -332,7 +331,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12" android:layout_marginLeft="@dimen/dp12"
android:text="贷款金额/Loan amount :" android:text="贷款金额/Jumlah pinjaman:"
android:textColor="#ff959595" android:textColor="#ff959595"
android:textSize="13sp" android:textSize="13sp"
/> />

View File

@@ -41,6 +41,7 @@
android:visibility="gone" android:visibility="gone"
android:padding="@dimen/dp8" android:padding="@dimen/dp8"
android:background="@drawable/bg_ripple" android:background="@drawable/bg_ripple"
android:tint="@color/colorPrimary"
android:src="@mipmap/log_img" /> android:src="@mipmap/log_img" />
</RelativeLayout> </RelativeLayout>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

@@ -7,7 +7,7 @@
<color name="teal_700">#FF018786</color> <color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#000000</color> <color name="white">#000000</color>
<color name="colorPrimary">#E83126</color> <color name="colorPrimary">#47A0C2</color>
<color name="color_2062D3">#2062D3</color> <color name="color_2062D3">#2062D3</color>
<color name="colorPrimaryDark">#303F9F</color> <color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color> <color name="colorAccent">#FF4081</color>
@@ -68,7 +68,7 @@
<color name="color_e83126">#E83126</color> <color name="color_e83126">#E83126</color>
<color name="color_e6000000">#e6000000</color> <color name="color_e6000000">#e6000000</color>
<color name="color_66ffffff">#66FFFFFF</color> <color name="color_66ffffff">#66FFFFFF</color>
<color name="color_search_2">#EEEEEE</color> <color name="color_search_2">#000019</color>
<color name="color_search_1">#DDDDDD</color> <color name="color_search_1">#DDDDDD</color>
<color name="color_45000000">#45000000</color> <color name="color_45000000">#45000000</color>

View File

@@ -7,7 +7,7 @@
<color name="teal_700">#FF018786</color> <color name="teal_700">#FF018786</color>
<color name="black">#000019</color> <color name="black">#000019</color>
<color name="white">#FFFFFF</color> <color name="white">#FFFFFF</color>
<color name="colorPrimary">#E83126</color> <color name="colorPrimary">#47A0C2</color>
<color name="color_2062D3">#2062D3</color> <color name="color_2062D3">#2062D3</color>
<color name="colorPrimaryDark">#303F9F</color> <color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color> <color name="colorAccent">#FF4081</color>
@@ -68,7 +68,7 @@
<color name="color_e83126">#E83126</color> <color name="color_e83126">#E83126</color>
<color name="color_e6000000">#959595</color> <color name="color_e6000000">#959595</color>
<color name="color_66ffffff">#66FFFFFF</color> <color name="color_66ffffff">#66FFFFFF</color>
<color name="color_search_2">#EEEEEE</color> <color name="color_search_2">#000019</color>
<color name="color_search_1">#DDDDDD</color> <color name="color_search_1">#DDDDDD</color>
<color name="color_e12d48">#E12D48</color> <color name="color_e12d48">#E12D48</color>
<color name="color_750000">#750000</color> <color name="color_750000">#750000</color>