Pārlūkot izejas kodu

Merge branch 'master' of http://192.168.40.220/dmc/jz_app

# Conflicts:
#	app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java
master
huting pirms 2 gadiem
vecāks
revīzija
b91fa8ed75

+ 20
- 61
app/src/main/AndroidManifest.xml Parādīt failu

@@ -75,6 +75,7 @@
tools:ignore="AllowBackup,LockedOrientationActivity"
tools:replace="android:allowBackup,android:supportsRtl,android:label"
tools:targetApi="n">

<!-- 表示当前已经适配了分区存储 -->
<meta-data
android:name="ScopedStorage"
@@ -231,29 +232,36 @@
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 车辆信息填写 -->
<activity
android:name=".project.ui.activity.card.ValueToBookkeepingRefundActivity"
android:name=".project.ui.activity.transfer.CutPaymentAccountChangeActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:exported="false">
android:exported="false"><!-- 扣款账户变更 -->
</activity>
<activity
android:name=".project.ui.activity.transfer.ETCTransferCarActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"></activity><!-- ETC过户 -->
<activity
android:name=".project.ui.activity.card.ValueToBookkeepingRefundActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /><!-- 储值卡转记账卡退费 -->
<activity
android:name=".project.ui.activity.card.ValueToBookkeepingExpireActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:exported="false">
</activity>
android:screenOrientation="portrait" /><!-- 储值卡转记账卡过期 -->
<activity
android:name=".project.ui.activity.card.ValueToBookkeepingVerifyActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:exported="false">
</activity>
android:screenOrientation="portrait" /><!-- 储值卡转记账卡账号验证 -->
<activity
android:name=".project.ui.activity.card.ValueToBookkeepingCardActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:exported="false">
</activity>
android:screenOrientation="portrait" /><!-- 储值卡转记账卡基础信息 -->
<activity
android:name=".project.ui.activity.evaluate.YwblEvaluateActivity"
android:exported="false"
@@ -473,9 +481,7 @@
<activity
android:name=".project.ui.activity.order.OrderLogisticsActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />

<!-- 更换ETC设备 -->
android:screenOrientation="portrait" /> <!-- 更换ETC设备 -->
<activity
android:name=".project.ui.activity.after.ReplaceEtcStep1Activity"
android:launchMode="singleTop"
@@ -484,53 +490,6 @@
android:name=".project.ui.activity.after.ReplaceEtcStep2Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.after.ReplaceEtcStep3Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.after.ReplaceEtcStep4Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />

<!-- 设备注销 -->
<activity
android:name=".project.ui.activity.after.LogoutEtcStep1Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.after.LogoutEtcStep2Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.after.LogoutEtcSuccessActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />

<!--欠费补缴-->
<activity
android:name=".project.ui.activity.after.PayTheArrearsStep1Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.after.PayTheArrearsStep2Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.after.PayTheArrearsStep3Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />

<!--余额补领-->
<activity
android:name=".project.ui.activity.after.BalanceReplacementActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.after.LogoutEtcReturnMoneyActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />

</application>

</manifest>

+ 6
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/TransferBean.java Parādīt failu

@@ -0,0 +1,6 @@
package com.huntersun.vkyes.etcopencard.project.api.bean;
public class TransferBean {
public String carNum = "";
public Boolean isChoose = false;
}

+ 36
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/transfer/CutPaymentAccountChangeActivity.java Parādīt failu

@@ -0,0 +1,36 @@
package com.huntersun.vkyes.etcopencard.project.ui.activity.transfer;

import androidx.appcompat.app.AppCompatActivity;

import android.os.Bundle;
import android.view.View;

import com.huntersun.vkyes.etcopencard.databinding.ActivityCutPaymentAccountChangeBinding;
import com.huntersun.vkyes.etcopencard.src.app.AppActivity;

/**
*
* @ClassName: CutPaymentAccountChangeActivity
* @Description: 扣款账户变更
* @Author: lujin
* @CreateDate: 2023/3/17 16:41
*/

public class CutPaymentAccountChangeActivity extends AppActivity {
private ActivityCutPaymentAccountChangeBinding binding;
@Override
protected View getLayoutView() {
binding = ActivityCutPaymentAccountChangeBinding.inflate(getLayoutInflater());
return binding.getRoot();
}

@Override
protected void initView() {
setTitle("扣款账户变更");
}

@Override
protected void initData() {

}
}

+ 130
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/transfer/ETCTransferCarActivity.java Parādīt failu

@@ -0,0 +1,130 @@
package com.huntersun.vkyes.etcopencard.project.ui.activity.transfer;

import android.util.Log;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.RelativeLayout;

import androidx.recyclerview.widget.GridLayoutManager;

import com.chad.library.adapter.base.BaseQuickAdapter;
import com.huntersun.vkyes.etcopencard.R;
import com.huntersun.vkyes.etcopencard.databinding.ActivityEtctransferOldCarBinding;
import com.huntersun.vkyes.etcopencard.project.api.bean.TransferBean;
import com.huntersun.vkyes.etcopencard.project.ui.adapter.TransferCarAdapter;
import com.huntersun.vkyes.etcopencard.project.view.CommonItemDecoration;
import com.huntersun.vkyes.etcopencard.src.app.AppActivity;

import java.util.ArrayList;

/**
*
* @ClassName: ETCTransferCarActivity
* @Description: ETC过户
* @Author: lujin
* @CreateDate: 2023/3/16 16:43
*/

public class ETCTransferCarActivity extends AppActivity {
private ActivityEtctransferOldCarBinding binding;
private ArrayList<TransferBean> data = new ArrayList<>();
private TransferCarAdapter adapter;
@Override
protected View getLayoutView() {
binding = ActivityEtctransferOldCarBinding.inflate(getLayoutInflater());
return binding.getRoot();
}

@Override
protected void initView() {
setTitle("ETC过户");
initRecyclerview();
initRadio();

}

private void initRadio() {
binding.cbOldCar.setOnClickListener(this);
binding.cbNewCar.setOnClickListener(this);
binding.cbOthersCar.setOnClickListener(this);
binding.tv1.setOnClickListener(this);
binding.tv2.setOnClickListener(this);
binding.tv3.setOnClickListener(this);
binding.btnCommit.setOnClickListener(this);
binding.cbOldCar.performClick();
}

private void initRecyclerview() {
GridLayoutManager layoutManager =new GridLayoutManager(this,2);
adapter = new TransferCarAdapter(R.layout.item_old_car_layout_1,data);
CommonItemDecoration commonItemDecoration = new CommonItemDecoration(40,40,40,0,40,0);
binding.recycler.setLayoutManager(layoutManager);
binding.recycler.addItemDecoration(commonItemDecoration);
binding.recycler.setAdapter(adapter);
adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
if (view.getId()==R.id.rrelative){
if (data.size()!=0){
for (int j = 0; j<data.size();j++){
if (j!=i){
data.get(j).isChoose = false;
}else {
data.get(j).isChoose = true;
}
}
adapter.notifyDataSetChanged();
}

}
}
});
}

@Override
protected void initData() {
for (int i =0 ; i<4 ; i++){
TransferBean transferBean = new TransferBean();
transferBean.carNum = "贵A·98563"+i;
data.add(transferBean);
}
adapter.replaceData(data);
}

@Override
public void onClick(View view) {
if (view == binding.cbOldCar||view == binding.tv1){//已有车辆
binding.cbOldCar.setChecked(true);
binding.cbNewCar.setChecked(false);
binding.cbOthersCar.setChecked(false);
binding.recycler.setVisibility(View.VISIBLE);//老车牌
binding.lyOthers.setVisibility(View.GONE);//他人车牌额外填项
binding.rrelative.setVisibility(View.GONE);//图片上传
binding.tvShib.setVisibility(View.GONE);//识别文本title
binding.rlyShib.setVisibility(View.GONE);//识别内容
binding.tvTips.setVisibility(View.GONE);//提示
}else if (view==binding.cbNewCar||view == binding.tv2){//新车
binding.cbOldCar.setChecked(false);
binding.cbNewCar.setChecked(true);
binding.cbOthersCar.setChecked(false);
binding.recycler.setVisibility(View.GONE);//老车牌
binding.lyOthers.setVisibility(View.GONE);//他人车牌额外填项
binding.rrelative.setVisibility(View.VISIBLE);//图片上传
binding.tvShib.setVisibility(View.VISIBLE);//识别文本title
binding.rlyShib.setVisibility(View.VISIBLE);//识别内容
binding.tvTips.setVisibility(View.VISIBLE);//提示
}else if (view==binding.cbOthersCar||view == binding.tv3){//他人车辆
binding.cbOldCar.setChecked(false);
binding.cbNewCar.setChecked(false);
binding.cbOthersCar.setChecked(true);
binding.recycler.setVisibility(View.GONE);//老车牌
binding.lyOthers.setVisibility(View.VISIBLE);//他人车牌额外填项
binding.rrelative.setVisibility(View.VISIBLE);//图片上传
binding.tvShib.setVisibility(View.VISIBLE);//识别文本title
binding.rlyShib.setVisibility(View.VISIBLE);//识别内容
binding.tvTips.setVisibility(View.VISIBLE);//提示
}else if (view==binding.btnCommit){//提交
startActivity(CutPaymentAccountChangeActivity.class);
}
}
}

+ 32
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/adapter/TransferCarAdapter.java Parādīt failu

@@ -0,0 +1,32 @@
package com.huntersun.vkyes.etcopencard.project.ui.adapter;
import android.bluetooth.BluetoothDevice;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.huntersun.vkyes.etcopencard.R;
import com.huntersun.vkyes.etcopencard.project.api.bean.TransferBean;
import com.ruffian.library.widget.RRelativeLayout;
import java.util.List;
public class TransferCarAdapter extends BaseQuickAdapter<TransferBean, BaseViewHolder> {
public TransferCarAdapter(int layoutResId, @Nullable List<TransferBean> data) {
super(layoutResId, data);
}
@Override
protected void convert(@NonNull BaseViewHolder holder, TransferBean transferBean) {
holder.setText(R.id.tv_old_car_number,transferBean.carNum);
RRelativeLayout rr = holder.itemView.findViewById(R.id.rrelative);
if (transferBean.isChoose){
rr.setEnabled(false);
}else {
rr.setEnabled(true);
}
holder.addOnClickListener(R.id.rrelative);
}
}

+ 75
- 38
app/src/main/res/layout-v4/activity_obu_activation_upload.xml Parādīt failu

@@ -44,38 +44,51 @@
android:id="@+id/rcly"
app:corner_radius="@dimen/dp_5"
app:background_normal="@color/photochoosebg">
<com.ruffian.library.widget.RImageView
<com.ruffian.library.widget.RTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:corner_radius_top_left="@dimen/dp_5"
app:corner_radius_top_right="@dimen/dp_5"
android:id="@+id/img_up_1"/>
android:id="@+id/tv_bg_1"/>
<com.ruffian.library.widget.RTextView
android:layout_width="@dimen/dp_25"
android:layout_height="@dimen/dp_25"
app:background_normal="@color/gray05"
app:layout_constraintTop_toTopOf="@+id/img_up_1"
app:layout_constraintBottom_toBottomOf="@+id/img_up_1"
app:layout_constraintLeft_toLeftOf="@+id/img_up_1"
app:layout_constraintRight_toRightOf="@+id/img_up_1"
app:layout_constraintTop_toTopOf="@+id/tv_bg_1"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_1"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_1"
app:layout_constraintRight_toRightOf="@+id/tv_bg_1"
app:corner_radius="@dimen/dp_12"
android:id="@+id/photo_bg1"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_obu_3"
app:layout_constraintTop_toTopOf="@+id/img_up_1"
app:layout_constraintBottom_toBottomOf="@+id/img_up_1"
app:layout_constraintLeft_toLeftOf="@+id/img_up_1"
app:layout_constraintRight_toRightOf="@+id/img_up_1"
app:layout_constraintTop_toTopOf="@+id/tv_bg_1"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_1"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_1"
app:layout_constraintRight_toRightOf="@+id/tv_bg_1"
android:id="@+id/img_photo1"/>
<!-- 图片加载view-->
<com.ruffian.library.widget.RImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
app:corner_radius_top_left="@dimen/dp_5"
app:corner_radius_top_right="@dimen/dp_5"
android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="@+id/tv_bg_1"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_1"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_1"
app:layout_constraintRight_toRightOf="@+id/tv_bg_1"
android:id="@+id/img_real_up"/>

<com.ruffian.library.widget.RTextView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/img_up_1"
app:layout_constraintTop_toBottomOf="@+id/tv_bg_1"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_below="@+id/img_up_1"
app:background_normal="@color/green01"
android:text="车头照"
app:corner_radius_bottom_left="@dimen/dp_5"
@@ -92,38 +105,50 @@
android:id="@+id/rcly2"
app:corner_radius="@dimen/dp_5"
app:background_normal="@color/photochoosebg">
<com.ruffian.library.widget.RImageView
<com.ruffian.library.widget.RTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:corner_radius_top_left="@dimen/dp_5"
app:corner_radius_top_right="@dimen/dp_5"
android:id="@+id/img_up_2"/>
android:id="@+id/tv_bg_2"/>
<com.ruffian.library.widget.RTextView
android:layout_width="@dimen/dp_25"
android:layout_height="@dimen/dp_25"
app:background_normal="@color/gray05"
app:layout_constraintTop_toTopOf="@+id/img_up_2"
app:layout_constraintBottom_toBottomOf="@+id/img_up_2"
app:layout_constraintLeft_toLeftOf="@+id/img_up_2"
app:layout_constraintRight_toRightOf="@+id/img_up_2"
app:layout_constraintTop_toTopOf="@+id/tv_bg_2"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_2"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_2"
app:layout_constraintRight_toRightOf="@+id/tv_bg_2"
app:corner_radius="@dimen/dp_12"
android:id="@+id/photo_bg2"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_obu_3"
app:layout_constraintTop_toTopOf="@+id/img_up_2"
app:layout_constraintBottom_toBottomOf="@+id/img_up_2"
app:layout_constraintLeft_toLeftOf="@+id/img_up_2"
app:layout_constraintRight_toRightOf="@+id/img_up_2"
app:layout_constraintTop_toTopOf="@+id/tv_bg_2"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_2"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_2"
app:layout_constraintRight_toRightOf="@+id/tv_bg_2"
android:id="@+id/img_photo2"/>

<!-- 图片加载view-->
<com.ruffian.library.widget.RImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
app:corner_radius_top_left="@dimen/dp_5"
app:corner_radius_top_right="@dimen/dp_5"
android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="@+id/tv_bg_2"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_2"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_2"
app:layout_constraintRight_toRightOf="@+id/tv_bg_2"
android:id="@+id/img_real_up_2"/>
<com.ruffian.library.widget.RTextView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/img_up_2"
app:layout_constraintTop_toBottomOf="@+id/tv_bg_2"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_below="@+id/img_up_2"
app:background_normal="@color/green01"
android:text="车身45°照"
app:corner_radius_bottom_left="@dimen/dp_5"
@@ -140,38 +165,50 @@
app:corner_radius="@dimen/dp_5"
android:id="@+id/rcly3"
app:background_normal="@color/photochoosebg">
<com.ruffian.library.widget.RImageView
<com.ruffian.library.widget.RTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:corner_radius_top_left="@dimen/dp_5"
app:corner_radius_top_right="@dimen/dp_5"
android:id="@+id/img_up_3"/>
android:id="@+id/tv_bg_3"/>
<com.ruffian.library.widget.RTextView
android:layout_width="@dimen/dp_25"
android:layout_height="@dimen/dp_25"
app:background_normal="@color/gray05"
app:layout_constraintTop_toTopOf="@+id/img_up_3"
app:layout_constraintBottom_toBottomOf="@+id/img_up_3"
app:layout_constraintLeft_toLeftOf="@+id/img_up_3"
app:layout_constraintRight_toRightOf="@+id/img_up_3"
app:layout_constraintTop_toTopOf="@+id/tv_bg_3"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_3"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_3"
app:layout_constraintRight_toRightOf="@+id/tv_bg_3"
app:corner_radius="@dimen/dp_12"
android:id="@+id/photo_bg3"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_obu_3"
app:layout_constraintTop_toTopOf="@+id/img_up_3"
app:layout_constraintBottom_toBottomOf="@+id/img_up_3"
app:layout_constraintLeft_toLeftOf="@+id/img_up_3"
app:layout_constraintRight_toRightOf="@+id/img_up_3"
app:layout_constraintTop_toTopOf="@+id/tv_bg_3"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_3"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_3"
app:layout_constraintRight_toRightOf="@+id/tv_bg_3"
android:id="@+id/img_photo3"/>

<!-- 图片加载view-->
<com.ruffian.library.widget.RImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
app:corner_radius_top_left="@dimen/dp_5"
app:corner_radius_top_right="@dimen/dp_5"
android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="@+id/tv_bg_3"
app:layout_constraintBottom_toBottomOf="@+id/tv_bg_3"
app:layout_constraintLeft_toLeftOf="@+id/tv_bg_3"
app:layout_constraintRight_toRightOf="@+id/tv_bg_3"
android:id="@+id/img_real_up_3"/>
<com.ruffian.library.widget.RTextView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/img_up_3"
app:layout_constraintTop_toBottomOf="@+id/tv_bg_3"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_below="@+id/img_up_2"
app:background_normal="@color/green01"
android:text="安装照"
app:corner_radius_bottom_left="@dimen/dp_5"

+ 2
- 2
app/src/main/res/layout-v4/activity_send_good_info.xml Parādīt failu

@@ -112,7 +112,7 @@
android:gravity="center_vertical"
style="@style/gray07TextStyle14"/>
<ImageView
android:layout_width="@dimen/dp_7"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_13"
android:src="@mipmap/the_right"/>
</LinearLayout>
@@ -247,7 +247,7 @@
android:gravity="center_vertical"
style="@style/gray07TextStyle14"/>
<ImageView
android:layout_width="@dimen/dp_7"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_13"
android:src="@mipmap/the_right"/>
</LinearLayout>

+ 16
- 0
app/src/main/res/layout-v5/item_old_car_layout_1.xml Parādīt failu

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<com.ruffian.library.widget.RRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:background_normal="@mipmap/ic_transfer_car_2"
app:background_unable="@mipmap/ic_transfer_car_1"
android:id="@+id/rrelative"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="贵A·123466"
android:layout_centerInParent="true"
android:id="@+id/tv_old_car_number"
style="@style/whiteTextStyle18"/>
</com.ruffian.library.widget.RRelativeLayout>

+ 128
- 0
app/src/main/res/layout/activity_cut_payment_account_change.xml Parādīt failu

@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:background="@color/background_color"
android:layout_height="match_parent"
tools:context=".project.ui.activity.transfer.CutPaymentAccountChangeActivity">
<com.hjq.bar.TitleBar
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:leftIcon="@mipmap/back_black"
app:lineVisible="false"
app:title="扣款账户变更"
app:titleColor="@color/black01" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="请确认签约信息"
style="@style/blackTextStyleBold16"
android:id="@+id/tv1"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_12"
android:layout_below="@+id/title"/>
<com.ruffian.library.widget.RLinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:background_normal="@color/white"
android:padding="@dimen/dp_15"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_below="@+id/tv1"
app:corner_radius="@dimen/dp_10"
android:orientation="vertical">
<LinearLayout
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="签约银行"
style="@style/black02TextStyle14"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="工商银行"
android:layout_weight="1"
android:gravity="right"
android:id="@+id/tv_qyyh"
style="@style/blackTextStyle14"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="签约时间"
style="@style/black02TextStyle14"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2022-10-11:12:11:14"
android:layout_weight="1"
android:gravity="right"
android:id="@+id/tv_qysj"
style="@style/blackTextStyle14"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="卡号"
style="@style/black02TextStyle14"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="12365479998745632"
android:layout_weight="1"
android:gravity="right"
android:id="@+id/tv_qykh"
style="@style/blackTextStyle14"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="车牌号"
style="@style/black02TextStyle14"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="贵A123654"
android:layout_weight="1"
android:gravity="right"
android:id="@+id/tv_qycph"
style="@style/blackTextStyle14"/>
</LinearLayout>
</com.ruffian.library.widget.RLinearLayout>
<com.ruffian.library.widget.RTextView
android:layout_width="@dimen/dp_150"
android:layout_height="@dimen/dp_40"
app:background_normal="@color/green01"
app:corner_radius="@dimen/dp_20"
android:text="下一步"
android:id="@+id/btn_next"
style="@style/whiteTextStyle15"
android:gravity="center"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_37"/>
</RelativeLayout>

+ 1300
- 0
app/src/main/res/layout/activity_etctransfer_old_car.xml
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


Binārs
app/src/main/res/mipmap-xhdpi/ic_transfer_car_1.png Parādīt failu


Binārs
app/src/main/res/mipmap-xhdpi/ic_transfer_car_2.png Parādīt failu


+ 4
- 0
app/src/main/res/values/styles.xml Parādīt failu

@@ -172,6 +172,10 @@
<item name="android:textSize"> @dimen/sp_18</item>
<item name="android:textStyle">bold</item>
</style>
<style name="whiteTextStyle18">
<item name="android:textColor" >@color/white</item>
<item name="android:textSize"> @dimen/sp_18</item>
</style>
<!-- 绿色-->
<style name="greenTextStyleBold20">
<item name="android:textColor">@color/green01</item>

Notiek ielāde…
Atcelt
Saglabāt