qiubinghui
/
zhywpt-app
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

feat: 合并冲突代码、隐藏部分功能

master
huting 2 年前
父节点
a63b1e3591
当前提交
481ae897d9
共有 2 个文件被更改，包括 84 次插入 和 51 次删除
分列视图 显示文件统计
  1. 62
    34
      app/src/main/AndroidManifest.xml
  2. 22
    17
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java

+ 62
- 34
app/src/main/AndroidManifest.xml 查看文件

@@ -313,11 +313,13 @@
<activity
android:name=".project.ui.activity.IdentityInformationUploadActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 签约 -->
android:screenOrientation="portrait" />
<!-- 签约 -->
<activity
android:name=".project.ui.activity.ContractActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 支付 -->
android:screenOrientation="portrait" />
<!-- 支付 -->
<activity
android:name=".project.ui.activity.DefrayActivity"
android:launchMode="singleTop"
@@ -397,84 +399,104 @@
<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" /> <!-- 修改订单地址 -->
android:screenOrientation="portrait" />
<!-- 修改订单地址 -->
<activity
android:name=".project.ui.activity.order.EditOrderAddrActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 更换ETC设备 -->
android:screenOrientation="portrait" />
<!-- 更换ETC设备 -->
<activity
android:name=".project.ui.activity.after.ReplaceEtcStep1Activity"
android:launchMode="singleTop"
@@ -494,7 +516,8 @@
<activity
android:name=".project.ui.activity.after.ReplaceEtcStep5Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 设备注销 -->
android:screenOrientation="portrait" />
<!-- 设备注销 -->
<activity
android:name=".project.ui.activity.after.LogoutEtcStep1Activity"
android:launchMode="singleTop"
@@ -506,7 +529,8 @@
<activity
android:name=".project.ui.activity.after.CommonDealSuccessActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 欠费补缴 -->
android:screenOrientation="portrait" />
<!-- 欠费补缴 -->
<activity
android:name=".project.ui.activity.after.PayTheArrearsStep0Activity"
android:launchMode="singleTop"
@@ -522,7 +546,8 @@
<activity
android:name=".project.ui.activity.after.PayTheArrearsStep3Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 余额补领 -->
android:screenOrientation="portrait" />
<!-- 余额补领 -->
<activity
android:name=".project.ui.activity.after.BalanceReplacementStep1Activity"
android:launchMode="singleTop"
@@ -534,15 +559,18 @@
<activity
android:name=".project.ui.activity.after.LogoutEtcReturnMoneyActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 卡签启用、停用 -->
android:screenOrientation="portrait" />
<!-- 卡签启用、停用 -->
<activity
android:name=".project.ui.activity.after.StartStopEtcActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 卡签续期 -->
android:screenOrientation="portrait" />
<!-- 卡签续期 -->
<activity
android:name=".project.ui.activity.after.RenewCardObuActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> <!-- 储值卡转记账卡 -->
android:screenOrientation="portrait" />
<!-- 储值卡转记账卡 -->
<activity
android:name=".project.ui.activity.after.PetCardToAccountCardStep1Activity"
android:launchMode="singleTop"
@@ -563,15 +591,16 @@
android:name=".project.ui.activity.after.PetCardToAccountCardStep5Activity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<<<<<<< HEAD

<!--解除车牌占用-->
<activity
android:name=".project.ui.activity.my.RemoveLicensePlateOccupation"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".project.ui.activity.my.SuccessfulApplication"
=======
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<!--设备升级-->
<activity
android:name=".project.ui.activity.after.EquipmentUpgradeActivity"
@@ -581,9 +610,8 @@
<!--卡Pin码解锁-->
<activity
android:name=".project.ui.activity.after.CardUnlockPinActivity"
>>>>>>> 608485d102c8918ccb12ac6df40307a7260bccc2
android:launchMode="singleTop"
android:screenOrientation="portrait" />
</application>

</manifest>
</application>
</manifest>

+ 22
- 17
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java 查看文件

@@ -59,19 +59,26 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
{R.mipmap.card11, "卡Pin码解锁"},
{R.mipmap.card10, "欠费补缴"},
{R.mipmap.card10, "余额补领"},
{R.mipmap.card7, "满意度评价"},
{R.mipmap.card8, "设备激活"},
{R.mipmap.card15, "审核管理"},

{R.mipmap.card16, "ETC过户"},
{R.mipmap.card17, "签约账户变更"},
{R.mipmap.card18, "发票管理"},
{R.mipmap.card19, "解除车牌占用"},

{R.mipmap.card19, "用户信息变更"},
{R.mipmap.card19, "车辆信息变更"},
{R.mipmap.card20, "圈存退费"},
{R.mipmap.card2, "补卡额申请"},
{R.mipmap.card3, "卡签版本查询"},
{R.mipmap.card16, "ETC过户"},

{R.mipmap.card5, "通行流水查询"},
{R.mipmap.card6, "公务车发行"},
{R.mipmap.card6, "用户信息变更"},
{R.mipmap.card7, "车辆信息变更"},
{R.mipmap.card17, "签约账户变更"}, //待定

//下面暂时隐藏
/*{R.mipmap.card15, "审核管理"},
{R.mipmap.card7, "满意度评价"},
{R.mipmap.card18, "发票管理"},
{R.mipmap.card3, "卡签版本查询"},
{R.mipmap.card6, "公务车发行"},*/
};

public static AppFragment<MainActivity> newInstance() {
@@ -166,12 +173,6 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
case "卡签挂起/解挂":
startActivity(DevicePendingActivity.class);
break;
case "满意度评价":
startActivity(UserEvaluateActivity.class);
break;
case "设备激活":
startActivity(ObuActivationHintActivity.class);
break;
case "储值卡转记账卡":
//遵循UI设计图 但是不符合现在业务
//startActivity(ValueToBookkeepingCardActivity.class);
@@ -192,16 +193,20 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
case "卡签续期":
jumpToPage(RenewCardObuActivity.class);
break;
<<<<<<< HEAD
case "解除车牌占用":
jumpToPage(RemoveLicensePlateOccupation.class);
=======
break;
case "设备升级":
jumpToPage(EquipmentUpgradeActivity.class);
break;
case "卡Pin码解锁":
jumpToPage(CardUnlockPinActivity.class);
>>>>>>> 608485d102c8918ccb12ac6df40307a7260bccc2
break;
case "满意度评价":
startActivity(UserEvaluateActivity.class);
break;
case "设备激活":
startActivity(ObuActivationHintActivity.class);
break;
default:
new Utils().showMessDialog(getActivity(), "功能正在开发中...");

撰写 预览
正在加载...
取消
保存