Browse Source

隐私协议增加;

null_safety
w-R 4 years ago
parent
commit
770500d204
  1. 1
      lib/generated/intl/messages_en.dart
  2. 1
      lib/generated/intl/messages_zh_CN.dart
  3. 1
      lib/generated/intl/messages_zh_TW.dart
  4. 10
      lib/generated/l10n.dart
  5. 1
      lib/l10n/intl_en.arb
  6. 1
      lib/l10n/intl_zh_CN.arb
  7. 1
      lib/l10n/intl_zh_TW.arb
  8. 2
      lib/main.dart
  9. 46
      lib/setting/about_page.dart
  10. 143
      lib/setting/treaty_page.dart

1
lib/generated/intl/messages_en.dart

@ -362,6 +362,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
"yingyeshijian" : m25,
"yinsizhengce" : MessageLookupByLibrary.simpleMessage("隐私政策"),
"yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
"yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),
"yishijiao" : MessageLookupByLibrary.simpleMessage("已失效"),

1
lib/generated/intl/messages_zh_CN.dart

@ -362,6 +362,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
"yingyeshijian" : m25,
"yinsizhengce" : MessageLookupByLibrary.simpleMessage("隐私政策"),
"yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
"yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),
"yishijiao" : MessageLookupByLibrary.simpleMessage("已失效"),

1
lib/generated/intl/messages_zh_TW.dart

@ -362,6 +362,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"),
"yingyeshijian" : m25,
"yinsizhengce" : MessageLookupByLibrary.simpleMessage("隱私政策"),
"yiqiandao" : MessageLookupByLibrary.simpleMessage("已簽到"),
"yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),
"yishijiao" : MessageLookupByLibrary.simpleMessage("已失效"),

10
lib/generated/l10n.dart

@ -3295,6 +3295,16 @@ class S {
);
}
/// ``
String get yinsizhengce {
return Intl.message(
'隐私政策',
name: 'yinsizhengce',
desc: '',
args: [],
);
}
/// `使`
String get privacy_policy4 {
return Intl.message(

1
lib/l10n/intl_en.arb

@ -342,6 +342,7 @@
"zailaiyidan": "再来一单",
"shanchudingdan": "删除一单",
"qudanhao": "取单号{num}",
"yinsizhengce": "隐私政策",

1
lib/l10n/intl_zh_CN.arb

@ -343,6 +343,7 @@
"zailaiyidan": "再来一单",
"shanchudingdan": "删除一单",
"qudanhao": "取单号{num}",
"yinsizhengce": "隐私政策",

1
lib/l10n/intl_zh_TW.arb

@ -335,6 +335,7 @@
"zailaiyidan": "再來一單",
"shanchudingdan": "刪除訂單",
"qudanhao": "取膽號{num}",
"yinsizhengce": "隱私政策",

2
lib/main.dart

@ -44,6 +44,7 @@ import 'package:huixiang/setting/about_page.dart';
import 'package:huixiang/setting/help_feedback_page.dart';
import 'package:huixiang/setting/permission_setting_page.dart';
import 'package:huixiang/setting/setting_page.dart';
import 'package:huixiang/setting/treaty_page.dart';
// import 'package:huixiang/ui_test.dart';
import 'package:huixiang/union/store_details_page.dart';
@ -175,6 +176,7 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
'/router/setting_page': (context, {arguments}) => SettingPage(),
'/router/about_page': (context, {arguments}) => AboutPage(),
'/router/help_feedback_page': (context, {arguments}) => HelpFeedbackPage(),
'/router/treaty_page': (context, {arguments}) => TreatyPage(),
'/router/union_detail_page': (context, {arguments}) =>
UnionDetailsPage(arguments: arguments),
'/router/store_detail_page': (context, {arguments}) =>

46
lib/setting/about_page.dart

@ -98,13 +98,47 @@ class _AboutPage extends State<AboutPage> {
Container(
margin: EdgeInsets.only(bottom: 83.h),
alignment: Alignment.bottomCenter,
child: Text(
S.of(context).banben(version),
style: TextStyle(
fontSize: 16.sp,
color: Color(0XFF868686),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
S.of(context).banben(version),
style: TextStyle(
fontSize: 16.sp,
color: Color(0XFF868686),
),
),
SizedBox(height: 9,),
GestureDetector(
child: Text(
"隐私政策",
overflow: TextOverflow.ellipsis,
style: TextStyle(
decoration: TextDecoration.underline,
decorationThickness: 2,
color: Color(0xFF32A060),
fontSize: 14,
fontWeight: FontWeight.bold,
),
),
onTap: (){
Navigator.of(context)
.pushNamed('/router/treaty_page');
},
),
SizedBox(height:10,),
Text(
"Copyright © 2020-2021 Yixinhuixiang. All Rights Reserved.",
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFFAAA8AE),
fontSize: 12,
),
)
],
),
),
],
),

143
lib/setting/treaty_page.dart

@ -0,0 +1,143 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/utils/MyPainter.dart';
import 'package:huixiang/view_widget/separator.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class TreatyPage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return _TreatyPage();
}
}
class _TreatyPage extends State<TreatyPage> {
var controller = new ScrollController();
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(
S.of(context).yinsizhengce,
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
centerTitle: false,
backgroundColor: Color(0xFFF7F7F7),
elevation: 0,
leading: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Container(
alignment: Alignment.centerRight,
margin: EdgeInsets.only(left: 10.w),
padding: EdgeInsets.all(6),
child: Icon(
Icons.arrow_back_ios,
color: Colors.black,
size: 24,
),
),
),
titleSpacing: 2.w,
leadingWidth: 56.w,
),
body: Container(
margin: EdgeInsets.only(left: 20,right: 20,top: 10),
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
TextSpan(children: [
TextSpan(
text: "本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确"
"、更有个性化的服务,本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、"
"审慎义务对待这些信息。除本隐私权政策另有规定外,在未征得您事先许可的情况下,"
"本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 "
"您在同意本应用服务使用协议之时,即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。",
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w300,
height: 1.2,
color: Colors.black),
),
]),
textDirection: TextDirection.ltr,
),
Padding(padding:EdgeInsets.only(top: 20,bottom: 20),child: Text(
"1. 适用范围",
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
height: 1.2,
color: Color(0xff32A060)),
),),
_textRich("(a) 在您注册本应用帐号时,您根据本应用要求提供的个人注册信息;"),
_textRich("(b) 在您使用本应用网络服务,或访问本应用平台网页时,本应用自动接收并记录的您的浏览器和计算机上的信息"
",包括但不限于您的IP地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据;"),
_textRich("(c) 本应用通过合法途径从商业伙伴处取得的用户个人数据。"),
_textRich("(a) 您在使用本应用平台提供的搜索服务时输入的关键字信息;"),
_textRich("(b) 本应用收集到的您在本应用发布的有关信息数据,包括但不限于参与活动、成交信息及评价详情;"),
_textRich("(c) 违反法律规定或违反本应用规则行为及本应用已对您采取的措施。"),
Padding(padding:EdgeInsets.only(top: 20,bottom: 20),child: Text(
"2. 信息使用",
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
height: 1.2,
color: Color(0xff32A060)),
),),
_textRich("(a)本应用不会向任何无关第三方提供、出售、出租、分享或交易您的个人信息,除非事先得到您的许可,"
"或该第三方和本应用(含本应用关联公司)单独或共同为您提供服务,且在该服务结束后,其将被禁止访问包括其以前能够访问的所有这些资料。"),
_textRich("(b) 本应用亦不允许任何第三方以任何手段收集、编辑、出售或者无偿传播您的个人信息。"
"任何本应用平台用户如从事上述活动,一经发现,本应用有权立即终止与该用户的服务协议。"),
_textRich("(c) 为服务用户的目的,本应用可能通过使用您的个人信息,向您提供您感兴趣的信息,"
"包括但不限于向您发出产品和服务信息,或者与本应用合作伙伴共享信息以便他们向您发送有关其产品和服务的信息(后者需要您的事先同意)。"),
Padding(padding:EdgeInsets.only(top: 20,bottom: 20),child: Text(
"3. 信息披露",
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
height: 1.2,
color: Color(0xff32A060)),
),),
_textRich("在如下情况下,本应用将依据您的个人意愿或法律的规定全部或部分的披露您的个人信息:"),
_textRich("(a) 经您事先同意,向第三方披露;"),
_textRich("(b)为提供您所要求的产品和服务,而必须和第三方分享您的个人信息;"),
_textRich("(c) 根据法律的有关规定,或者行政或司法机构的要求,向第三方或者行政、司法机构披露;"),
_textRich("(d) 如您出现违反中国有关法律、法规或者本应用服务协议或相关规则的情况,需要向第三方披露;"),
_textRich("(e) 如您是适格的知识产权投诉人并已提起投诉,应被投诉人要求,向被投诉人披露,以便双方处理可能的权利纠纷;"),
_textRich("(f) 在本应用平台上创建的某一交易中,如交易任何一方履行或部分履行了交易义务并提出信息披露请求的,"
"本应用有权决定向该用户提供其交易对方的联络方式等必要信息,以促成交易的完成或纠纷的解决。"),
_textRich("(g) 其它本应用根据法律、法规或者网站政策认为合适的披露。"),
SizedBox(height: 20,),
],
),
),
),
);
}
Widget _textRich(var text) {
return Padding(
padding: EdgeInsets.only(bottom: 20),
child: Text(
text,
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w400,
height: 1.2,
color: Colors.black),
),
);
}
}
Loading…
Cancel
Save