Selaa lähdekoodia

1.提交修改 修复之前合并 代码出现的 数据丢失

ZhangXinYu 6 vuotta sitten
vanhempi
commit
dc33ed07c3
2 muutettua tiedostoa jossa 63 lisäystä ja 7 poistoa
  1. 0 5
      app/build.gradle
  2. 63 2
      app/src/main/res/values/strings.xml

+ 0 - 5
app/build.gradle

@@ -24,13 +24,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
         multiDexKeepProguard file("multidexKeep.pro")//腾讯bugly的类放到主Dex
-<<<<<<< Updated upstream
-        versionCode 331
-        versionName "3.3.1"
-=======
         versionCode 334
         versionName "3.3.4"
->>>>>>> Stashed changes
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         flavorDimensions "versionCode"
         ndk {

+ 63 - 2
app/src/main/res/values/strings.xml

@@ -50,6 +50,14 @@
     <string name="collected">已收藏</string>
     <string name="watch_more">查看更多 ></string>
     <string name="header">头像</string>
+    <string name="detail">明细</string>
+    <string name="day_one">第1天</string>
+    <string name="day_two">第2天</string>
+    <string name="day_three">第3天</string>
+    <string name="day_four">第4天</string>
+    <string name="day_five">第5天</string>
+    <string name="day_six">第6天</string>
+    <string name="day_seven">第7天</string>
     <!-- C Client-->
     <string name="login_phone">手机登录</string>
     <string name="wait_after">以后再说</string>
@@ -193,6 +201,10 @@
     <string name="information_address">具体地点</string>
     <string name="click_contact">点击联系</string>
     <string name="click_copy">点击复制</string>
+    <string name="account_balance">账户余额</string>
+    <string name="withdrawal">提现</string>
+    <string name="authentication_wait">实名认证正在审核中,请耐心等待。</string>
+    <string name="authentication_none">为了保证资金安全, \n请先进行实名认证。</string>
 
     <string name="hint_click_input_your_address">输入具体地址</string>
     <string name="hint_click_input_name">点击输入姓名</string>
@@ -522,7 +534,56 @@
     <string name="mine_authentication_none">您还未经过实名认证,认证后简历可以获得更多曝光,点击认证>></string>
     <string name="mine_authentication_wait">您的实名信息已提交认证,请耐心等待>></string>
     <string name="mine_authentication_failed">您的实名信息认证未通过,点击修改重新认证>></string>
-
+    <string name="mine_wallet">我的钱包</string>
+    <string name="mine_wallet_detail">收支明细</string>
+    <string name="mine_withdrawal">提现</string>
+    <string name="mine_withdrawal_num">提款金额</string>
+    <string name="mine_withdrawal_all">全部提现</string>
+    <string name="mine_withdrawal_tips">提现金额只能输入10的整倍数</string>
+    <string name="mine_withdrawal_wechat">微信钱包</string>
+    <string name="mine_withdrawal_alipay">支付宝余额</string>
+    <string name="mine_withdrawal_sure">预计两小时内到账,确认提现</string>
+    <string name="mine_withdrawal_wait">提现申请已经提交,等待处理</string>
+    <string name="mine_withdrawal_time">预计两小时内到账</string>
+    <string name="mine_withdrawal_back_wallet">返回钱包</string>
+    <string name="mine_integral">我的积分</string>
+    <string name="mine_integral_detail">积分明细</string>
+    <string name="mine_integral_detail_query">查看我的积分明细 >></string>
+    <string name="mine_integral_week_sign">每周签到</string>
+    <string name="mine_integral_get_more">赚更多积分</string>
+    <string name="mine_integral_exchange">积分兑换</string>
+    <string name="mine_integral_task_earn_points">做任务赚积分</string>
+    <string name="mine_integral_task_more">更多任务 ></string>
+    <string name="mine_integral_task_do_finish">去完成</string>
+    <string name="mine_integral_task_finished">已完成</string>
+    <string name="mine_integral_task_get_reward">领奖励</string>
+    <string name="mine_integral_task_title1">- 每日任务 -</string>
+    <string name="mine_integral_task_title2">- 新手任务 -</string>
+    <string name="mine_integral_task">做任务赚积分</string>
+    <string name="mine_pay">支付</string>
+    <string name="mine_pay_wallet">钱包支付</string>
+    <string name="mine_pay_wechat">微信支付</string>
+    <string name="mine_pay_alipay">支付宝支付</string>
+    <string name="mine_pay_sure">确认支付</string>
+    <string name="mine_go_look">去看看</string>
+    <string name="mine_active">活动</string>
+    <string name="mine_gifts">好礼</string>
+    <string name="mine_exchange_gifts">兑好礼</string>
+    <string name="mine_exchange_active">兑活动</string>
+    <string name="mine_gifts_detail">礼品详情</string>
+    <string name="mine_active_desc">活动说明</string>
+    <string name="mine_exchange_now">立即兑换</string>
+    <string name="mine_exchange_record">兑换记录</string>
+    <string name="mine_exchange_remaining_places">剩余名额:</string>
+    <string name="mine_exchange_registered_persons">已报人数:</string>
+    <string name="mine_exchange_date">兑换时间:</string>
+    <string name="mine_exchange_consumption">兑换消耗:</string>
+    <string name="mine_exchange_phone">预留号码:</string>
+    <string name="mine_exchange_active_date">活动时间:</string>
+    <string name="mine_exchange_active_address">活动地点:</string>
+    <string name="mine_exchange_record_no_title">您还没有进行过积分兑换哦, \n快去看看有什么好东西吧!</string>
+    <string name="mine_pay_need">您需要支付</string>
+    <string name="mine_pay_choose_payment">请选择支付方式</string>
     <string name="me_no_authentication">未认证</string>
     <string name="me_yes_authentication">已认证</string>
     <string name="me_company_team_authentication">企业认证</string>
@@ -633,4 +694,4 @@
 
     <string name="role_choose">身份选择</string>
 
-</resources>
+</resources>