fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app 

 Conflicts:
	lib/mine/mine_page.dart
null_safety
fmk 4 years ago
parent
6da1ad39af a4fbf66b82
commit
df857982a6
8 changed files with 86 additions and 109 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      lib/generated/l10n.dart
  2. 20
      lib/l10n/intl_en.arb
  3. 13
      lib/l10n/intl_zh_CN.arb
  4. 13
      lib/l10n/intl_zh_Hans_CN.arb
  5. 13
      lib/l10n/intl_zh_Hant_CN.arb
  6. 13
      lib/l10n/intl_zh_TW.arb
  7. 1
      lib/mine/mine_page.dart
  8. 4
      lib/view_widget/mine_vip_view.dart

118
lib/generated/l10n.dart
Unescape View File

@ -4055,66 +4055,6 @@ class S {
);
}
/// `会员卡`
String get huiyuanka {
return Intl.message(
'会员卡',
name: 'huiyuanka',
desc: '',
args: [],
);
}
/// `券包`
String get quanbao {
return Intl.message(
'券包',
name: 'quanbao',
desc: '',
args: [],
);
}
/// `有效期:{date}`
String youxiaoqi(Object date) {
return Intl.message(
'有效期:$date',
name: 'youxiaoqi',
desc: '',
args: [date],
);
}
/// `签到完成`
String get qiandaowancheng {
return Intl.message(
'签到完成',
name: 'qiandaowancheng',
desc: '',
args: [],
);
}
/// `您已连续签到{tian}天`
String ninyilianxuqiandaotian(Object tian) {
return Intl.message(
'您已连续签到$tian天',
name: 'ninyilianxuqiandaotian',
desc: '',
args: [tian],
);
}
/// `+ {jifen} 积分`
String jiajifen(Object jifen) {
return Intl.message(
'+ $jifen 积分',
name: 'jiajifen',
desc: '',
args: [jifen],
);
}
/// `城市选择`
String get chengshixuanze {
return Intl.message(
@ -4375,16 +4315,66 @@ class S {
);
}
/// `当前积分:`
String get dangqianjifen {
/// `会员卡`
String get huiyuanka {
return Intl.message(
'当前积分:',
name: 'dangqianjifen',
'会员卡',
name: 'huiyuanka',
desc: '',
args: [],
);
}
/// `券包`
String get quanbao {
return Intl.message(
'券包',
name: 'quanbao',
desc: '',
args: [],
);
}
/// `有效期:{date}`
String youxiaoqi(Object date) {
return Intl.message(
'有效期:$date',
name: 'youxiaoqi',
desc: '',
args: [date],
);
}
/// `签到完成`
String get qiandaowancheng {
return Intl.message(
'签到完成',
name: 'qiandaowancheng',
desc: '',
args: [],
);
}
/// `您已连续签到{tian}天`
String ninyilianxuqiandaotian(Object tian) {
return Intl.message(
'您已连续签到$tian天',
name: 'ninyilianxuqiandaotian',
desc: '',
args: [tian],
);
}
/// `+ {jifen} 积分`
String jiajifen(Object jifen) {
return Intl.message(
'+ $jifen 积分',
name: 'jiajifen',
desc: '',
args: [jifen],
);
}
/// `并使用本机号码登录`
String get privacy_policy4 {
return Intl.message(

20
lib/l10n/intl_en.arb
Unescape View File

@ -420,12 +420,6 @@
"jujue": "拒绝",
"yinsizhengce1": " 感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡",
"yinsizhengce2": "     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。",
"huiyuanka": "会员卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "签到完成",
"ninyilianxuqiandaotian": "您已连续签到{tian}天",
"jiajifen": "+ {jifen} 积分",
"chengshixuanze": "城市选择",
"bianjidizhi": "编辑地址",
"xingming": "姓名",
@ -454,14 +448,12 @@
"lijitiyan": "立即体验",
"denglu": "登录",
"weidengluxinxi": "点击登录，享受更多精彩信息",
"dangqianjifen": "当前积分:",
"huiyuanka": "会员卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "签到完成",
"ninyilianxuqiandaotian": "您已连续签到{tian}天",
"jiajifen": "+ {jifen} 积分",

13
lib/l10n/intl_zh_CN.arb
Unescape View File

@ -421,12 +421,6 @@
"jujue": "拒绝",
"yinsizhengce1": " 感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡",
"yinsizhengce2": "     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。",
"huiyuanka": "会员卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "签到完成",
"ninyilianxuqiandaotian": "您已连续签到{tian}天",
"jiajifen": "+ {jifen} 积分",
"chengshixuanze": "城市选择",
"bianjidizhi": "编辑地址",
"xingming": "姓名",
@ -455,7 +449,12 @@
"lijitiyan": "立即体验",
"denglu": "登录",
"weidengluxinxi": "点击登录，享受更多精彩信息",
"dangqianjifen": "当前积分:",
"huiyuanka": "会员卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "签到完成",
"ninyilianxuqiandaotian": "您已连续签到{tian}天",
"jiajifen": "+ {jifen} 积分",

13
lib/l10n/intl_zh_Hans_CN.arb
Unescape View File

@ -421,12 +421,6 @@
"jujue": "拒绝",
"yinsizhengce1": " 感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡",
"yinsizhengce2": "     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。",
"huiyuanka": "会员卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "签到完成",
"ninyilianxuqiandaotian": "您已连续签到{tian}天",
"jiajifen": "+ {jifen} 积分",
"chengshixuanze": "城市选择",
"bianjidizhi": "编辑地址",
"xingming": "姓名",
@ -455,7 +449,12 @@
"lijitiyan": "立即体验",
"denglu": "登录",
"weidengluxinxi": "点击登录，享受更多精彩信息",
"dangqianjifen": "当前积分:",
"huiyuanka": "会员卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "签到完成",
"ninyilianxuqiandaotian": "您已连续签到{tian}天",
"jiajifen": "+ {jifen} 积分",

13
lib/l10n/intl_zh_Hant_CN.arb
Unescape View File

@ -415,12 +415,6 @@
"jujue": "拒絕",
"yinsizhengce1": " 感謝您使用一心回鄉APP。我們非常的重視您的個人信息和隱私保護。為了更好地保證您的個人權益，在您使用我們的產品前，請務必仔細閱讀一心回鄉",
"yinsizhengce2": "     在您同意後，我們才會根據您的使用需求，收集部分可能涉及(地理位置、相機、存儲等信息)的數據。",
"huiyuanka": "會員卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "簽到完成",
"ninyilianxuqiandaotian": "您已連續簽到{tian}天",
"jiajifen": "+ {jifen} 積分",
"chengshixuanze": "城市選擇",
"bianjidizhi": "編輯地址",
"xingming": "姓名",
@ -449,7 +443,12 @@
"lijitiyan": "立即體驗",
"denglu": "登錄",
"weidengluxinxi": "點擊登錄，享受更多精彩資訊",
"dangqianjifen": "當前積分:",
"huiyuanka": "會員卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "簽到完成",
"ninyilianxuqiandaotian": "您已連續簽到{tian}天",
"jiajifen": "+ {jifen} 積分",

13
lib/l10n/intl_zh_TW.arb
Unescape View File

@ -413,12 +413,6 @@
"jujue": "拒絕",
"yinsizhengce1": " 感謝您使用一心回鄉APP。我們非常的重視您的個人信息和隱私保護。為了更好地保證您的個人權益，在您使用我們的產品前，請務必仔細閱讀一心回鄉",
"yinsizhengce2": "     在您同意後，我們才會根據您的使用需求，收集部分可能涉及(地理位置、相機、存儲等信息)的數據。",
"huiyuanka": "會員卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "簽到完成",
"ninyilianxuqiandaotian": "您已連續簽到{tian}天",
"jiajifen": "+ {jifen} 積分",
"chengshixuanze": "城市選擇",
"bianjidizhi": "編輯地址",
"xingming": "姓名",
@ -447,7 +441,12 @@
"lijitiyan": "立即體驗",
"denglu": "登錄",
"weidengluxinxi": "點擊登錄，享受更多精彩資訊",
"dangqianjifen": "當前積分:",
"huiyuanka": "會員卡",
"quanbao": "券包",
"youxiaoqi": "有效期:{date}",
"qiandaowancheng": "簽到完成",
"ninyilianxuqiandaotian": "您已連續簽到{tian}天",
"jiajifen": "+ {jifen} 積分",

1
lib/mine/mine_page.dart
Unescape View File

@ -65,7 +65,6 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
super.initState();
refreshUserInfo();
eventBus.on<EventType>().listen((event) {
print("EventType: Mine");
print("EventType: ${event.type}");
if (event.type < 3) {
setState(() {});

4
lib/view_widget/mine_vip_view.dart
Unescape View File

@ -94,7 +94,7 @@ class MineVipView extends StatelessWidget {
}
}
return AspectRatio(
aspectRatio: 1.7,
aspectRatio: 1.8,
child: Container(
margin: EdgeInsets.fromLTRB(padding.w, 16.h, padding.w, 8.h),
decoration: BoxDecoration(
@ -180,7 +180,7 @@ class MineVipView extends StatelessWidget {
Expanded(
child: Text(
rank > rankMax
? S.of(context).dangqianjifen
? S.of(context).dangqiandengji
: "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}",
overflow: TextOverflow.ellipsis,
style: TextStyle(

Write Preview
Loading…
Cancel
Save