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

整改优化

Browse Source
This commit is contained in:
lijia 2024-06-17 11:19:25 +08:00
parent 7e40fef702
commit ce1356509b
14 changed files with 295 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarDelBean.java
View File

@ -66,6 +66,10 @@ public class CarDelBean {
private String owner;
private String roadLicense;
private String roadLicensePhoto;
private String policyPhotoUrl;
private String insuranceCompany;
private String insuranceEndDay;
private String roadLicenseSend;
private String roadLicenseValidity;
private String threeImage;
@ -95,6 +99,30 @@ public class CarDelBean {
this.carPlateColorValue = carPlateColorValue;
}
public String getPolicyPhotoUrl() {
return policyPhotoUrl == null ? "" : policyPhotoUrl;
}
public void setPolicyPhotoUrl(String policyPhotoUrl) {
this.policyPhotoUrl = policyPhotoUrl;
}
public String getInsuranceCompany() {
return insuranceCompany == null ? "" : insuranceCompany;
}
public void setInsuranceCompany(String insuranceCompany) {
this.insuranceCompany = insuranceCompany;
}
public String getInsuranceEndDay() {
return insuranceEndDay == null ? "" : insuranceEndDay;
}
public void setInsuranceEndDay(String insuranceEndDay) {
this.insuranceEndDay = insuranceEndDay;
}
public String getCarEnergyTypValue() {
return carEnergyTypValue;
}

9
app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverExpireBean.java
View File

@ -48,6 +48,15 @@ public class DriverExpireBean {
public static class DataDTO {
private String driverLicenseUpdateUrl;
private String idCardUpdateUrl;
private String qualificationUpdateUrl;
public String getQualificationUpdateUrl() {
return qualificationUpdateUrl;
}
public void setQualificationUpdateUrl(String qualificationUpdateUrl) {
this.qualificationUpdateUrl = qualificationUpdateUrl;
}
public String getDriverLicenseUpdateUrl() {
return driverLicenseUpdateUrl;

11
app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/AuthRequest.java
View File

@ -124,6 +124,17 @@ public class AuthRequest {
RequestUtil.start(1, "saveCarRoadLicenseNo", re, con, hd);
}
//车辆交强保险
public void saveTrafficInsurance(Context con, Handler hd, String id, String insuranceEndDay, String insuranceCompany) {
String mt = "{\n" +
"\t\"carId\": \"" + id + "\",\n" +
"\t\"insuranceEndDay\": \"" + insuranceEndDay + "\",\n" +
"\t\"insuranceCompany\": \"" + insuranceCompany + "\",\n" +
"}";
Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getTrafficInsurance(), mt), getToken(con), con);
RequestUtil.start(1, "saveTrafficInsurance", re, con, hd);
}
//获取资格证认证信息
public void isDriverAuthQualification(Context con, Handler hd) {
Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getIsAuthDriverAuthQualification(), ""), getToken(con), con);

7
app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/RequestConstant.java
View File

@ -130,6 +130,9 @@ public class RequestConstant {
private static final String DRIVER_AUTH_SAVECARREGISTERNO = "/app/carDriver/saveCarRegisterNo";
//道路运输信息
private static final String DRIVER_AUTH_SAVECARROADLICENSENO = "/app/carDriver/saveCarRoadLicenseNo";
//交强险
private static final String DRIVER_TRAFFIC_INSU = "/app/carDriver/saveCarInsurace";
//党员认证
private static final String PARTY_MEMBER = "/app/user/partyMember";
//实名认证
@ -375,6 +378,10 @@ public class RequestConstant {
return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO;
}
public static String getTrafficInsurance() {
return BASE_URL + DRIVER_TRAFFIC_INSU;
}
public static String getSaveDrawCar() {
return BASE_URL + SAVE_DRAW_CAR;
}

21
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
View File

@ -738,7 +738,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
value1.setText(ocb.getData().getName());
value2.setText(ocb.getData().getCardId());
value3.setText(ocb.getData().getAddress());
Glide.with(con).load(url1).into(img1);
// Glide.with(con).load(url1).into(img1);
Glide.with(con).load(path).into(img1);
fontId = ocb.getData().getId();
} else {
Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
@ -750,7 +751,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
if (ocbb.getCode() == 200) {
url2 = ocbb.getData().getUrl();
value4.setText(ocbb.getData().getEndTime());
Glide.with(con).load(url2).into(img2);
// Glide.with(con).load(url2).into(img2);
Glide.with(con).load(path).into(img2);
startTime = ocbb.getData().getStartTime();
backId = ocbb.getData().getId();
@ -774,7 +776,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
value2.setText(StringUtil.isNull(od.getStartTime(), "识别异常"));
value3.setText(StringUtil.isNull(od.getAllowType(), "识别异常"));
value4.setText(StringUtil.isNull(od.getEndTime(), "识别异常"));
Glide.with(con).load(url1).into(img1);
// Glide.with(con).load(url1).into(img1);
Glide.with(con).load(path).into(img1);
fontId = od.getId();
} else {
Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
@ -786,7 +789,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
if (odlb.getCode() == 200) {
url2 = odlb.getData().getUrl();
backId = odlb.getData().getId();
Glide.with(con).load(url2).into(img2);
// Glide.with(con).load(url2).into(img2);
Glide.with(con).load(path).into(img2);
//自动调取提交功能，实现页面自动跳转
subimt();
} else {
@ -808,7 +812,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
value3.setText(olb.getData().getOwner());
value4.setText(olb.getData().getVehicleNumber());
fontId = olb.getData().getId();
Glide.with(con).load(url1).into(img1);
// Glide.with(con).load(url1).into(img1);
Glide.with(con).load(path).into(img1);
oCrcarId = olb.getData().getCarId() + "";
Log.e("-cardId-", oCrcarId);
} else {
@ -821,7 +826,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
if (oblb.getCode() == 200) {
url2 = oblb.getData().getUrl();
backId = oblb.getData().getId();
Glide.with(con).load(url2).into(img2);
// Glide.with(con).load(url2).into(img2);
Glide.with(con).load(path).into(img2);
//自动调取提交功能，实现页面自动跳转
subimt();
} else {
@ -834,7 +840,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
if (ub.getCode() == 200) {
url3 = ub.getData().getUrl();
fid = ub.getData().getId();
Glide.with(con).load(url3).into(img3);
// Glide.with(con).load(url3).into(img3);
Glide.with(con).load(path).into(img3);
} else {
Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
}

101
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
View File

@ -24,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
import com.arpa.hndahesudintocctmsdriver.request.AuthRequest;
import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
import com.arpa.hndahesudintocctmsdriver.util.img.GetImageAlert;
@ -31,6 +32,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
import com.bumptech.glide.Glide;
import com.github.gzuliyujiang.wheelpicker.DatePicker;
import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
import com.google.gson.Gson;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
@ -49,23 +52,24 @@ import java.util.List;
*/
public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnClickListener {
private String[] titles = {"车辆照片", "NFC照片", "车辆登记证书", "道路运输许可证"};
private String[] name1 = {"车辆照片", "NFC照片", "车辆登记证书照片", "道路运输许可证照片"};
private String[] name2 = {"请上传车辆照片", "请上传NFC照片", "请上传车辆登记证书照片", "请上传道路运输许可证照片"};
private Boolean[] isShowEdit = {false, false, true, true};
private Boolean[] isShowSkip = {true, false, false, true};
private String[] titles = {"车辆照片", "NFC照片", "车辆登记证书", "道路运输许可证", "车辆交强险"};
private String[] name1 = {"车辆照片", "NFC照片", "车辆登记证书照片", "道路运输许可证照片", "车辆交强险照片"};
private String[] name2 = {"请上传车辆照片", "请上传NFC照片", "请上传车辆登记证书照片", "请上传道路运输许可证照片", "请上传车辆交强险照片"};
private Boolean[] isShowEdit = {false, false, true, true, true};
private Boolean[] isShowSkip = {true, false, false, true, true};
private String[] tips = {
"",
"*注意: 没有粘贴NFC芯片的车辆无需上传,可直接跳过",
"*注意: 没有可直接跳过,等候下次上传",
"*注意: 4.5吨以下车辆不需要上传,可直接跳过"};
"*注意: 4.5吨以下车辆不需要上传,可直接跳过",
""};
private BaseRecyclerView brv;
private ImageView img;
private TextView title1, title2, title3, zjimg_name, upload_img, tvTips, tvSkip;
private TextView title1, title2, title3, zjimg_name, upload_img, tvTips, tvSkip, value2;
private EditText value1;
private LinearLayout llInfo;
private LinearLayout llInfo, llDate;
private RelativeLayout up_img;
private Button submit;
@ -76,6 +80,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
private int type;//页面类型
private String path, carId, url;//图片路径
private GetImageAlert gia = new GetImageAlert();
private CustomDialog customDialog;
@Override
public void msgMethod(Message m) {
@ -109,10 +114,16 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
case 3:
new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 2);
break;
case 4:
new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 7);
break;
}
url = ub.getData().getUrl();
Glide.with(con).load(url).into(img);
// Glide.with(con).load(url).into(img);
Glide.with(con).load(path).into(img);
if (customDialog != null && customDialog.isShowing())
customDialog.dismiss();
CacheGroup.cacheList.remove("upload");
}
@ -132,6 +143,9 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
case 3:
Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show();
break;
case 4:
Toast.makeText(con, "交强险证件上传成功", Toast.LENGTH_SHORT).show();
break;
}
} else {
Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@ -158,7 +172,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRoadLicenseNo"), IsAuthDriverAuthQualificationBean.class);
if (ib.getCode() == 200) {
//判断是否需要跳转挂车行驶证页面
if (!"".equals(carId)&&cdb.getData()!=null) {
if (!"".equals(carId) && cdb.getData() != null) {
if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，并且传过挂车直接结束
finish();
Intent in = new Intent(con, AddCarSuccActivity.class);
@ -187,10 +201,13 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
con.startActivity(in);
}
}
}else{
} else {
finish();
}
// if (!"".equals(carId) && cdb.getData().getIsTrailer() == 1) {
// if (!"".equals(carId)) {
// finish();
@ -215,8 +232,23 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
}
CacheGroup.cacheList.remove("saveCarRoadLicenseNo");
}
if (CacheGroup.cacheList.get("saveTrafficInsurance") != null) {
Log.e("is", CacheGroup.cacheList.get("saveTrafficInsurance"));
IsAuthDriverAuthQualificationBean ddb = gson.fromJson(CacheGroup.cacheList.get("saveTrafficInsurance"), IsAuthDriverAuthQualificationBean.class);
if (ddb.getCode() == 200) {
Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
finish();
} else {
Toast.makeText(con, ddb.getMsg(), Toast.LENGTH_SHORT).show();
}
CacheGroup.cacheList.remove("saveTrafficInsurance");
}
break;
case ImageFileCompressUtil.COMPRESS_SUCCESS:
customDialog = new CustomDialog(con, "加载中...");
customDialog.show();
path = (String) m.obj;
new AuthRequest().upload(con, hd, new File(path));
break;
@ -235,6 +267,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
title1 = findViewById(R.id.title1);
title2 = findViewById(R.id.title2);
title3 = findViewById(R.id.name1);
value2 = findViewById(R.id.value2);
up_img = findViewById(R.id.up_img);
img = findViewById(R.id.img);
zjimg_name = findViewById(R.id.zjimg_name);
@ -242,6 +275,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
tvTips = findViewById(R.id.tvTips);
value1 = findViewById(R.id.value1);
llInfo = findViewById(R.id.llInfo);
llDate = findViewById(R.id.llDate);
tvSkip = findViewById(R.id.tvSkip);
submit = findViewById(R.id.submit);
@ -249,6 +283,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
submit.setOnClickListener(this);
upload_img.setOnClickListener(this);
img.setOnClickListener(this);
value2.setOnClickListener(this);
type = getIntent().getExtras().getInt("type");
@ -309,6 +344,14 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
case R.id.img:
showBigImg();
break;
case R.id.value2:
DatePicker picker = new DatePicker(this);
picker.setBodyWidth(300);
picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
picker.getWheelLayout().setDateLabel("年", "月", "日");
picker.show();
break;
}
}
@ -317,7 +360,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
* 展示大图片
*/
private void showBigImg() {
if (TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) {
if ((type == 0 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
choicePhoto();
return;
}
@ -360,6 +403,19 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
.show();
// new XPopup.Builder(con)
// .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
// .show();
break;
}
case 4:
if (cdb.getData().getPolicyPhotoUrl() != null && !"".equals(cdb.getData().getPolicyPhotoUrl())) {
//roadLicensePhoto
new XPopup.Builder(con)
.asImageViewer(img, cdb.getData().getPolicyPhotoUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
.show();
// new XPopup.Builder(con)
// .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
// .show();
break;
@ -413,6 +469,15 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
}
new AuthRequest().saveCarRoadLicenseNo(con, hd, carId, s1);
break;
case 4:
String s2 = value1.getText().toString();
String v2 = value2.getText().toString();
if (TextUtils.isEmpty(s2) || TextUtils.isEmpty(v2)) {
Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
return;
}
new AuthRequest().saveTrafficInsurance(con, hd, carId, v2, s2);
break;
}
}
@ -447,6 +512,14 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
submit.setBackgroundResource(R.drawable.bg_btn_grey);
upload_img.setText("已上传");
}
} else if (4 == type) {
if (!TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl())) {
Glide.with(con).load(cdb.getData().getPolicyPhotoUrl()).into(img);
value1.setText(cdb.getData().getInsuranceCompany());
value2.setText(cdb.getData().getInsuranceEndDay());
submit.setBackgroundResource(R.drawable.bg_btn_grey);
upload_img.setText("已上传");
}
}
}
}
@ -529,6 +602,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
tvTips.setText(tips[type]);
tvSkip.setVisibility(isShowSkip[type] ? View.GONE : View.VISIBLE);
llInfo.setVisibility(isShowEdit[type] ? View.VISIBLE : View.GONE);
if (type == 4) {
llDate.setVisibility(View.VISIBLE);
title3.setText("保险公司");
}
}

14
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java
View File

@ -15,6 +15,8 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
import com.dahe.mylibrary.utils.ToastUtils;
import com.google.gson.Gson;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
@ -207,6 +209,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
RelativeLayout r5=v.findViewById(R.id.r5);
RelativeLayout r6=v.findViewById(R.id.r6);
RelativeLayout r7=v.findViewById(R.id.r7);
RelativeLayout r8=v.findViewById(R.id.r8);
View vs1=v.findViewById(R.id.vs1);
View vs2=v.findViewById(R.id.vs2);
r4.setVisibility(View.GONE);
@ -301,6 +304,17 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
Toast.makeText(con,"请先绑定挂车",Toast.LENGTH_SHORT).show();
}
});
r8.setOnClickListener(v1->{
if(!"".equals(carId)){
Intent in = new Intent(con, PhotoCarActivity.class);
in.putExtra("type", 4);
in.putExtra("carId", carId);
con.startActivity(in);
}else{
Toast.makeText(con,"请先绑定行驶证",Toast.LENGTH_SHORT).show();
}
});
del.setOnClickListener(v13 -> {
new XPopup.Builder(con)
.isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

3
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
View File

@ -240,7 +240,8 @@ public class HomeFragment extends BaseFragment {
in.putExtra("url", deb.getData().getIdCardUpdateUrl());
}
}
if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(deb.getData().getIdCardUpdateUrl())) {
if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(deb.getData().getIdCardUpdateUrl())||
!"".equals(deb.getData().getQualificationUpdateUrl())) {
new XToast<>(act)
.setContentView(R.layout.view_bc)
// 设置成可拖拽的

9
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java
View File

@ -35,7 +35,7 @@ public class SetupActivity extends BaseActivity {
String url2="";
String url3="";
String kefu="";
private RelativeLayout r1,r2,r3,r4,r5,r6,r7;
private RelativeLayout r1,r2,r3,r4,r5,r6,r7,r8;
@Override
public void msgMethod(Message m) {
@ -86,6 +86,7 @@ public class SetupActivity extends BaseActivity {
r5=findViewById(R.id.r5);
r6=findViewById(R.id.r6);
r7=findViewById(R.id.r7);
r8=findViewById(R.id.r8);
ur=new UserRequset(con,hd);
initView(null);
}
@ -119,6 +120,12 @@ public class SetupActivity extends BaseActivity {
in.putExtra("url","https://smlt.esign.cn/hmfbZoeeGQqv");
startActivity(in);
});
r8.setOnClickListener(v12 -> {
Intent in=new Intent(con,WebActivity.class);
in.putExtra("title","交易规则");
in.putExtra("url","https://smlt.esign.cn/hmfbZoeeGQqv");
startActivity(in);
});
r6.setOnClickListener(v12 -> {
String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
String[] value={kefu,"95528","13460042961"};

33
app/src/main/res/layout/activity_che_data.xml
View File

@ -382,5 +382,38 @@
/>
</LinearLayout>
<RelativeLayout
android:id="@+id/r8"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="交强险保单"
android:textColor="#ff000000"
android:textSize="@dimen/sp_15"
/>
</LinearLayout>
<ImageView
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_10"
android:src="@mipmap/chevron"
android:scaleType="fitXY"
android:background="@null"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_2"
android:background="#F6F6F9"/>
</LinearLayout>
</RelativeLayout>

49
app/src/main/res/layout/activity_photo_car.xml
View File

@ -100,7 +100,7 @@
</androidx.cardview.widget.CardView>
<LinearLayout
android:visibility="gone"
android:id="@+id/llInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -137,6 +137,8 @@
android:orientation="vertical"
android:padding="@dimen/dp_14">
<RelativeLayout
android:id="@+id/cow1"
@ -162,10 +164,55 @@
android:gravity="right"
android:hint="点击进行手动输入"
android:maxLines="1"
android:singleLine="true"
android:textColor="#ff999999"
android:textSize="@dimen/sp_13" />
</RelativeLayout>
<LinearLayout
android:id="@+id/llDate"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<View
android:layout_marginTop="@dimen/dp_10"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@drawable/bottom_xu"/>
<RelativeLayout
android:id="@+id/rlDate"
android:layout_marginTop="@dimen/dp_10"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/name2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="截止日期"
android:textColor="#ffc4c4ce"
android:textSize="@dimen/sp_13"
/>
<TextView
android:layout_toRightOf="@+id/name2"
android:id="@+id/value2"
android:layout_alignParentRight="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#ff999999"
android:textSize="@dimen/sp_13"
android:maxLines="1"
android:hint="请选择截止日期"
android:gravity="right"
android:ellipsize="end"
android:layout_marginLeft="@dimen/dp_10"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/qianbao_tixian.xml
View File

@ -103,6 +103,7 @@
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
@ -131,6 +132,7 @@
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"

29
app/src/main/res/layout/setup.xml
View File

@ -146,6 +146,35 @@
android:src="@mipmap/chevron" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_2"
android:background="#F6F6F9" />
<RelativeLayout
android:id="@+id/r8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="交易规则"
android:textColor="#ff000000"
android:textSize="@dimen/sp_15" />
<ImageView
android:layout_width="@dimen/dp_4"
android:layout_height="@dimen/dp_8"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@null"
android:scaleType="fitXY"
android:src="@mipmap/chevron" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_2"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Jul 12 10:16:49 CST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME