Explorar el Código
Merge branch 'master' of http://192.168.40.220/dmc/jz_app
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.javamaster
huting
hace 2 años
Se han modificado 21 ficheros con 1208 adiciones y 116 borrados
+ 67
- 83
app/src/main/AndroidManifest.xml
Ver fichero
| @@ -230,6 +230,30 @@ | |||
| android:name=".project.ui.activity.FillOutMessage" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> <!-- 车辆信息填写 --> | |||
| <activity | |||
| android:name=".project.ui.activity.card.ValueToBookkeepingRefundActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" | |||
| android:exported="false"> | |||
| </activity> | |||
| <activity | |||
| android:name=".project.ui.activity.card.ValueToBookkeepingExpireActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" | |||
| android:exported="false"> | |||
| </activity> | |||
| <activity | |||
| android:name=".project.ui.activity.card.ValueToBookkeepingVerifyActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" | |||
| android:exported="false"> | |||
| </activity> | |||
| <activity | |||
| android:name=".project.ui.activity.card.ValueToBookkeepingCardActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" | |||
| android:exported="false"> | |||
| </activity> | |||
| <activity | |||
| android:name=".project.ui.activity.evaluate.YwblEvaluateActivity" | |||
| android:exported="false" | |||
| @@ -242,44 +266,49 @@ | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"> <!-- 业务员服务评价 --> | |||
| </activity> | |||
| <activity android:name=".project.ui.activity.obu.ObuActivationHintActivity" | |||
| <activity | |||
| android:name=".project.ui.activity.obu.ObuActivationHintActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"><!-- obu温馨提示 --> | |||
| android:screenOrientation="portrait"> <!-- obu温馨提示 --> | |||
| </activity> | |||
| <activity android:name=".project.ui.activity.obu.ObuActivationUploadActivity" | |||
| <activity | |||
| android:name=".project.ui.activity.obu.ObuActivationUploadActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"><!-- obu图片上传 --> | |||
| android:screenOrientation="portrait"> <!-- obu图片上传 --> | |||
| </activity> | |||
| <activity android:name=".project.ui.activity.obu.ObuActivationBLESearchActivity" | |||
| <activity | |||
| android:name=".project.ui.activity.obu.ObuActivationBLESearchActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"><!-- obu蓝牙搜索 --> | |||
| android:screenOrientation="portrait"> <!-- obu蓝牙搜索 --> | |||
| </activity> | |||
| <activity android:name=".project.ui.activity.obu.ObuActivationChooseActivity" | |||
| <activity | |||
| android:name=".project.ui.activity.obu.ObuActivationChooseActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"><!-- obu蓝牙设备选择 --> | |||
| android:screenOrientation="portrait"> <!-- obu蓝牙设备选择 --> | |||
| </activity> | |||
| <activity android:name=".project.ui.activity.obu.ObuActivationSuccessOrFailActivity" | |||
| <activity | |||
| android:name=".project.ui.activity.obu.ObuActivationSuccessOrFailActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"><!-- obu激活成功或失败 --> | |||
| android:screenOrientation="portrait"> <!-- obu激活成功或失败 --> | |||
| </activity> | |||
| <activity android:name=".project.ui.activity.obu.SendGoodInfoActivity" | |||
| <activity | |||
| android:name=".project.ui.activity.obu.SendGoodInfoActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"><!-- 发货信息 --> | |||
| android:screenOrientation="portrait"> <!-- 发货信息 --> | |||
| </activity> | |||
| <activity android:name=".project.ui.activity.obu.SendGoodSuccessActivity" | |||
| <activity | |||
| android:name=".project.ui.activity.obu.SendGoodSuccessActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"><!-- 发货成功 --> | |||
| android:screenOrientation="portrait"> <!-- 发货成功 --> | |||
| </activity> | |||
| <activity | |||
| android:name=".project.ui.activity.evaluate.UserEvaluateActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 发布评价 --> | |||
| android:screenOrientation="portrait" /> <!-- 发布评价 --> | |||
| <activity | |||
| android:name=".project.ui.activity.evaluate.ProductPublishPJActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 问题建议 --> | |||
| android:screenOrientation="portrait" /> <!-- 问题建议 --> | |||
| <activity | |||
| android:name=".project.ui.activity.evaluate.QuestionAndSuggestionActivity" | |||
| android:launchMode="singleTop" | |||
| @@ -371,100 +400,80 @@ | |||
| <activity | |||
| android:name=".project.ui.activity.mail.InfoTabActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 审核第一步 --> | |||
| android:screenOrientation="portrait" /> <!-- 审核第一步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.AuditingStep1Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 审核第2步 --> | |||
| android:screenOrientation="portrait" /> <!-- 审核第2步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.AuditingStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 充值记录 --> | |||
| android:screenOrientation="portrait" /> <!-- 充值记录 --> | |||
| <activity | |||
| android:name=".project.ui.activity.after.RechargeRecordActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 申请退款 --> | |||
| android:screenOrientation="portrait" /> <!-- 申请退款 --> | |||
| <activity | |||
| android:name=".project.ui.activity.after.ApplyReturnMoneyActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 撤销圈存 --> | |||
| android:screenOrientation="portrait" /> <!-- 撤销圈存 --> | |||
| <activity | |||
| android:name=".project.ui.activity.after.UndoLoopActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 忘记密码第一步 --> | |||
| android:screenOrientation="portrait" /> <!-- 忘记密码第一步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.user.ForgetPwdStep1Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 忘记密码第二步 --> | |||
| android:screenOrientation="portrait" /> <!-- 忘记密码第二步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.user.ForgetPwdStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" | |||
| android:windowSoftInputMode="adjustPan" /> | |||
| <!-- 忘记密码第三步 --> | |||
| android:windowSoftInputMode="adjustPan" /> <!-- 忘记密码第三步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.user.ForgetPwdStep3Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 修改密码 --> | |||
| android:screenOrientation="portrait" /> <!-- 修改密码 --> | |||
| <activity | |||
| android:name=".project.ui.activity.user.EditPwdActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 申请换货第一步 --> | |||
| android:screenOrientation="portrait" /> <!-- 申请换货第一步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.ApplyExGoodsStep1Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 申请换货第二步 --> | |||
| android:screenOrientation="portrait" /> <!-- 申请换货第二步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.ApplyExGoodsStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 申请退货第1步 --> | |||
| android:screenOrientation="portrait" /> <!-- 申请退货第1步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.ApplyReturnGoodsStep1Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 申请退货第2步 --> | |||
| android:screenOrientation="portrait" /> <!-- 申请退货第2步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.ApplyReturnGoodsStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 取消订单第1步 --> | |||
| android:screenOrientation="portrait" /> <!-- 取消订单第1步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.CancelOrderStep1Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 取消订单第2步 --> | |||
| android:screenOrientation="portrait" /> <!-- 取消订单第2步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.CancelOrderStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 确认收货第1步 --> | |||
| android:screenOrientation="portrait" /> <!-- 确认收货第1步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.ConfirmReceiveGoodsStep1Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 确认收货第2步 --> | |||
| android:screenOrientation="portrait" /> <!-- 确认收货第2步 --> | |||
| <activity | |||
| android:name=".project.ui.activity.order.ConfirmReceiveGoodsStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!-- 查看物流 --> | |||
| android:screenOrientation="portrait" /> <!-- 查看物流 --> | |||
| <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" | |||
| @@ -473,31 +482,6 @@ | |||
| android:name=".project.ui.activity.after.ReplaceEtcStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!--ETC注销--> | |||
| <activity | |||
| android:name=".project.ui.activity.after.SearchCarInfoActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <activity | |||
| android:name=".project.ui.activity.after.LogoutEtcActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <activity | |||
| android:name=".project.ui.activity.after.LogoutEtcInfoConfirmActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <activity | |||
| android:name=".project.ui.activity.after.LogoutEtcPayActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <activity | |||
| android:name=".project.ui.activity.after.LogoutEtcReturnMoneyActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <activity | |||
| android:name=".project.ui.activity.after.LogoutEtcSuccessActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| </application> | |||
| </manifest> | |||
| </manifest> | |||
+ 44
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/card/ValueToBookkeepingCardActivity.java
Ver fichero
| @@ -0,0 +1,44 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.card; | |||
| import androidx.appcompat.app.AppCompatActivity; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import com.huntersun.vkyes.etcopencard.databinding.ActivityValueToBookkeepingCardBinding; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * | |||
| * @ClassName: ValueToBookkeepingCardActivity | |||
| * @Description: 储值卡转记账卡基础信息 | |||
| * @Author: lujin | |||
| * @CreateDate: 2023/3/16 10:12 | |||
| */ | |||
| public class ValueToBookkeepingCardActivity extends AppActivity { | |||
| private ActivityValueToBookkeepingCardBinding binding; | |||
| @Override | |||
| protected View getLayoutView() { | |||
| binding = ActivityValueToBookkeepingCardBinding.inflate(getLayoutInflater()); | |||
| return binding.getRoot(); | |||
| } | |||
| @Override | |||
| protected void initView() { | |||
| setTitle("储值卡转记账卡"); | |||
| binding.btnNext.setOnClickListener(this); | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| @Override | |||
| public void onClick(View view) { | |||
| if (view==binding.btnNext){ | |||
| startActivity(ValueToBookkeepingVerifyActivity.class); | |||
| } | |||
| } | |||
| } | |||
+ 44
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/card/ValueToBookkeepingExpireActivity.java
Ver fichero
| @@ -0,0 +1,44 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.card; | |||
| import androidx.appcompat.app.AppCompatActivity; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import com.huntersun.vkyes.etcopencard.databinding.ActivityValueToBookkeepingExpireBinding; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * | |||
| * @ClassName: ValueToBookkeepingExpireActivity | |||
| * @Description: 储值卡转记账卡原卡过期 | |||
| * @Author: lujin | |||
| * @CreateDate: 2023/3/16 11:41 | |||
| */ | |||
| public class ValueToBookkeepingExpireActivity extends AppActivity { | |||
| private ActivityValueToBookkeepingExpireBinding binding; | |||
| @Override | |||
| protected View getLayoutView() { | |||
| binding = ActivityValueToBookkeepingExpireBinding.inflate(getLayoutInflater()); | |||
| return binding.getRoot(); | |||
| } | |||
| @Override | |||
| protected void initView() { | |||
| setTitle("储值卡转记账卡"); | |||
| binding.btnMakePayCode.setOnClickListener(this); | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| @Override | |||
| public void onClick(View view) { | |||
| if (view==binding.btnMakePayCode){ | |||
| startActivity(ValueToBookkeepingRefundActivity.class); | |||
| } | |||
| } | |||
| } | |||
+ 37
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/card/ValueToBookkeepingRefundActivity.java
Ver fichero
| @@ -0,0 +1,37 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.card; | |||
| import androidx.appcompat.app.AppCompatActivity; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import com.huntersun.vkyes.etcopencard.R; | |||
| import com.huntersun.vkyes.etcopencard.databinding.ActivityValueToBookkeepingRefundBinding; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * @ClassName: ValueToBookkeepingRefundActivity | |||
| * @Description: 储值卡转记账卡退费 | |||
| * @Author: lujin | |||
| * @CreateDate: 2023/3/16 14:36 | |||
| */ | |||
| public class ValueToBookkeepingRefundActivity extends AppActivity { | |||
| private ActivityValueToBookkeepingRefundBinding binding; | |||
| @Override | |||
| protected View getLayoutView() { | |||
| binding = ActivityValueToBookkeepingRefundBinding.inflate(getLayoutInflater()); | |||
| return binding.getRoot(); | |||
| } | |||
| @Override | |||
| protected void initView() { | |||
| setTitle("储值卡转记账卡"); | |||
| binding.rrelative.getHelper().setBackgroundColorNormalArray(this.getResources().getIntArray(R.array.green01_40_to_white)); | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| } | |||
+ 50
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/card/ValueToBookkeepingVerifyActivity.java
Ver fichero
| @@ -0,0 +1,50 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.card; | |||
| import androidx.appcompat.app.AppCompatActivity; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import com.huntersun.vkyes.etcopencard.databinding.ActivityValueToBookkeepingVerifyBinding; | |||
| import com.huntersun.vkyes.etcopencard.project.utils.CountDownTimerUtils; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * | |||
| * @ClassName: ValueToBookkeepingVerifyActivity | |||
| * @Description: 储值卡转记账卡账号验证 | |||
| * @Author: lujin | |||
| * @CreateDate: 2023/3/16 11:05 | |||
| */ | |||
| public class ValueToBookkeepingVerifyActivity extends AppActivity { | |||
| private ActivityValueToBookkeepingVerifyBinding binding; | |||
| private CountDownTimerUtils timeDown; | |||
| @Override | |||
| protected View getLayoutView() { | |||
| binding = ActivityValueToBookkeepingVerifyBinding.inflate(getLayoutInflater()); | |||
| return binding.getRoot(); | |||
| } | |||
| @Override | |||
| protected void initView() { | |||
| setTitle("储值卡转记账卡"); | |||
| binding.btnCode.setOnClickListener(this); | |||
| binding.btnCommit.setOnClickListener(this); | |||
| timeDown = new CountDownTimerUtils(binding.btnCode,60000,1000); | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| @Override | |||
| public void onClick(View view) { | |||
| if (view==binding.btnCode){ | |||
| timeDown.start(); | |||
| }else if(view==binding.btnCommit){ | |||
| startActivity(ValueToBookkeepingExpireActivity.class); | |||
| } | |||
| } | |||
| } | |||
+ 5
- 28
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java
Ver fichero
| @@ -1,6 +1,5 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.fragment; | |||
| import android.os.Bundle; | |||
| import android.text.Editable; | |||
| import android.text.TextUtils; | |||
| import android.text.TextWatcher; | |||
| @@ -18,9 +17,8 @@ import com.huntersun.vkyes.etcopencard.project.ui.activity.MainActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.after.CancellationActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.after.DevicePendingActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.after.EquipmentLossReportActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.after.SearchCarInfoActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.after.ReplaceEtcStep1Activity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.after.TopUpActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.card.ValueToBookkeepingCardActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.evaluate.UserEvaluateActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.InfoTabActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.ListDeliveryActivity; | |||
| @@ -37,8 +35,6 @@ import java.util.List; | |||
| */ | |||
| public class FragmentHomeTow extends TitleBarFragment<MainActivity> { | |||
| private FragmentHomeFiveBinding binding; | |||
| private Bundle bundle; | |||
| private final Object[][] menu = { | |||
| {R.mipmap.card1, "卡签查询"}, | |||
| {R.mipmap.card2, "发货管理"}, | |||
| @@ -48,10 +44,7 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> { | |||
| {R.mipmap.card6, "设备挂起"}, | |||
| {R.mipmap.card7, "满意度评价"}, | |||
| {R.mipmap.card8, "设备激活"}, | |||
| {R.mipmap.card10, "更换ETC"}, | |||
| {R.mipmap.card9, "ETC注销"}, | |||
| {R.mipmap.card11, "欠费补缴"}, | |||
| {R.mipmap.card12, "余额补领"}, | |||
| {R.mipmap.card9, "储值卡测"} | |||
| }; | |||
| public static AppFragment<MainActivity> newInstance() { | |||
| @@ -151,23 +144,8 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> { | |||
| case "设备激活": | |||
| startActivity(ObuActivationHintActivity.class); | |||
| break; | |||
| case "更换ETC": | |||
| startActivity(ReplaceEtcStep1Activity.class); | |||
| break; | |||
| case "ETC注销": | |||
| bundle = new Bundle(); | |||
| bundle.putString("from","0"); | |||
| jumpToPage(SearchCarInfoActivity.class,bundle); | |||
| break; | |||
| case "欠费补缴": | |||
| bundle = new Bundle(); | |||
| bundle.putString("from","1"); | |||
| jumpToPage(SearchCarInfoActivity.class,bundle); | |||
| break; | |||
| case "余额补领": | |||
| bundle = new Bundle(); | |||
| bundle.putString("from","2"); | |||
| jumpToPage(SearchCarInfoActivity.class,bundle); | |||
| case "储值卡测": | |||
| startActivity(ValueToBookkeepingCardActivity.class); | |||
| break; | |||
| default: | |||
| new Utils().showMessDialog(getActivity(), "功能正在开发中..."); | |||
| @@ -177,6 +155,5 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> { | |||
| }); | |||
| } | |||
| }; | |||
| } | |||
+ 48
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/utils/CountDownTimerUtils.java
Ver fichero
| @@ -0,0 +1,48 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.utils; | |||
| import android.graphics.Color; | |||
| import android.os.CountDownTimer; | |||
| import android.text.SpannableString; | |||
| import android.widget.TextView; | |||
| /** | |||
| * created by pxh | |||
| * use:倒计时工具 | |||
| * <p> | |||
| * on 2019/7/30. | |||
| */ | |||
| public class CountDownTimerUtils extends CountDownTimer { | |||
| private TextView mTextView; | |||
| /** | |||
| * @param millisInFuture The number of millis in the future from the call | |||
| * to {@link #start()} until the countdown is done and {@link #onFinish()} | |||
| * is called. | |||
| * @param countDownInterval The interval along the way to receive | |||
| * {@link #onTick(long)} callbacks. | |||
| */ | |||
| public CountDownTimerUtils(TextView textView, long millisInFuture, long countDownInterval) { | |||
| super(millisInFuture, countDownInterval); | |||
| this.mTextView = textView; | |||
| } | |||
| @Override | |||
| public void onTick(long millisUntilFinished) { | |||
| mTextView.setClickable(false); //设置不可点击 | |||
| mTextView.setText(millisUntilFinished / 1000 + "s后重试"); //设置倒计时时间 | |||
| mTextView.setBackgroundColor(Color.parseColor("#cccccc")); //设置按钮为灰色，这时是不能点击的 | |||
| SpannableString spannableString = new SpannableString(mTextView.getText().toString()); //获取按钮上的文字 | |||
| // ForegroundColorSpan span = new ForegroundColorSpan(Color.RED); | |||
| // spannableString.setSpan(span, 0, 2, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);//将倒计时的时间设置为红色 | |||
| mTextView.setText(spannableString); | |||
| } | |||
| @Override | |||
| public void onFinish() { | |||
| mTextView.setText("重 新 获 取"); | |||
| mTextView.setClickable(true);//重新获得点击 | |||
| mTextView.setBackgroundColor(Color.parseColor("#00B38B")); //还原背景色 | |||
| } | |||
| } | |||
+ 1
- 0
app/src/main/res/layout-v4/activity_obu_activation_upload.xml
Ver fichero
| @@ -184,6 +184,7 @@ | |||
| android:layout_below="@+id/rrelative" | |||
| android:layout_marginLeft="@dimen/dp_20" | |||
| android:text="请打开手机蓝牙后再进行下一步操作" | |||
| android:gravity="center_vertical" | |||
| style="@style/orangeTextStyle10" | |||
| android:drawableLeft="@mipmap/tips" | |||
| android:drawablePadding="@dimen/dp_10"/> | |||
+ 2
- 0
app/src/main/res/layout-v4/activity_send_good_info.xml
Ver fichero
| @@ -61,6 +61,7 @@ | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:button="@null" | |||
| android:background="@color/white" | |||
| android:drawableLeft="@drawable/radio_btn_1" | |||
| android:drawablePadding="@dimen/dp_12" | |||
| android:text="线上" /> | |||
| @@ -70,6 +71,7 @@ | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginLeft="@dimen/dp_20" | |||
| android:background="@color/white" | |||
| android:button="@null" | |||
| android:drawableLeft="@drawable/radio_btn_1" | |||
| android:drawablePadding="@dimen/dp_12" | |||
+ 318
- 0
app/src/main/res/layout/activity_value_to_bookkeeping_card.xml
Ver fichero
| @@ -0,0 +1,318 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <LinearLayout 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:orientation="vertical" | |||
| android:layout_height="match_parent" | |||
| android:background="@color/background_color" | |||
| tools:context=".project.ui.activity.card.ValueToBookkeepingCardActivity"> | |||
| <com.hjq.bar.TitleBar | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/white" | |||
| app:leftIcon="@mipmap/back_black" | |||
| app:lineVisible="false" | |||
| app:title="储值卡转记账卡" | |||
| app:titleColor="@color/black01" /> | |||
| <androidx.core.widget.NestedScrollView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:orientation="vertical"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_35" | |||
| android:gravity="center_vertical" | |||
| android:layout_marginTop="@dimen/dp_20" | |||
| android:layout_marginLeft="@dimen/dp_27" | |||
| android:orientation="horizontal" | |||
| android:padding="@dimen/dp_2"> | |||
| <LinearLayout | |||
| android:layout_width="0dp" | |||
| android:layout_height="match_parent" | |||
| android:layout_weight="1" | |||
| android:background="@drawable/item_home_frame3" | |||
| android:gravity="center_vertical" | |||
| android:paddingHorizontal="@dimen/dp_12"> | |||
| <ImageView | |||
| android:layout_width="18dp" | |||
| android:layout_height="@dimen/sp_15" | |||
| android:src="@drawable/search_ic" /> | |||
| <com.hjq.widget.view.ClearEditText | |||
| android:id="@+id/edit_query" | |||
| style="@style/EditTextStyle" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:hint="请输入订单编号/车牌号" | |||
| android:textSize="@dimen/sp_12" | |||
| android:imeActionLabel="Search" | |||
| android:imeOptions="actionSearch" | |||
| android:inputType="text" | |||
| android:paddingVertical="0dp" | |||
| android:singleLine="true" /> | |||
| </LinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="搜索" | |||
| style="@style/greenTextStyle14" | |||
| android:paddingLeft="@dimen/dp_14" | |||
| android:paddingRight="@dimen/dp_23" | |||
| android:id="@+id/btn_search"/> | |||
| </LinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="基础信息" | |||
| style="@style/blackTextStyleBold16" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:layout_marginBottom="@dimen/dp_12"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| app:background_normal="@color/white" | |||
| app:corner_radius="@dimen/dp_10" | |||
| android:padding="@dimen/dp_15" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:layout_marginRight="@dimen/dp_15" | |||
| 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="12563569" | |||
| android:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_ddbh" | |||
| 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="张三" | |||
| android:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_username" | |||
| 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="二代身份证" | |||
| android:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_user_zjlx" | |||
| 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="5115***********125" | |||
| android:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_user_zjh" | |||
| 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="贵A456325" | |||
| android:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_ddcph" | |||
| 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="客车" | |||
| android:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_sfcx" | |||
| style="@style/blackTextStyle14"/> | |||
| </LinearLayout> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="卡信息" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:layout_marginBottom="@dimen/dp_11" | |||
| style="@style/blackTextStyleBold16"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical" | |||
| app:background_normal="@color/white" | |||
| app:corner_radius="@dimen/dp_10" | |||
| android:paddingLeft="@dimen/dp_20" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:layout_marginRight="@dimen/dp_15"> | |||
| <com.ruffian.library.widget.RRelativeLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| app:background_normal="@color/green01_05" | |||
| android:padding="@dimen/dp_15" | |||
| app:corner_radius="@dimen/dp_5" | |||
| app:border_width_normal="1dp" | |||
| app:border_color_normal="@color/green01"> | |||
| <ImageView | |||
| android:layout_width="@dimen/dp_66" | |||
| android:layout_height="@dimen/dp_45" | |||
| android:id="@+id/img1" | |||
| android:src="@mipmap/ic_value_card_1"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="卡号:" | |||
| android:layout_toRightOf="@+id/img1" | |||
| android:id="@+id/tv1" | |||
| style="@style/greenTextStyle13" | |||
| android:layout_marginLeft="@dimen/dp_14"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="125359643" | |||
| android:layout_toRightOf="@+id/tv1" | |||
| android:id="@+id/tv_value_kh" | |||
| style="@style/greenTextStyle13" | |||
| android:layout_marginLeft="@dimen/dp_5"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="卡类型:" | |||
| android:layout_toRightOf="@+id/img1" | |||
| android:layout_below="@+id/tv1" | |||
| android:id="@+id/tv2" | |||
| style="@style/greenTextStyle13" | |||
| android:layout_marginLeft="@dimen/dp_14"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="储值卡" | |||
| android:layout_toRightOf="@+id/tv2" | |||
| android:layout_below="@+id/tv1" | |||
| android:id="@+id/tv_value_klx" | |||
| style="@style/greenTextStyle13" | |||
| android:layout_marginLeft="@dimen/dp_5"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="卡状态:" | |||
| android:layout_toRightOf="@+id/img1" | |||
| android:layout_below="@+id/tv2" | |||
| android:id="@+id/tv3" | |||
| style="@style/greenTextStyle13" | |||
| android:layout_marginLeft="@dimen/dp_14"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="激活" | |||
| android:layout_toRightOf="@+id/tv3" | |||
| android:layout_below="@id/tv2" | |||
| android:id="@+id/tv_value_kzt" | |||
| style="@style/greenTextStyle13" | |||
| android:layout_marginLeft="@dimen/dp_5"/> | |||
| </com.ruffian.library.widget.RRelativeLayout> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="办理须知" | |||
| android:layout_marginTop="@dimen/dp_13" | |||
| android:layout_marginLeft="@dimen/dp_26" | |||
| android:layout_marginRight="@dimen/dp_26" | |||
| style="@style/blackTextStyle14"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="@string/value_to_bookkeeping_tips" | |||
| android:layout_marginLeft="@dimen/dp_26" | |||
| android:layout_marginRight="@dimen/dp_26" | |||
| style="@style/black02TextStyle12"/> | |||
| <com.ruffian.library.widget.RTextView | |||
| android:layout_width="@dimen/dp_150" | |||
| android:layout_height="@dimen/dp_40" | |||
| app:background_normal="@color/green01" | |||
| android:gravity="center" | |||
| android:layout_gravity="center_horizontal" | |||
| app:corner_radius="@dimen/dp_20" | |||
| android:text="下一步" | |||
| android:id="@+id/btn_next" | |||
| style="@style/whiteTextStyle15" | |||
| android:layout_marginTop="@dimen/dp_76" | |||
| android:layout_marginBottom="@dimen/dp_56"/> | |||
| </LinearLayout> | |||
| </androidx.core.widget.NestedScrollView> | |||
| </LinearLayout> | |||
+ 227
- 0
app/src/main/res/layout/activity_value_to_bookkeeping_expire.xml
Ver fichero
| @@ -0,0 +1,227 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <LinearLayout 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:layout_height="match_parent" | |||
| android:orientation="vertical" | |||
| android:background="@color/background_color" | |||
| tools:context=".project.ui.activity.card.ValueToBookkeepingExpireActivity"> | |||
| <com.hjq.bar.TitleBar | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/white" | |||
| app:leftIcon="@mipmap/back_black" | |||
| app:lineVisible="false" | |||
| android:id="@+id/title" | |||
| app:title="储值卡转记账卡" | |||
| app:titleColor="@color/black01" /> | |||
| <androidx.core.widget.NestedScrollView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:orientation="vertical"> | |||
| <ImageView | |||
| android:layout_width="@dimen/dp_111" | |||
| android:layout_height="@dimen/dp_76" | |||
| android:layout_gravity="center_horizontal" | |||
| android:layout_marginTop="@dimen/dp_20" | |||
| android:src="@mipmap/ic_value_card_2"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_gravity="center_horizontal" | |||
| android:text="系统检测到您原卡已过期，需要缴纳设备费用" | |||
| style="@style/greenTextStyle12" | |||
| android:layout_marginTop="@dimen/dp_20" | |||
| android:id="@+id/tv_value_card_expire"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_margin="@dimen/dp_15" | |||
| app:background_normal="@color/white" | |||
| app:corner_radius="@dimen/dp_10" | |||
| android:orientation="vertical"> | |||
| <com.ruffian.library.widget.RRelativeLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:padding="@dimen/dp_15" | |||
| android:layout_marginLeft="@dimen/dp_20" | |||
| android:layout_marginRight="@dimen/dp_20" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| app:border_color_normal="@color/blue01" | |||
| app:border_width_normal="@dimen/dp_0_5" | |||
| app:corner_radius="@dimen/dp_5"> | |||
| <ImageView | |||
| android:layout_width="@dimen/dp_69" | |||
| android:layout_height="@dimen/dp_43" | |||
| android:id="@+id/img1" | |||
| android:src="@mipmap/ic_value_card_3"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_toRightOf="@+id/img1" | |||
| android:text="更换ETC设备" | |||
| style="@style/blueTextStyle14" | |||
| android:layout_marginLeft="@dimen/dp_14" | |||
| android:id="@+id/tv1"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="图片仅供参考，以实际产品为准" | |||
| android:layout_alignLeft="@+id/tv1" | |||
| style="@style/blue01_50TextStyle10" | |||
| android:layout_alignBottom="@+id/img1"/> | |||
| </com.ruffian.library.widget.RRelativeLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingBottom="@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:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_cpje" | |||
| android:text="￥99.00" | |||
| style="@style/blackTextStyle14"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingBottom="@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:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_yf" | |||
| android:text="￥0.00" | |||
| style="@style/blackTextStyle14"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingBottom="@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:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_yhj" | |||
| android:text="暂无优惠券" | |||
| style="@style/blackTextStyle14"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingBottom="@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:layout_weight="1" | |||
| android:gravity="right" | |||
| android:id="@+id/tv_jfdh" | |||
| android:text="暂无积分" | |||
| style="@style/blackTextStyle14"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:gravity="right" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="实付款：" | |||
| style="@style/blackTextStyle14"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/tv_sfk" | |||
| android:text="￥143.00" | |||
| android:layout_marginLeft="@dimen/dp_5" | |||
| style="@style/greenTextStyle14"/> | |||
| </LinearLayout> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <com.ruffian.library.widget.RTextView | |||
| android:layout_width="@dimen/dp_150" | |||
| android:layout_height="@dimen/dp_40" | |||
| android:layout_marginTop="@dimen/dp_68" | |||
| android:layout_marginBottom="@dimen/dp_37" | |||
| app:background_normal="@color/green01" | |||
| android:layout_gravity="center_horizontal" | |||
| app:corner_radius="@dimen/dp_20" | |||
| android:id="@+id/btn_make_pay_code" | |||
| android:text="生成支付二维码" | |||
| android:gravity="center" | |||
| style="@style/whiteTextStyle15"/> | |||
| </LinearLayout> | |||
| </androidx.core.widget.NestedScrollView> | |||
| </LinearLayout> | |||
+ 212
- 0
app/src/main/res/layout/activity_value_to_bookkeeping_refund.xml
Ver fichero
| @@ -0,0 +1,212 @@ | |||
| <?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:layout_height="match_parent" | |||
| android:orientation="vertical" | |||
| android:background="@color/background_color" | |||
| tools:context=".project.ui.activity.card.ValueToBookkeepingRefundActivity"> | |||
| <com.hjq.bar.TitleBar | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/white" | |||
| app:leftIcon="@mipmap/back_black" | |||
| app:lineVisible="false" | |||
| android:id="@+id/title" | |||
| app:title="储值卡转记账卡" | |||
| app:titleColor="@color/black01" /> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/rrelative" | |||
| android:layout_below="@+id/title" | |||
| android:orientation="vertical" | |||
| app:corner_radius="@dimen/dp_10" | |||
| app:gradient_centerY="0.5" | |||
| app:gradient_type="linear" | |||
| app:gradient_orientation="TOP_BOTTOM" | |||
| android:paddingBottom="@dimen/dp_20" | |||
| android:layout_margin="@dimen/dp_15"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:gravity="center_vertical" | |||
| android:paddingTop="@dimen/dp_13" | |||
| android:paddingBottom="@dimen/dp_13" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="提示" | |||
| style="@style/greenTextStyleBold14" | |||
| android:layout_marginLeft="@dimen/dp_22" | |||
| android:layout_weight="1" | |||
| android:id="@+id/tv1"/> | |||
| <ImageView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:src="@mipmap/ic_value_card_4" | |||
| android:layout_marginRight="@dimen/dp_32"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:background="@color/green01" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="match_parent" | |||
| android:layout_marginTop="@dimen/dp_14" | |||
| android:text="检测到您的ETC卡中还剩余额100.00元，我们将于14个工作日争议期后退回到您的银行卡中，这里将收集您的收款信息，具体金额可能会出现增多或减少情况，敬请谅解！" | |||
| android:layout_marginLeft="@dimen/dp_22" | |||
| style="@style/blackTextStyle12" | |||
| android:layout_marginRight="@dimen/dp_22"/> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="请输入退费信息" | |||
| android:id="@+id/tv2" | |||
| android:layout_below="@+id/rrelative" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| style="@style/blackTextStyleBold16"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| app:background_normal="@color/white" | |||
| android:layout_marginTop="@dimen/dp_13" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:layout_marginRight="@dimen/dp_15" | |||
| android:layout_below="@+id/tv2" | |||
| app:corner_radius="10dp" | |||
| android:orientation="vertical"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="联系人姓名" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingTop="@dimen/dp_15" | |||
| style="@style/blackTextStyle14"/> | |||
| <EditText | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:background="@color/white" | |||
| android:gravity="right" | |||
| android:hint="请输入" | |||
| style="@style/black02TextStyle14" | |||
| android:textColorHint="@color/gray07" | |||
| android:id="@+id/et_lxr_name"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="手机号" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingTop="@dimen/dp_15" | |||
| style="@style/blackTextStyle14"/> | |||
| <EditText | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:background="@color/white" | |||
| android:gravity="right" | |||
| android:hint="请输入" | |||
| style="@style/black02TextStyle14" | |||
| android:textColorHint="@color/gray07" | |||
| android:id="@+id/et_lxr_phone"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="开户行" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingTop="@dimen/dp_15" | |||
| style="@style/blackTextStyle14"/> | |||
| <EditText | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:background="@color/white" | |||
| android:gravity="right" | |||
| android:hint="请输入" | |||
| style="@style/black02TextStyle14" | |||
| android:textColorHint="@color/gray07" | |||
| android:id="@+id/et_lxr_khh"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_10" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="退费银行卡号" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingTop="@dimen/dp_15" | |||
| style="@style/blackTextStyle14"/> | |||
| <EditText | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:background="@color/white" | |||
| android:gravity="right" | |||
| android:hint="请输入" | |||
| style="@style/black02TextStyle14" | |||
| android:textColorHint="@color/gray07" | |||
| android:id="@+id/et_lxr_yhkh"/> | |||
| </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" | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_marginBottom="@dimen/dp_37" | |||
| android:layout_centerHorizontal="true" | |||
| app:corner_radius="@dimen/dp_20" | |||
| android:text="下一步" | |||
| android:gravity="center" | |||
| style="@style/whiteTextStyle15" | |||
| android:id="@+id/btn_next"/> | |||
| </RelativeLayout> | |||
+ 111
- 0
app/src/main/res/layout/activity_value_to_bookkeeping_verify.xml
Ver fichero
| @@ -0,0 +1,111 @@ | |||
| <?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:layout_height="match_parent" | |||
| android:background="@color/background_color" | |||
| tools:context=".project.ui.activity.card.ValueToBookkeepingVerifyActivity"> | |||
| <com.hjq.bar.TitleBar | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/white" | |||
| app:leftIcon="@mipmap/back_black" | |||
| app:lineVisible="false" | |||
| android:id="@+id/title" | |||
| app:title="储值卡转记账卡" | |||
| app:titleColor="@color/black01" /> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="账号验证" | |||
| android:layout_below="@+id/title" | |||
| style="@style/blackTextStyleBold16" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:id="@+id/tv1"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/tv2" | |||
| android:layout_below="@+id/tv1" | |||
| android:text="请在下方输入验证码" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:layout_marginTop="@dimen/dp_11" | |||
| style="@style/black02TextStyle13"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_below="@+id/tv2" | |||
| app:background_normal="@color/white" | |||
| android:orientation="vertical" | |||
| android:layout_marginLeft="@dimen/dp_15" | |||
| android:layout_marginRight="@dimen/dp_15" | |||
| android:layout_marginTop="@dimen/dp_18" | |||
| app:corner_radius="@dimen/dp_10"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:padding="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="@dimen/dp_108" | |||
| android:layout_height="wrap_content" | |||
| android:text="手机号码" | |||
| style="@style/black02TextStyle14"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="反显手机号，不可修改" | |||
| style="@style/gray03TextStyle14"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="@dimen/dp_0_5" | |||
| android:layout_marginLeft="@dimen/dp_5" | |||
| android:layout_marginRight="@dimen/dp_5" | |||
| android:background="@color/common_line_color"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:padding="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="@dimen/dp_108" | |||
| android:layout_height="wrap_content" | |||
| android:text="验证码" | |||
| style="@style/black02TextStyle14"/> | |||
| <EditText | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:background="@color/white" | |||
| android:hint="请输入验证码" | |||
| android:id="@+id/et_yzm" | |||
| android:textColorHint="@color/gray07" | |||
| style="@style/blackTextStyle14"/> | |||
| <com.ruffian.library.widget.RTextView | |||
| android:layout_width="@dimen/dp_70" | |||
| android:layout_height="@dimen/dp_21" | |||
| android:text="获取验证码" | |||
| app:background_normal="@color/green01" | |||
| style="@style/whiteTextStyle12" | |||
| android:gravity="center" | |||
| android:id="@+id/btn_code" | |||
| app:corner_radius="3dp"/> | |||
| </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" | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_centerHorizontal="true" | |||
| android:layout_marginBottom="@dimen/dp_37" | |||
| app:corner_radius="@dimen/dp_20" | |||
| android:text="验证" | |||
| android:gravity="center" | |||
| style="@style/whiteTextStyle15" | |||
| android:id="@+id/btn_commit"/> | |||
| </RelativeLayout> | |||
BIN
app/src/main/res/mipmap-xhdpi/ic_value_card_1.png
Ver fichero
BIN
app/src/main/res/mipmap-xhdpi/ic_value_card_2.png
Ver fichero
BIN
app/src/main/res/mipmap-xhdpi/ic_value_card_3.png
Ver fichero
BIN
app/src/main/res/mipmap-xhdpi/ic_value_card_4.png
Ver fichero
+ 7
- 0
app/src/main/res/values/arrays.xml
Ver fichero
| @@ -0,0 +1,7 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <resources> | |||
| <integer-array name="green01_40_to_white"> | |||
| <item>@color/green01_40</item> | |||
| <item>@color/white</item> | |||
| </integer-array> | |||
| </resources> | |||
+ 6
- 0
app/src/main/res/values/colors.xml
Ver fichero
| @@ -80,7 +80,9 @@ | |||
| <!-- 浅绿色背景--> | |||
| <color name="background_color">#EEF7F7</color> | |||
| <!-- 绿色--> | |||
| <color name="green01_05">#0D00B38B</color> | |||
| <color name="green01_10">#1A00B38B</color> | |||
| <color name="green01_40">#6600B38B</color> | |||
| <color name="green01">#00B38B</color> | |||
| <color name="green02">#39CC81</color> | |||
| @@ -103,6 +105,10 @@ | |||
| <!-- 橘色--> | |||
| <color name="orange01">#FA8C16</color> | |||
| <!-- 蓝色--> | |||
| <color name="blue01">#066EFB</color> | |||
| <color name="blue01_50">#80066EFB</color> | |||
| <!-- 选择图片背景框背景 --> | |||
| <color name="photochoosebg">#F7FAFD</color> | |||
+ 2
- 5
app/src/main/res/values/strings.xml
Ver fichero
| @@ -266,9 +266,6 @@ | |||
| <!-- TODO: Remove or change this placeholder text --> | |||
| <string name="hello_blank_fragment">Hello blank fragment</string> | |||
| <string name="obu_warm_tips">ETC设备蓝牙打开方式分为两种： | |||
| ①查看设备上是否有蓝牙按钮，若有蓝牙按钮，轻按按钮，设备显示“蓝牙已打开”。 | |||
| ②若设备无蓝牙按钮，对设备两次插拔卡方式，详情“操作手册”，打开蓝牙后设备显示“蓝牙已打开”。</string> | |||
| <string name="obu_warm_tips">ETC设备蓝牙打开方式分为两种：\n\n①查看设备上是否有蓝牙按钮，若有蓝牙按钮，轻按按钮，设备显示“蓝牙已打开”。\n\n②若设备无蓝牙按钮，对设备两次插拔卡方式，详情“操作手册”，打开蓝牙后设备显示“蓝牙已打开”。</string> | |||
| <string name="value_to_bookkeeping_tips">· 储值卡转记账卡需要先注销账户，注销时若您的卡不在质保期中，我们将收取您注销费用，若您的卡内还有约我们将会收集您的退款账户，14个工作日后退还。\n· 注销换成后您需要重新签约银行，签约成功后，我们将寄出新卡，收到新卡请重新激活。</string> | |||
| </resources> | |||
+ 27
- 0
app/src/main/res/values/styles.xml
Ver fichero
| @@ -178,10 +178,23 @@ | |||
| <item name="android:textSize">@dimen/sp_20</item> | |||
| <item name="android:textStyle">bold</item> | |||
| </style> | |||
| <style name="greenTextStyle12"> | |||
| <item name="android:textSize">@dimen/sp_12</item> | |||
| <item name="android:textColor">@color/green01</item> | |||
| </style> | |||
| <style name="greenTextStyle13"> | |||
| <item name="android:textSize">@dimen/sp_13</item> | |||
| <item name="android:textColor">@color/green01</item> | |||
| </style> | |||
| <style name="greenTextStyle14"> | |||
| <item name="android:textSize">@dimen/sp_14</item> | |||
| <item name="android:textColor">@color/green01</item> | |||
| </style> | |||
| <style name="greenTextStyleBold14"> | |||
| <item name="android:textSize">@dimen/sp_14</item> | |||
| <item name="android:textColor">@color/green01</item> | |||
| <item name="android:textStyle">bold</item> | |||
| </style> | |||
| <style name="greenTextStyle15"> | |||
| <item name="android:textSize">@dimen/sp_15</item> | |||
| <item name="android:textColor">@color/green01</item> | |||
| @@ -253,6 +266,10 @@ | |||
| <item name="android:textSize">@dimen/sp_14</item> | |||
| <item name="android:textColor">@color/text98</item> | |||
| </style> | |||
| <style name="gray03TextStyle14"> | |||
| <item name="android:textSize">@dimen/sp_14</item> | |||
| <item name="android:textColor">@color/gray03</item> | |||
| </style> | |||
| <style name="gray07TextStyle14"> | |||
| <item name="android:textSize">@dimen/sp_14</item> | |||
| <item name="android:textColor">@color/gray07</item> | |||
| @@ -278,6 +295,16 @@ | |||
| <item name="android:textSize">@dimen/dp_10</item> | |||
| <item name="android:textColor">@color/orange01</item> | |||
| </style> | |||
| <!-- 蓝色--> | |||
| <style name="blueTextStyle14"> | |||
| <item name="android:textSize">@dimen/sp_14</item> | |||
| <item name="android:textColor">@color/blue01</item> | |||
| <item name="android:textStyle">bold</item> | |||
| </style> | |||
| <style name="blue01_50TextStyle10"> | |||
| <item name="android:textSize">@dimen/sp_10</item> | |||
| <item name="android:textColor">@color/blue01_50</item> | |||
| </style> | |||
| <!-- <!–轮播属性–>--> | |||
| <!-- <style name="BannerDefaultStyle">--> | |||
Cargando…