From de7f93c0bc4a3c576095eb7e09217a35c183ed1d Mon Sep 17 00:00:00 2001
From: 唐浩 <15928265276@163.com>
Date: 星期三, 24 九月 2025 23:14:45 +0800
Subject: [PATCH] 2025/9/24 最后一次提交by tang
---
app/src/main/res/drawable/car_get_top_red.xml | 5
app/src/main/res/layout/verify_card_pwd.xml | 2
app/src/main/res/layout/activity_trip.xml | 2
app/src/main/res/layout/activity_list_card.xml | 2
app/src/main/res/layout/activity_sure_money.xml | 14
.idea/gradle.xml | 6
build.gradle | 6
app/src/main/java/com/zhaoyang/driver/ui/main/major/MajorSureMoneyActivity.kt | 16 +
app/src/main/java/com/zhaoyang/driver/ui/adapter/AllIncomeDetailAdapter.kt | 12
app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/ApplyMoneyActivity.kt | 31 -
app/build.gradle | 7
app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListAdapter.kt | 7
app/src/main/java/com/zhaoyang/driver/ui/adapter/MainAdapter.kt | 7
app/src/main/java/com/zhaoyang/driver/ui/main/GetOrderFragment.kt | 44 +-
app/src/main/res/layout/activity_add_card.xml | 121 +++----
app/src/main/java/com/zhaoyang/driver/ui/card/CardListActivity.kt | 2
settings.gradle | 1
app/src/main/res/layout/activity_safe_acount.xml | 2
app/src/main/AndroidManifest.xml | 3
app/src/main/java/com/zhaoyang/driver/bean/CardListBean.java | 2
app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/AllIncomeDetailActivity.kt | 2
app/src/main/java/com/zhaoyang/driver/ui/main/major/InputPriceActivity.kt | 97 ++++++
app/src/main/res/color/selector_blue_grey_check.xml | 5
app/src/main/java/com/zhaoyang/driver/ui/card/VerifyCardPwdActivity.kt | 2
app/src/main/java/com/zhaoyang/driver/netUtls/HttpManager.java | 2
app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListPopAdapter.kt | 5
app/src/main/res/drawable/bg_reserve.xml | 5
app/src/main/res/layout/activity_input_price.xml | 108 ++++++
app/src/main/res/layout/item_get_order.xml | 1
app/src/main/java/com/zhaoyang/driver/netUtls/Api.java | 20
app/src/main/java/com/zhaoyang/driver/ui/card/AddCardActivity.kt | 74 ----
app/src/main/res/layout/item_main_list.xml | 213 +++++++------
app/src/main/java/com/zhaoyang/driver/ui/adapter/DelMoneyDetailAdapter.kt | 8
app/src/main/res/layout/activity_apply_money.xml | 11
app/src/main/java/com/zhaoyang/driver/bean/MajorMoneyBean.java | 2
app/src/main/res/drawable/bg_black_alpha20_4.xml | 5
app/src/main/res/layout/activity_all_detail_income.xml | 45 +
app/src/main/java/com/zhaoyang/driver/bean/AllIncomeDetailBean.java | 1
app/src/main/res/layout/item_all_income_detail.xml | 12
app/src/main/java/com/zhaoyang/driver/bean/OrderListBean.java | 1
app/src/main/java/com/zhaoyang/driver/bean/DelMoneyDetailBean.java | 1
app/src/main/res/layout/item_income_del_money.xml | 22 +
42 files changed, 600 insertions(+), 334 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 69cb1f8..3be3ddb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,13 +4,13 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="testRunner" value="CHOOSE_PER_TEST" />
+ <option name="testRunner" value="GRADLE" />
+ <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+ <option name="gradleJvm" value="corretto-1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
- <option value="$PROJECT_DIR$/ChipsLayoutManager" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/rxnetty" />
<option value="$PROJECT_DIR$/xldUtils" />
diff --git a/app/build.gradle b/app/build.gradle
index f91a821..89c4eab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@
applicationId "com.zhaoyang.driver"
minSdkVersion 21
targetSdkVersion 28
- versionCode 4
- versionName "1.3"
+ versionCode 5
+ versionName "1.4"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
@@ -127,7 +127,6 @@
implementation 'cn.jiguang.sdk:jcore:2.3.8' // 此处以JCore 2.3.8 版本为例。
implementation 'com.tencent.bugly:crashreport:3.1.0'
implementation 'com.tencent.bugly:nativecrashreport:3.1.0'
+ implementation 'com.github.BelooS:ChipsLayoutManager:v0.3.7'
implementation 'com.tencent.bugly:crashreport:latest.release' //tx bugly
- implementation project(path: ':ChipsLayoutManager')
-
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f147266..b256f1f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -191,7 +191,8 @@
android:name="com.zhaoyang.driver.wxapi.WXPayEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- 微信 -->
+ android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+ <activity android:name=".ui.main.major.InputPriceActivity" /> <!-- 微信 -->
<!-- Since JCore2.0.0 Required SDK核心功能-->
<!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false -->
diff --git a/app/src/main/java/com/zhaoyang/driver/bean/AllIncomeDetailBean.java b/app/src/main/java/com/zhaoyang/driver/bean/AllIncomeDetailBean.java
index 180d7ea..a11125d 100644
--- a/app/src/main/java/com/zhaoyang/driver/bean/AllIncomeDetailBean.java
+++ b/app/src/main/java/com/zhaoyang/driver/bean/AllIncomeDetailBean.java
@@ -61,6 +61,7 @@
private double lon;
private int minute;
private String name;
+ public String remark;
private int number;
private DateBeanDetail data;
diff --git a/app/src/main/java/com/zhaoyang/driver/bean/CardListBean.java b/app/src/main/java/com/zhaoyang/driver/bean/CardListBean.java
index 9bcde0c..35a8de6 100644
--- a/app/src/main/java/com/zhaoyang/driver/bean/CardListBean.java
+++ b/app/src/main/java/com/zhaoyang/driver/bean/CardListBean.java
@@ -57,6 +57,8 @@
private int id;
private String insertTime;
private String name;
+ public String userName;
+ public String account;
private String bankName;
public String getBankName() {
diff --git a/app/src/main/java/com/zhaoyang/driver/bean/DelMoneyDetailBean.java b/app/src/main/java/com/zhaoyang/driver/bean/DelMoneyDetailBean.java
index c86594a..706bddf 100644
--- a/app/src/main/java/com/zhaoyang/driver/bean/DelMoneyDetailBean.java
+++ b/app/src/main/java/com/zhaoyang/driver/bean/DelMoneyDetailBean.java
@@ -59,6 +59,7 @@
private int lon;
private int minute;
private String name;
+ public String remark;
private int number;
public double getAmount() {
diff --git a/app/src/main/java/com/zhaoyang/driver/bean/MajorMoneyBean.java b/app/src/main/java/com/zhaoyang/driver/bean/MajorMoneyBean.java
index 584fdbd..4cdc857 100644
--- a/app/src/main/java/com/zhaoyang/driver/bean/MajorMoneyBean.java
+++ b/app/src/main/java/com/zhaoyang/driver/bean/MajorMoneyBean.java
@@ -69,6 +69,8 @@
private double mileage;
private double duration;
private double longDistance;
+ public int isException;
+ public double estimatedPrice;
public double getWait() {
return wait;
diff --git a/app/src/main/java/com/zhaoyang/driver/bean/OrderListBean.java b/app/src/main/java/com/zhaoyang/driver/bean/OrderListBean.java
index 8e92abb..a72810c 100644
--- a/app/src/main/java/com/zhaoyang/driver/bean/OrderListBean.java
+++ b/app/src/main/java/com/zhaoyang/driver/bean/OrderListBean.java
@@ -62,6 +62,7 @@
private String peopleNumber;
private String cargoNumber;
private String user;
+ public int reservation;
public String getUser() {
return user;
diff --git a/app/src/main/java/com/zhaoyang/driver/netUtls/Api.java b/app/src/main/java/com/zhaoyang/driver/netUtls/Api.java
index adbf84e..96291cc 100644
--- a/app/src/main/java/com/zhaoyang/driver/netUtls/Api.java
+++ b/app/src/main/java/com/zhaoyang/driver/netUtls/Api.java
@@ -10,11 +10,11 @@
//39.108.148.228 测试服务器
public static final String BASE_URL = "https://www.zycx.ztrbkj.com/driver/";
-// public static final String BASE_URL = "http://192.168.110.34:81/driver/";
+// public static final String BASE_URL = "http://221.182.45.100:8899/driver-server/";
- public static final String SOCKET_SERVER = "47.108.137.172";
-// public static final String SOCKET_SERVER = "192.168.110.34";
- public static final int SOCKET_PORT = 8888;
+ public static final String SOCKET_SERVER = "47.108.137.172";
+// public static final String SOCKET_SERVER = "221.182.45.100";
+ public static final int SOCKET_PORT = 8889;
public static final int SUCCESS = 200;
public static final String strShare = "https://www.zycx.ztrbkj.com/share/shareIndex.html";
@@ -99,7 +99,7 @@
public static String queryNewData = "api/version/queryNewData"; //api/version/queryNewData 获取最新版本数据
public static String updatePhone = "api/driver/updatePhone"; //api/driver/updatePhone 修改手机号码
public static String updatePassword = "api/driver/updatePassword"; //api/driver/updatePassword 修改密码
- public static String withdrawal = "api/withdrawal/withdrawal"; //api/withdrawal/withdrawal 账户余额提现
+ public static String withdrawal = "api/driverAlipay/api/withdrawal/aliWithdrawal"; //api/withdrawal/withdrawal 账户余额提现
public static String queryActivityIncome = "api/driver/queryActivityIncome"; //api/driver/queryActivityIncome 获取收益明细 (我的奖励)
public static String queryWithdrawal = "api/withdrawal/queryWithdrawal"; //api/withdrawal/queryWithdrawal 获取历史提现数据
public static String queryTotalRevenue = "api/driver/queryTotalRevenue"; //api/driver/queryTotalRevenue 获取收入明细
@@ -117,10 +117,10 @@
/***
* card
*/
- public static String queryBankCard = "api/bankCard/queryBankCard"; ///api/bankCard/queryBankCard 获取银行卡号列表
- public static String delBankCard = "api/bankCard/delBankCard"; ///api/bankCard/delBankCard删除银行卡信心
- public static String saveBankCard = "api/bankCard/saveBankCard"; //api/bankCard/saveBankCard 保存银行卡信息
- public static String updateBankCard = "api/bankCard/updateBankCard"; ///api/bankCard/updateBankCard 保存银行卡信息
+ public static String queryBankCard = "api/driverAlipay/queryAlipay"; ///api/bankCard/queryBankCard 获取银行卡号列表
+ public static String delBankCard = "api/driverAlipay/delAlipay"; ///api/bankCard/delBankCard删除银行卡信心
+ public static String saveBankCard = "api/driverAlipay/saveAlipay"; //api/bankCard/saveBankCard 保存银行卡信息
+ public static String updateBankCard = "api/driverAlipay/updateAlipay"; ///api/bankCard/updateBankCard 保存银行卡信息
public static String verificationPassword = "api/driver/verificationPassword"; ///api/driver/verificationPassword 验证登录密码是否有效
public static String verificationWithdrawPassword = "api/driver/verificationWithdrawPassword"; ///api/driver/verificationWithdrawPassword 验证提现密码是否有效
@@ -143,4 +143,6 @@
public static String makeUpTheDifference = "api/order/makeUpTheDifference"; ///api/order/makeUpTheDifference 设置小件物流差价
public static String sendVerificationCode = "api/order/sendVerificationCode"; ///sendVerificationCode
+ public static String updatePrice = "api/order/updatePrice"; ///sendVerificationCode
+
}
diff --git a/app/src/main/java/com/zhaoyang/driver/netUtls/HttpManager.java b/app/src/main/java/com/zhaoyang/driver/netUtls/HttpManager.java
index c7a1bc0..17011f5 100644
--- a/app/src/main/java/com/zhaoyang/driver/netUtls/HttpManager.java
+++ b/app/src/main/java/com/zhaoyang/driver/netUtls/HttpManager.java
@@ -186,7 +186,7 @@
Map<String, Object> par = new HashMap<>();
ApiServics jsonService = initBaseData(action).create(ApiServics.class);
- LogUtils.d("post", params.toString());
+ LogUtils.d("post", action+"====>"+params.toString());
jsonService.postResult(action,headerParams, params)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/adapter/AllIncomeDetailAdapter.kt b/app/src/main/java/com/zhaoyang/driver/ui/adapter/AllIncomeDetailAdapter.kt
index 98a95c7..3ef8d0c 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/adapter/AllIncomeDetailAdapter.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/adapter/AllIncomeDetailAdapter.kt
@@ -25,17 +25,27 @@
it.itemView.tv_lu_money.text = item.data.roadTollMoney.toString()
it.itemView.tv_type.text = item.name.toString()
if (item.data.parkMoney == 0.0) it.itemView.ll_stop_car_money.gone() else it.itemView.ll_stop_car_money.visible()
- if (item.data.travelMoney == 0.0) it.itemView.ll_car_money.gone() else it.itemView.ll_car_money.visible()
+ if (item.data.travelMoney == 0.0&&item.name != "平台充值") it.itemView.ll_car_money.gone() else it.itemView.ll_car_money.visible()
if (item.data.rakeMoney == 0.0) it.itemView.ll_rank_money.gone() else it.itemView.ll_rank_money.visible()
if (item.data.tipMoney == 0.0) it.itemView.ll_use_money.gone() else it.itemView.ll_use_money.visible()
if (item.data.roadTollMoney == 0.0) it.itemView.ll_lu_money.gone() else it.itemView.ll_lu_money.visible()
if (item.name == "同城小件物流" || item.name == "跨城小件物流"){
it.itemView.tv_car_money_name.text = "物流费用"
it.itemView.tv_small_money.text = "加急费用"
+ }else if (item.name == "平台充值"){
+ it.itemView.tv_car_money_name.text = item.name
+ it.itemView.tv_car_money.text = item.amount.toString()
}else{
it.itemView.tv_car_money_name.text = "车费"
it.itemView.tv_small_money.text = "小费"
}
+
+ if (item.remark.isNullOrEmpty())
+ it.itemView.tv_remark.gone()
+ else{
+ it.itemView.tv_remark.visible()
+ it.itemView.tv_remark.text = "备注：${item.remark}"
+ }
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListAdapter.kt b/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListAdapter.kt
index 8414447..8967832 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListAdapter.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListAdapter.kt
@@ -2,6 +2,7 @@
import android.view.View
import cn.sinata.xldutils.utils.DialogUtils
+import cn.sinata.xldutils.utils.StringUtils
import cn.sinata.xldutils.utils.clickDelay
import com.zhaoyang.driver.R
import com.zhaoyang.driver.base.BaseRvAdapter
@@ -22,10 +23,10 @@
override fun onBindItem(holder: BaseViewHolder?, view: View?, item: CardListBean.DataBean?) {
holder?.let {
- it.itemView.tv_card_name.text = item!!.bank
- it.itemView.tv_card_num.text = item.code
+ it.itemView.tv_card_name.text = item!!.userName.substring(0,1)+"${if (item.userName.length == 2) "*" else "**"}"
+ it.itemView.tv_card_num.text = StringUtils.hidePhoneNumber(item.account)
it.itemView.btn_delete.clickDelay {
- DialogUtil.getDelAndSureDialog(context,"是否删除此银行卡",{}){
+ DialogUtil.getDelAndSureDialog(context,"是否删除此账号",{}){
var map = getMapByAny()
map["id"] = item.id
callNet(context, Api.delBankCard,map){
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListPopAdapter.kt b/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListPopAdapter.kt
index 8ee9c57..b5e0302 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListPopAdapter.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/adapter/CardListPopAdapter.kt
@@ -1,6 +1,7 @@
package com.zhaoyang.driver.ui.adapter
import android.view.View
+import cn.sinata.xldutils.utils.StringUtils
import com.zhaoyang.driver.R
import com.zhaoyang.driver.base.BaseRvAdapter
import com.zhaoyang.driver.base.BaseViewHolder
@@ -14,8 +15,8 @@
override fun onBindItem(holder: BaseViewHolder?, view: View?, item: CardListBean.DataBean?) {
holder?.let {
- it.itemView.tv_card_name.text = item!!.bank
- it.itemView.tv_card_num.text = item.code
+ it.itemView.tv_card_name.text = item!!.userName.substring(0,1)+"${if (item.userName.length == 2) "*" else "**"}"
+ it.itemView.tv_card_num.text = StringUtils.hidePhoneNumber(item.account)
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/adapter/DelMoneyDetailAdapter.kt b/app/src/main/java/com/zhaoyang/driver/ui/adapter/DelMoneyDetailAdapter.kt
index 49c1c78..d54d2d5 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/adapter/DelMoneyDetailAdapter.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/adapter/DelMoneyDetailAdapter.kt
@@ -2,6 +2,8 @@
import android.view.View
import cn.sinata.xldutils.utils.doubleTwo
+import cn.sinata.xldutils.utils.gone
+import cn.sinata.xldutils.utils.visible
import com.zhaoyang.driver.R
import com.zhaoyang.driver.base.BaseRvAdapter
import com.zhaoyang.driver.base.BaseViewHolder
@@ -18,6 +20,12 @@
it.itemView.tv_del_money.text = "¥"+ doubleTwo(item!!.amount)
it.itemView.tv_time.text = item.day
it.itemView.tv_type.text = item.name
+ if (item.remark.isNullOrEmpty())
+ it.itemView.tv_remark.gone()
+ else{
+ it.itemView.tv_remark.visible()
+ it.itemView.tv_remark.text = "备注：${item.remark}"
+ }
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/adapter/MainAdapter.kt b/app/src/main/java/com/zhaoyang/driver/ui/adapter/MainAdapter.kt
index 929879f..79c3301 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/adapter/MainAdapter.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/adapter/MainAdapter.kt
@@ -136,6 +136,13 @@
it.itemView.tv_statue.textColor(context,R.color.gray_93)
}
}
+
+ if (item.reservation == 2 && item.state == 2) { //预约单待出发需要标红
+ it.itemView.view_reserve.visible()
+ it.itemView.tv_statue.textColor(context,R.color.end_red)
+ }else
+ it.itemView.view_reserve.gone()
+
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/card/AddCardActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/card/AddCardActivity.kt
index 6bb0f05..dc1cdf0 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/card/AddCardActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/card/AddCardActivity.kt
@@ -29,93 +29,35 @@
}
override fun initView() {
- setTitleText("添加银行卡")
+ setTitleText("添加支付宝账号")
if (data != null){
- setTitleText("修改银行卡")
+ setTitleText("修改支付宝账号")
setInfo(data as CardListBean.DataBean)
}
}
private fun setInfo(dataBean: CardListBean.DataBean) {
- tv_card_site.gone()
- et_card_name.setText(dataBean.name)
- et_card_num.setText(dataBean.code)
- et_card_bank_name.setText(dataBean.bankName)
+ et_card_name.setText(dataBean.userName)
+ et_card_num.setText(dataBean.account)
tv_add_card.text = "修改"
id = dataBean.id.toString()
- cardName = dataBean.bank
}
- var cardName = ""
override fun setOnclick() {
- tv_card_site.clickDelay {
- var pop = DialogUtil.getPopupwindow(this,R.layout.pop_card_list)
- pop.contentView.rl_container.clickDelay {
- pop.dismiss()
- }
- pop.contentView.tv_car_info.clickDelay {
- tv_card_site.text = pop.contentView.tv_car_info.text.toString()
- cardName = pop.contentView.tv_car_info.text.toString()
- pop.dismiss()
- }
-
- pop.contentView.tv_car_info_ny.clickDelay {
- tv_card_site.text = pop.contentView.tv_car_info_ny.text.toString()
- cardName = pop.contentView.tv_car_info_ny.text.toString()
- pop.dismiss()
- }
- pop.contentView.tv_car_info_zg.clickDelay {
- tv_card_site.text = pop.contentView.tv_car_info_zg.text.toString()
- cardName = pop.contentView.tv_car_info_zg.text.toString()
- pop.dismiss()
- }
- pop.contentView.tv_car_info_js.clickDelay {
- tv_card_site.text = pop.contentView.tv_car_info_js.text.toString()
- cardName = pop.contentView.tv_car_info_js.text.toString()
- pop.dismiss()
- }
- pop.contentView.tv_car_info_yz.clickDelay {
- tv_card_site.text = pop.contentView.tv_car_info_yz.text.toString()
- cardName = pop.contentView.tv_car_info_yz.text.toString()
- pop.dismiss()
- }
- pop.contentView.tv_car_info_quit.clickDelay {
- tv_card_site.text = pop.contentView.tv_car_info_quit.text.toString()
- cardName = pop.contentView.tv_car_info_quit.text.toString()
- pop.dismiss()
- }
- pop.showDown(window.decorView)
- }
-
-
tv_add_card.clickDelay {
if (et_card_name.getContent().isEmpty()){
toast("请输入姓名")
return@clickDelay
}
if (et_card_num.getContent().isEmpty()){
- toast("请输入银行卡号码")
- return@clickDelay
- }
- if (!PhoneCheckUtil.checkBankCard(et_card_num.getContent().trim())){
- toast("银行卡号码错误")
- return@clickDelay
- }
- if (cardName.isEmpty()){
- toast("请选择银行卡")
- return@clickDelay
- }
- if (et_card_bank_name.getContent().isEmpty()){
- toast("请填写开户行名称")
+ toast("请输入支付宝账号")
return@clickDelay
}
var map = getMapByAny()
- map["bank"] = cardName
- map["code"] = et_card_num.getContent()
- map["name"] = et_card_name.getContent()
- map["bankName"] = et_card_bank_name.getContent()
+ map["account"] = et_card_num.getContent()
+ map["userName"] = et_card_name.getContent()
var url = Api.saveBankCard
if (data != null){
map["id"] = id
@@ -123,7 +65,7 @@
}
callNet(url,map){
onBackPressed()
- toast("成功")
+ toast("保存成功")
}
}
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/card/CardListActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/card/CardListActivity.kt
index c9efda0..717e200 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/card/CardListActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/card/CardListActivity.kt
@@ -17,7 +17,7 @@
}
override fun initView() {
- setTitleText("银行卡")
+ setTitleText("支付宝提现设置")
addFragment(carListFragment,R.id.fl_container)
}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/card/VerifyCardPwdActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/card/VerifyCardPwdActivity.kt
index 6355d28..4db8917 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/card/VerifyCardPwdActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/card/VerifyCardPwdActivity.kt
@@ -24,7 +24,7 @@
override fun initView() {
if (data != null){
- tv_tltle_s.text = "修改银行卡"
+ tv_tltle_s.text = "修改支付宝账号"
}
setTitleText("")
setBottomShow(false)
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/main/GetOrderFragment.kt b/app/src/main/java/com/zhaoyang/driver/ui/main/GetOrderFragment.kt
index 53f7605..f7cf555 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/main/GetOrderFragment.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/main/GetOrderFragment.kt
@@ -1,5 +1,6 @@
package com.zhaoyang.driver.ui.main
+import android.graphics.Color
import android.os.Bundle
import android.os.CountDownTimer
import android.view.View
@@ -115,6 +116,10 @@
callNet(this, Api.queryPushOrder, map) {
val data = Gson().fromJson<OrderBean>(it, OrderBean::class.java).data
sysErr(data)
+ if (data.reservation == 2){
+ rl_top.setBackgroundResource(R.drawable.car_get_top_red)
+ tv_reassign.setTextColor(Color.parseColor("#D42A23"))
+ }
val startView = createView(R.layout.item_map_market, this)
val endView = createView(R.layout.item_map_market, this)
startView.iv_img.setImageResource(R.mipmap.starting_point)
@@ -199,26 +204,27 @@
callNet(this, Api.grabOrder, map) {
Toast.create(this).show("抢单成功")
onBackPressed()
- when (orderType) {
- "2" -> {
- this.startActivity<TripActivity>("orderId" to orderId, "orderType" to orderType)
+ if (MyApplication.currentOrderId.isEmpty()) //判断上一单是否结束
+ when (orderType) {
+ "2" -> {
+ this.startActivity<TripActivity>("orderId" to orderId, "orderType" to orderType)
+ }
+ "1" -> {
+ this.startActivity<TripActivity>("orderId" to orderId, "orderType" to orderType)
+ }
+ "3" -> {
+ this.startActivity<TripCityActivity>(
+ "orderId" to orderId,
+ "orderType" to orderType
+ )
+ }
+ "4","5" -> {
+ this.startActivity<SmallCargoActivity>(
+ "orderId" to orderId,
+ "orderType" to orderType
+ )
+ }
}
- "1" -> {
- this.startActivity<TripActivity>("orderId" to orderId, "orderType" to orderType)
- }
- "3" -> {
- this.startActivity<TripCityActivity>(
- "orderId" to orderId,
- "orderType" to orderType
- )
- }
- "4","5" -> {
- this.startActivity<SmallCargoActivity>(
- "orderId" to orderId,
- "orderType" to orderType
- )
- }
- }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/main/major/InputPriceActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/main/major/InputPriceActivity.kt
new file mode 100644
index 0000000..73d7fbf
--- /dev/null
+++ b/app/src/main/java/com/zhaoyang/driver/ui/main/major/InputPriceActivity.kt
@@ -0,0 +1,97 @@
+package com.zhaoyang.driver.ui.main.major
+
+import cn.sinata.xldutils.utils.callPhone
+import cn.sinata.xldutils.utils.clickDelay
+import cn.sinata.xldutils.utils.gone
+import cn.sinata.xldutils.utils.visible
+import com.zhaoyang.driver.R
+import com.zhaoyang.driver.base.MyApplication
+import com.zhaoyang.driver.base.MyBaseActivity
+import com.zhaoyang.driver.bean.PhoneCheckBean
+import com.zhaoyang.driver.netUtls.Api
+import com.zhaoyang.driver.netUtls.callNet
+import com.zhaoyang.driver.netUtls.getMapByAny
+import kotlinx.android.synthetic.main.activity_input_price.*
+import org.jetbrains.anko.toast
+import java.lang.Exception
+
+class InputPriceActivity : MyBaseActivity() {
+ override fun setContentView() {
+ setContentView(R.layout.activity_input_price)
+ }
+
+ val orderType by lazy {
+ intent.getStringExtra("orderType")
+ }
+
+ val orderId by lazy {
+ intent.getStringExtra("orderId")
+ }
+
+ val estimatedPrice by lazy {
+ intent.getDoubleExtra("estimatedPrice",0.0)
+ }
+
+ override fun initView() {
+ setTitleText("确认费用")
+ rb_order.text = "按预估费(￥%.2f)".format(estimatedPrice)
+ tv_money.text = "￥%.2f".format(estimatedPrice)
+ var map = getMapByAny()
+ map["code"] = MyApplication.aMapLocation?.adCode
+ callNet(Api.queryCustomerPhone,map){
+ var bean = gson.fromJson<PhoneCheckBean>(it, PhoneCheckBean::class.java)
+ tv_phone.text = "费用将由平台确认，如需加急请拨打：${bean.data.platform}"
+ }
+ }
+
+ override fun setOnclick() {
+ rg_type.setOnCheckedChangeListener { group, checkedId ->
+ if (checkedId == R.id.rb_order){
+ tv_money.visible()
+ tv_1.visible()
+ et_price.gone()
+ }else{
+ tv_money.gone()
+ tv_1.gone()
+ et_price.visible()
+ }
+ }
+
+ tv_login.clickDelay {
+ var d = 0.0
+ if (rb_input.isChecked){
+ val s = et_price.text.toString()
+ if (s.isNullOrEmpty()){
+ toast("请输入收费金额")
+ return@clickDelay
+ }
+ try {
+ d = s.toDouble()
+ if (d == 0.0){
+ toast("金额不能为0")
+ return@clickDelay
+ }
+ }catch (e:Exception){
+ toast("请输入正确的金额")
+ return@clickDelay
+ }
+ }
+ confirmPrice(d)
+ }
+
+ }
+
+ private fun confirmPrice(d:Double){
+ var map = getMapByAny()
+ map["orderId"] = orderId
+ map["orderType"] = orderType
+ map["priceType"] = if (rb_input.isChecked) 3 else 2
+ map["updatePrice"] = if (rb_input.isChecked) d else estimatedPrice
+ callNet(Api.updatePrice,map){
+ toast("提交成功，等待平台审核")
+ setResult(RESULT_OK)
+ finish()
+ }
+ }
+
+}
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/main/major/MajorSureMoneyActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/main/major/MajorSureMoneyActivity.kt
index 2aae749..90fcc93 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/main/major/MajorSureMoneyActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/main/major/MajorSureMoneyActivity.kt
@@ -1,7 +1,9 @@
package com.zhaoyang.driver.ui.main.major
+import android.content.Intent
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getContent
+import cn.sinata.xldutils.utils.visible
import com.zhaoyang.driver.R
import com.zhaoyang.driver.base.BaseEvent
import com.zhaoyang.driver.base.MyBaseActivity
@@ -13,6 +15,7 @@
import kotlinx.android.synthetic.main.activity_sure_money.*
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
+import org.jetbrains.anko.startActivityForResult
class MajorSureMoneyActivity :MyBaseActivity(){
@@ -55,6 +58,12 @@
tv_long_distance_name.text = "远途费（"+it.data.longDistance+"）公里"
tv_long_distance_money.text = it.data.longDistanceMoney.toString()+"元"
tv_all_money.text = "￥"+it.data.orderMoney.toString()+""
+ if (it.data.isException == 1){
+ tv_error.visible()
+ tv_error.clickDelay {
+ startActivityForResult<InputPriceActivity>(1,"orderId" to orderId,"orderType" to orderType,"estimatedPrice" to it.data.estimatedPrice)
+ }
+ }
}
}
@@ -85,4 +94,11 @@
}
}
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ if (resultCode == RESULT_OK){
+ EventBus.getDefault().post(BaseEvent(BaseEvent.BACK_CAR_OVER))
+ finish()
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/AllIncomeDetailActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/AllIncomeDetailActivity.kt
index 58e5cfe..35f8501 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/AllIncomeDetailActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/AllIncomeDetailActivity.kt
@@ -40,7 +40,7 @@
private fun showUI() {
tv_money.text = "¥"+ getFormatTwo(CacheKey.getUserInfo().laveBusinessMoney)
- tv_all_money.text = "历史总收益：¥"+ getFormatTwo(CacheKey.getUserInfo().businessMoney)
+ tv_all_money.text = "¥"+ getFormatTwo(CacheKey.getUserInfo().businessMoney)
tv_money_next_week.text = "¥"+ getFormatTwo(CacheKey.getUserInfo().laveBusinessNextWeekMoney)
tv_money_all.text = "¥"+getFormatTwo(CacheKey.getUserInfo().laveBusinessMoney + CacheKey.getUserInfo().laveBusinessNextWeekMoney)
diff --git a/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/ApplyMoneyActivity.kt b/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/ApplyMoneyActivity.kt
index 16e2d2b..218a309 100644
--- a/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/ApplyMoneyActivity.kt
+++ b/app/src/main/java/com/zhaoyang/driver/ui/mine/money_bag/ApplyMoneyActivity.kt
@@ -3,6 +3,7 @@
import android.text.InputFilter
import android.text.Spanned
import androidx.recyclerview.widget.LinearLayoutManager
+import cn.sinata.xldutils.utils.StringUtils
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getContent
import com.zhaoyang.driver.R
@@ -66,29 +67,27 @@
override fun setOnclick() {
tv_get_money.clickDelay {
-// if (et_money.getContent().isEmpty()){
-// toast("请输入提现金额")
-// return@clickDelay
-// }
-// if (et_money.getContent().toDouble() > maxMoney){
-// toast("提现金额不能超过最大余额")
-// return@clickDelay
-// }
+ if (et_money.getContent().isEmpty()){
+ toast("请输入提现金额")
+ return@clickDelay
+ }
+ if (et_money.getContent().toDouble() > maxMoney){
+ toast("提现金额不能超过最大余额")
+ return@clickDelay
+ }
if (bankBean == null){
- toast("请选择银行卡")
+ toast("请选择到账支付宝")
return@clickDelay
}
if (maxMoney <= 0){
toast("没有余额")
return@clickDelay
}
- DialogUtil.getDelAndSureDialog(this,"您将提取金额为"+maxMoney.toString()+"元!",{}){
+ DialogUtil.getDelAndSureDialog(this,"您将提取金额为%.2f元!".format(et_money.text.toString().toDouble()),{}){
var map = getMapByAny()
- map["code"] = bankBean!!.code
- map["money"] = maxMoney
- map["name"] = bankBean!!.name
+ map["id"] = bankBean!!.id
+ map["money"] = et_money.text.toString().toDouble()
map["type"] = type
- map["bankName"] = bankBean!!.bankName
callNet(Api.withdrawal,map){
DialogUtil.getOnlySureDialog(this, "提交成功！我们将尽快为您处理！") {
onBackPressed()
@@ -122,11 +121,11 @@
adapter.notifyDataSetChanged()
if (adapter.data.isNullOrEmpty()){
pop.dismiss()
- toast("暂未绑定银行卡，请前往绑定银行卡")
+ toast("暂未查询到支付宝账号，请前往设置")
}
adapter.setOnItemClickListener { view, position ->
bankBean = adapter.data[position]
- tv_select_card.text = adapter.data[position].bank
+ tv_select_card.text ="${bankBean!!.userName.substring(0,1)}${if (bankBean!!.userName.length == 2) "*" else "**"} ${StringUtils.hidePhoneNumber(bankBean!!.account)}"
pop.dismiss()
}
}){
diff --git a/app/src/main/res/color/selector_blue_grey_check.xml b/app/src/main/res/color/selector_blue_grey_check.xml
new file mode 100644
index 0000000..f1ef72f
--- /dev/null
+++ b/app/src/main/res/color/selector_blue_grey_check.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/main_blue" android:state_checked="true"/>
+ <item android:color="@color/textColorHint" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_black_alpha20_4.xml b/app/src/main/res/drawable/bg_black_alpha20_4.xml
new file mode 100644
index 0000000..bd5a9c9
--- /dev/null
+++ b/app/src/main/res/drawable/bg_black_alpha20_4.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="4dp"/>
+ <solid android:color="@color/black3"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_reserve.xml b/app/src/main/res/drawable/bg_reserve.xml
new file mode 100644
index 0000000..1a029c8
--- /dev/null
+++ b/app/src/main/res/drawable/bg_reserve.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:topRightRadius="4dp" android:topLeftRadius="4dp"/>
+ <gradient android:startColor="#FFFFB6B2" android:endColor="#00ffffff" android:angle="270"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/car_get_top_red.xml b/app/src/main/res/drawable/car_get_top_red.xml
new file mode 100644
index 0000000..fe92779
--- /dev/null
+++ b/app/src/main/res/drawable/car_get_top_red.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:topRightRadius="4dp" android:topLeftRadius="4dp"/>
+ <gradient android:startColor="#CC201C" android:endColor="#FB7973" android:angle="270"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_card.xml b/app/src/main/res/layout/activity_add_card.xml
index 6533393..4c6de89 100644
--- a/app/src/main/res/layout/activity_add_card.xml
+++ b/app/src/main/res/layout/activity_add_card.xml
@@ -2,86 +2,63 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:orientation="vertical"
- android:layout_height="wrap_content">
+ android:background="@color/bg_main"
+ android:layout_height="match_parent">
- <TextView
- android:id="@+id/tv_card_site"
+ <LinearLayout
android:layout_width="match_parent"
- android:drawableEnd="@mipmap/more_black"
- android:layout_height="45dp"
- android:hint="请选择开户行"
android:background="@color/white"
- android:gravity="center_vertical"
- android:paddingStart="14dp"
- android:paddingEnd="14dp"
- android:textColor="#ff333333"
- android:textSize="15sp" />
+ android:orientation="vertical"
+ android:layout_height="wrap_content">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="姓名"
+ android:textColor="#ff333333"
+ android:layout_marginTop="14dp"
+ android:textStyle="bold"
+ android:layout_marginStart="14dp"
+ android:textSize="14sp" />
+ <EditText
+ android:id="@+id/et_card_name"
+ android:layout_width="match_parent"
+ android:layout_height="45dp"
+ android:hint="请输入"
+ android:gravity="center_vertical"
+ android:background="@color/white"
+ android:paddingStart="14dp"
+ android:paddingEnd="14dp"
+ android:textColor="#ff333333"
+ android:textSize="14sp" />
- <include layout="@layout/include_line_left_14"/>
+ <include layout="@layout/include_line_left_14"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="支付宝账号"
+ android:textColor="#ff333333"
+ android:layout_marginTop="10dp"
+ android:textStyle="bold"
+ android:layout_marginStart="14dp"
+ android:textSize="14sp" />
- <EditText
- android:id="@+id/et_card_name"
- android:layout_width="match_parent"
- android:layout_height="45dp"
- android:hint="开户人姓名"
- android:gravity="center_vertical"
- android:background="@color/white"
- android:paddingStart="14dp"
- android:paddingEnd="14dp"
- android:textColor="#ff333333"
- android:textSize="15sp" />
+ <EditText
+ android:id="@+id/et_card_num"
+ android:layout_width="match_parent"
+ android:layout_height="45dp"
+ android:hint="请输入"
+ android:gravity="center_vertical"
+ android:paddingStart="14dp"
+ android:paddingEnd="14dp"
+ android:background="@color/white"
+ android:textColor="#ff333333"
+ android:textSize="14sp" />
+ <include layout="@layout/include_line_left_14"/>
- <include layout="@layout/include_line_left_14"/>
-
-
- <EditText
- android:id="@+id/et_card_num"
- android:layout_width="match_parent"
- android:layout_height="45dp"
- android:hint="银行卡号"
- android:gravity="center_vertical"
- android:paddingStart="14dp"
- android:paddingEnd="14dp"
- android:background="@color/white"
- android:textColor="#ff333333"
- android:textSize="15sp" />
-
- <include layout="@layout/include_line_left_14"/>
-
- <EditText
- android:id="@+id/et_card_bank_name"
- android:layout_width="match_parent"
- android:layout_height="45dp"
- android:hint="开户行名称"
- android:gravity="center_vertical"
- android:paddingStart="14dp"
- android:paddingEnd="14dp"
- android:background="@color/white"
- android:textColor="#ff333333"
- android:textSize="15sp" />
-
-
-
- <include layout="@layout/include_line_left_14"/>
-
- <TextView
- android:layout_marginTop="20dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingStart="14dp"
- android:paddingEnd="14dp"
- android:text="开户行信息需要正确填写，否则无法提现， 查询开户行方法如下：
-\n 1、拨打银行卡的背面的客服电话，根据语音提示查询。
-\n 2、携带身份证和银行卡到银行卡所属银行柜台查询。
-\n 3、登陆所属银行手机银行查询。
-\n 4、登陆网上银行查询。"
- android:textColor="#ff333333"
- android:textSize="15sp" />
-
+ </LinearLayout>
<include layout="@layout/include_weight_height"/>
@@ -95,7 +72,7 @@
android:layout_marginBottom="14dp"
android:background="@drawable/bg_login"
android:gravity="center"
- android:text="添加"
+ android:text="保存"
android:textColor="#ffffffff"
android:textSize="14sp" />
diff --git a/app/src/main/res/layout/activity_all_detail_income.xml b/app/src/main/res/layout/activity_all_detail_income.xml
index 4af3a35..d5e89e3 100644
--- a/app/src/main/res/layout/activity_all_detail_income.xml
+++ b/app/src/main/res/layout/activity_all_detail_income.xml
@@ -56,7 +56,7 @@
android:singleLine="true"
android:text="提现记录"
android:textColor="@color/white"
- android:textSize="16sp"
+ android:textSize="14sp"
android:textStyle="bold" />
@@ -81,7 +81,7 @@
android:text="余额"
android:layout_marginTop="10dp"
android:textColor="#ffffffff"
- android:textSize="14sp"
+ android:textSize="12sp"
/>
<TextView
@@ -108,7 +108,7 @@
android:text="当前可提现"
android:layout_marginTop="10dp"
android:textColor="#ffffffff"
- android:textSize="14sp"
+ android:textSize="12sp"
/>
<TextView
@@ -135,7 +135,7 @@
android:text="下周期可提现"
android:layout_marginTop="10dp"
android:textColor="#ffffffff"
- android:textSize="14sp"
+ android:textSize="12sp"
/>
<TextView
@@ -152,19 +152,34 @@
</LinearLayout>
-
- <TextView
- android:id="@+id/tv_all_money"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="历史总收益：¥"
- android:layout_alignParentEnd="true"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_marginBottom="10dp"
- android:layout_marginEnd="10dp"
- android:textColor="@color/white"
- android:textSize="16sp"
- android:textStyle="bold" />
+ android:background="@drawable/bg_black_alpha20_4"
+ android:paddingHorizontal="14dp"
+ android:gravity="center_vertical"
+ android:layout_marginHorizontal="14dp"
+ android:layout_height="36dp">
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="历史总收益"
+ android:layout_weight="1"
+ android:textColor="@color/white"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+
+ <TextView
+ android:id="@+id/tv_all_money"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="¥0.0"
+ android:layout_alignParentEnd="true"
+ android:textColor="@color/white"
+ android:textSize="12sp"
+ android:textStyle="bold" />
+ </LinearLayout>
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_apply_money.xml b/app/src/main/res/layout/activity_apply_money.xml
index 585e766..266f9a1 100644
--- a/app/src/main/res/layout/activity_apply_money.xml
+++ b/app/src/main/res/layout/activity_apply_money.xml
@@ -11,24 +11,26 @@
android:background="@color/white">
<TextView
+ android:id="@+id/tv_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="14dp"
- android:text="到账银行卡"
+ android:text="到账支付宝"
android:textColor="#ff333333"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_select_card"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
+ android:layout_toEndOf="@id/tv_1"
android:layout_marginEnd="14dp"
+ android:gravity="end"
android:drawableEnd="@mipmap/more_black"
android:drawablePadding="10dp"
- android:hint="选择银行卡"
+ android:hint="选择支付宝账号"
android:textColor="#ff333333"
android:textSize="14sp"
android:textStyle="bold" />
@@ -102,7 +104,6 @@
<include layout="@layout/include_line_14" />
<LinearLayout
- android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
diff --git a/app/src/main/res/layout/activity_input_price.xml b/app/src/main/res/layout/activity_input_price.xml
new file mode 100644
index 0000000..79472be
--- /dev/null
+++ b/app/src/main/res/layout/activity_input_price.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/bg_main"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <RadioGroup
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:id="@+id/rg_type"
+ android:background="@color/white"
+ app:layout_constraintTop_toTopOf="parent"
+ android:orientation="horizontal">
+ <RadioButton
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:id="@+id/rb_order"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:button="@null"
+ android:textSize="13sp"
+ android:checked="true"
+ android:textColor="@color/selector_blue_grey_check"
+ android:text="按预估费(￥88.8)"/>
+ <RadioButton
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:id="@+id/rb_input"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:button="@null"
+ android:textSize="13sp"
+ android:textColor="@color/selector_blue_grey_check"
+ android:text="手动录入"/>
+ </RadioGroup>
+
+ <TextView
+ android:id="@+id/tv_login"
+ android:layout_width="match_parent"
+ android:text="确认费用并发送"
+ android:textColor="#ffffffff"
+ android:gravity="center"
+ android:layout_marginBottom="14dp"
+ android:layout_marginStart="14dp"
+ android:layout_marginEnd="14dp"
+ android:background="@drawable/bg_login"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:textSize="14sp"
+ android:layout_height="40dp"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_1"
+ android:text="订单金额"
+ app:layout_constraintTop_toBottomOf="@id/rg_type"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="50dp"
+ android:textColor="@color/textColor"
+ android:textSize="15sp"
+ android:textStyle="bold"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_money"
+ app:layout_constraintTop_toBottomOf="@id/tv_1"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="11dp"
+ android:textStyle="bold"
+ android:textSize="35sp"
+ android:textColor="@color/end_red"
+ android:text="￥0.00"/>
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:id="@+id/et_price"
+ app:layout_constraintTop_toBottomOf="@id/rg_type"
+ android:layout_marginTop="65dp"
+ android:background="@drawable/bg_white_10"
+ android:layout_marginHorizontal="14dp"
+ android:paddingHorizontal="20dp"
+ android:gravity="center_vertical"
+ android:textSize="14sp"
+ android:singleLine="true"
+ android:inputType="numberDecimal"
+ android:visibility="gone"
+ android:textColor="@color/textColor"
+ android:hint="请输入本次收费金额"/>
+ <androidx.constraintlayout.widget.Barrier
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:barrierDirection="bottom"
+ android:id="@+id/barrier"
+ app:constraint_referenced_ids="et_price,tv_money"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_phone"
+ app:layout_constraintTop_toBottomOf="@id/barrier"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="50dp"
+ android:textSize="12sp"
+ android:textColor="#4E576F"
+ android:text="费用将由平台确认，如需加急请拨打："/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_list_card.xml b/app/src/main/res/layout/activity_list_card.xml
index 367b120..88e963b 100644
--- a/app/src/main/res/layout/activity_list_card.xml
+++ b/app/src/main/res/layout/activity_list_card.xml
@@ -12,7 +12,7 @@
<TextView
android:id="@+id/tv_sure"
android:layout_width="match_parent"
- android:text="添加银行卡"
+ android:text="添加支付宝账号"
android:textColor="#ffffffff"
android:gravity="center"
android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/activity_safe_acount.xml b/app/src/main/res/layout/activity_safe_acount.xml
index 2646a8f..a111d2e 100644
--- a/app/src/main/res/layout/activity_safe_acount.xml
+++ b/app/src/main/res/layout/activity_safe_acount.xml
@@ -75,7 +75,7 @@
android:background="@color/white"
android:paddingEnd="14dp"
android:drawableEnd="@mipmap/more_black"
- android:text="银行卡设置"
+ android:text="支付宝提现设置"
android:textColor="#ff333333"
android:textSize="14sp"
/>
diff --git a/app/src/main/res/layout/activity_sure_money.xml b/app/src/main/res/layout/activity_sure_money.xml
index 9929434..36809ec 100644
--- a/app/src/main/res/layout/activity_sure_money.xml
+++ b/app/src/main/res/layout/activity_sure_money.xml
@@ -45,10 +45,22 @@
android:textStyle="bold"
tools:text="￥55.78" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_error"
+ android:paddingVertical="10dp"
+ android:layout_gravity="center"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ android:visibility="gone"
+ android:textColor="@color/main_blue"
+ android:text="异常改价>>"/>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
- android:layout_marginTop="10dp"
+ android:layout_marginTop="4dp"
android:gravity="center_vertical"
android:orientation="horizontal">
diff --git a/app/src/main/res/layout/activity_trip.xml b/app/src/main/res/layout/activity_trip.xml
index 6c7b35c..248334e 100644
--- a/app/src/main/res/layout/activity_trip.xml
+++ b/app/src/main/res/layout/activity_trip.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_margin="14dp"
android:layout_alignParentBottom="true"
- android:layout_height="40dp"/>
+ android:layout_height="70dp"/>
<ImageView
android:id="@+id/iv_move"
diff --git a/app/src/main/res/layout/item_all_income_detail.xml b/app/src/main/res/layout/item_all_income_detail.xml
index 357f7c7..f8c61c4 100644
--- a/app/src/main/res/layout/item_all_income_detail.xml
+++ b/app/src/main/res/layout/item_all_income_detail.xml
@@ -222,6 +222,18 @@
+ <TextView
+ android:id="@+id/tv_remark"
+ android:layout_below="@+id/tv_time"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
+ android:text="备注：XXXXXXXXXXXXXXXXX"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:layout_marginBottom="10dp"
+ />
<include
layout="@layout/include_line"
diff --git a/app/src/main/res/layout/item_get_order.xml b/app/src/main/res/layout/item_get_order.xml
index 3e94d7b..7bc6eee 100644
--- a/app/src/main/res/layout/item_get_order.xml
+++ b/app/src/main/res/layout/item_get_order.xml
@@ -11,6 +11,7 @@
android:orientation="vertical">
<RelativeLayout
+ android:id="@+id/rl_top"
android:layout_width="match_parent"
android:layout_height="64dp"
android:background="@drawable/car_get_top">
diff --git a/app/src/main/res/layout/item_income_del_money.xml b/app/src/main/res/layout/item_income_del_money.xml
index a6182ab..cc8ac6e 100644
--- a/app/src/main/res/layout/item_income_del_money.xml
+++ b/app/src/main/res/layout/item_income_del_money.xml
@@ -5,7 +5,7 @@
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:background="@color/white"
- android:layout_height="56dp">
+ android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_del_money"
@@ -33,15 +33,31 @@
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
+ android:layout_alignTop="@id/tv_del_money"
+ android:layout_marginTop="10dp"
android:layout_alignParentEnd="true"
android:text="快车"
android:textColor="#ff333333"
android:textSize="14sp"
/>
- <include layout="@layout/include_line" android:layout_alignParentBottom="true"
+ <TextView
+ android:id="@+id/tv_remark"
+ android:layout_below="@+id/tv_time"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="3dp"
+ android:text=""
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ android:textSize="12sp"
+ />
+
+
+ <include layout="@layout/include_line"
+ android:layout_below="@id/tv_remark"
android:layout_height="1px"
+ android:layout_marginTop="10dp"
android:layout_width="match_parent" />
diff --git a/app/src/main/res/layout/item_main_list.xml b/app/src/main/res/layout/item_main_list.xml
index 064254d..e9c935b 100644
--- a/app/src/main/res/layout/item_main_list.xml
+++ b/app/src/main/res/layout/item_main_list.xml
@@ -1,58 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
- android:orientation="vertical"
- android:layout_marginBottom="6dp"
android:background="@color/white"
- android:paddingBottom="6dp"
android:layout_height="wrap_content">
- <RelativeLayout
+ <View
android:layout_width="match_parent"
- android:layout_marginStart="12dp"
- android:layout_height="44dp">
+ android:layout_height="45dp"
+ android:id="@+id/view_reserve"
+ android:visibility="gone"
+ android:background="@drawable/bg_reserve"/>
- <TextView
- android:id="@+id/tv_type"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center"
- android:textStyle="bold"
- android:layout_centerVertical="true"
- android:text="专车订单"
- android:textColor="#ff333333"
- android:textSize="13sp"
- />
-
- <TextView
- android:id="@+id/tv_statue"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentEnd="true"
- android:layout_marginEnd="12dp"
- android:gravity="center"
- android:text="服务中"
- android:textColor="@color/main_item_orange"
- android:textSize="13sp"
- />
-
-
- </RelativeLayout>
-
- <include layout="@layout/include_line_left_12"/>
-
- <TextView
- android:id="@+id/tv_time"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="4月3日 14:00"
- android:layout_marginStart="12dp"
- android:textColor="#ff666666"
- android:drawablePadding="6dp"
- android:layout_marginTop="10dp"
- android:drawableStart="@mipmap/icon_time_gray"
- android:textSize="14sp"
- />
+ android:orientation="vertical"
+ android:paddingBottom="6dp">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_marginStart="12dp"
+ android:layout_height="44dp">
+
+ <TextView
+ android:id="@+id/tv_type"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:textStyle="bold"
+ android:layout_centerVertical="true"
+ android:text="专车订单"
+ android:textColor="#ff333333"
+ android:textSize="13sp"
+ />
+
+ <TextView
+ android:id="@+id/tv_statue"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="12dp"
+ android:gravity="center"
+ android:text="服务中"
+ android:textColor="@color/main_item_orange"
+ android:textSize="13sp"
+ />
+
+
+ </RelativeLayout>
+
+ <include layout="@layout/include_line_left_12"/>
+
+ <TextView
+ android:id="@+id/tv_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="4月3日 14:00"
+ android:layout_marginStart="12dp"
+ android:textColor="#ff666666"
+ android:drawablePadding="6dp"
+ android:layout_marginTop="10dp"
+ android:drawableStart="@mipmap/icon_time_gray"
+ android:textSize="14sp"
+ />
<TextView
android:id="@+id/tv_start"
@@ -68,62 +77,64 @@
android:textSize="14sp"
/>
- <TextView
- android:id="@+id/tv_end"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:layout_marginTop="12dp"
- android:layout_marginStart="13dp"
- android:drawableStart="@drawable/bg_point_main_color_black"
- android:drawablePadding="6dp"
- android:text="柳州客运中心"
- android:textColor="#ff27282d"
- android:textSize="14sp"
- />
+ <TextView
+ android:id="@+id/tv_end"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="12dp"
+ android:layout_marginStart="13dp"
+ android:drawableStart="@drawable/bg_point_main_color_black"
+ android:drawablePadding="6dp"
+ android:text="柳州客运中心"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ />
- <TextView
- android:id="@+id/tv_people_num"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:layout_marginTop="12dp"
- android:layout_marginStart="13dp"
- android:drawableStart="@drawable/bg_point_main_color_black"
- android:drawablePadding="6dp"
- android:text="3人"
- android:textColor="#ff27282d"
- android:textSize="14sp"
- />
+ <TextView
+ android:id="@+id/tv_people_num"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="12dp"
+ android:layout_marginStart="13dp"
+ android:drawableStart="@drawable/bg_point_main_color_black"
+ android:drawablePadding="6dp"
+ android:text="3人"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ />
- <TextView
- android:id="@+id/tv_remark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:layout_marginTop="12dp"
- android:layout_marginStart="13dp"
- android:drawableStart="@drawable/bg_point_main_color_black"
- android:drawablePadding="6dp"
- android:text="无备注"
- android:textColor="#ff27282d"
- android:textSize="14sp"
- />
+ <TextView
+ android:id="@+id/tv_remark"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="12dp"
+ android:layout_marginStart="13dp"
+ android:drawableStart="@drawable/bg_point_main_color_black"
+ android:drawablePadding="6dp"
+ android:text="无备注"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ />
- <TextView
- android:id="@+id/tv_money_cargo"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
- android:layout_marginStart="13dp"
- android:layout_marginBottom="11dp"
- android:visibility="gone"
- android:drawableStart="@mipmap/icon_rocket"
- android:drawablePadding="5dp"
- android:text="柳州客运中心"
- android:textColor="#ff27282d"
- android:textSize="14sp"
- android:textStyle="bold" />
+ <TextView
+ android:id="@+id/tv_money_cargo"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:layout_marginStart="13dp"
+ android:layout_marginBottom="11dp"
+ android:visibility="gone"
+ android:drawableStart="@mipmap/icon_rocket"
+ android:drawablePadding="5dp"
+ android:text="柳州客运中心"
+ android:textColor="#ff27282d"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+ </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/verify_card_pwd.xml b/app/src/main/res/layout/verify_card_pwd.xml
index dcb8a2e..eec0f22 100644
--- a/app/src/main/res/layout/verify_card_pwd.xml
+++ b/app/src/main/res/layout/verify_card_pwd.xml
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
- android:text="添加银行卡"
+ android:text="添加支付宝账号"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />
diff --git a/build.gradle b/build.gradle
index 4bf336e..26cf6a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,13 +3,12 @@
buildscript {
ext.kotlin_version = '1.3.61'
repositories {
+ google()
maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
- maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
maven { url 'https://maven.aliyun.com/repository/google/' }
maven { url 'https://maven.aliyun.com/repository/jcenter/' }
maven { url 'https://jitpack.io' }
- google()
-// jcenter()
+
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
@@ -22,7 +21,6 @@
allprojects {
repositories {
google()
-// jcenter()
maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
maven { url 'https://maven.aliyun.com/repository/google/' }
maven { url 'https://maven.aliyun.com/repository/jcenter/' }
diff --git a/settings.gradle b/settings.gradle
index 4c50084..012e97d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,2 @@
rootProject.name='ZhaoyangTrip'
include ':app', ':xldUtils', ':rxnetty'
-include ':ChipsLayoutManager'
--
Gitblit v1.7.1