denghuan/river-lucky-driver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newlj2' into newlj2toyybc

Browse Source
This commit is contained in:
lijia 2025-01-13 09:03:46 +08:00
commit 420169a34d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -38,8 +38,8 @@ android {
applicationId "com.arpa.hndahesudintocctmsdriver" applicationId "com.arpa.hndahesudintocctmsdriver"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 30 targetSdkVersion 30
versionCode 77 versionCode 78
versionName "3.4.7" versionName "3.4.8"
flavorDimensions "CHANNEL_VALUE" flavorDimensions "CHANNEL_VALUE"
flavorDimensions "app_icon" flavorDimensions "app_icon"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

7
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
View File

@ -11,6 +11,7 @@ import android.telecom.TelecomManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan; import android.text.style.ClickableSpan;
import android.util.Log; import android.util.Log;
@ -68,6 +69,7 @@ public class LoginActivity extends BaseActivity {
public static final String USER = "user"; public static final String USER = "user";
public static final String USER_TOKEN = "token"; public static final String USER_TOKEN = "token";
public static final String USER_UNAME = "uname"; public static final String USER_UNAME = "uname";
public static final String USER_PHONE = "USER_PHONE";
public static final String USER_RNAME = "rname"; public static final String USER_RNAME = "rname";
public static final String USER_ID = "id"; public static final String USER_ID = "id";
@ -113,6 +115,7 @@ public class LoginActivity extends BaseActivity {
NewLJUtils.getInstance().getToken(con); NewLJUtils.getInstance().getToken(con);
SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken()); SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken());
SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname()); SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
SPUtil.insSP(con, USER, USER_PHONE, loginBean.getData().getRegisterPhone());
SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname()); SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname());
SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + ""); SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + "");
// JPushInterface.setAlias(con, 0, loginBean.getData().getUname()); // JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
@ -155,6 +158,10 @@ public class LoginActivity extends BaseActivity {
getCode = findViewById(R.id.getCode); getCode = findViewById(R.id.getCode);
cb = findViewById(R.id.cb); cb = findViewById(R.id.cb);
ur = new UserRequset(con, hd); ur = new UserRequset(con, hd);
String phone = SPUtil.getSP(con, LoginActivity.USER, LoginActivity.USER_PHONE);
if (!TextUtils.isEmpty(phone)){
input_phone.setText(phone);
}
initView(null); initView(null);
} }

4
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java
View File

@ -232,14 +232,14 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
} }
public void submit() { public void submit() {
customDialog = new CustomDialog(con, "上传中,请稍后...");
customDialog.show();
String bankName = bank_name.getText().toString().trim(); String bankName = bank_name.getText().toString().trim();
String bankNumber = bank_number.getText().toString().trim(); String bankNumber = bank_number.getText().toString().trim();
if ("".equals(bankName) || "".equals(bankNumber)) { if ("".equals(bankName) || "".equals(bankNumber)) {
Toast.makeText(con, "请先补充完整的银行卡信息", Toast.LENGTH_LONG).show(); Toast.makeText(con, "请先补充完整的银行卡信息", Toast.LENGTH_LONG).show();
return; return;
} }
customDialog = new CustomDialog(con, "上传中,请稍后...");
customDialog.show();
InsBankInputBean ibib = new InsBankInputBean(); InsBankInputBean ibib = new InsBankInputBean();
ibib.setCardNo(bankNumber); ibib.setCardNo(bankNumber);
// ibib.setCardType(Integer.parseInt(ib.getData().getType())); // ibib.setCardType(Integer.parseInt(ib.getData().getType()));