Merge remote-tracking branch 'origin/1.1.1' into android_1.0.1
This commit is contained in:
commit
cac1567753
@ -37,269 +37,264 @@ class _ShareState extends State<Share> {
|
|||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Colors.transparent,
|
backgroundColor: Colors.transparent,
|
||||||
body: Container(
|
body: Container(
|
||||||
child: Stack(
|
child: Column(
|
||||||
alignment: Alignment.center,
|
|
||||||
children: [
|
children: [
|
||||||
Positioned(
|
Expanded(child: Container()),
|
||||||
top: 84.sp,
|
Container(
|
||||||
child: Container(
|
width: Get.width - 40.sp,
|
||||||
width: Get.width - 40.sp,
|
// height: Get.height - Get.bottomBarHeight - 164.sp - 10.sp,
|
||||||
height: Get.height - 84.sp - Get.bottomBarHeight - 164.sp - 10.sp,
|
child:SingleChildScrollView(
|
||||||
child:SingleChildScrollView(
|
child: RepaintBoundary(
|
||||||
child: RepaintBoundary(
|
key: _globalKey,
|
||||||
key: _globalKey,
|
child: Container(
|
||||||
child: Container(
|
decoration: BoxDecoration(
|
||||||
decoration: BoxDecoration(
|
image: DecorationImage(
|
||||||
image: DecorationImage(
|
image: AssetImage(getCircleImage("open_vip_bg")),
|
||||||
image: AssetImage(getCircleImage("open_vip_bg")),
|
fit: BoxFit.fill,
|
||||||
fit: BoxFit.fill,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
child: Column(
|
),
|
||||||
children: [
|
child: Column(
|
||||||
Container(
|
children: [
|
||||||
width: Get.width,
|
Container(
|
||||||
height: 65.sp,
|
width: Get.width,
|
||||||
margin: EdgeInsets.only(left: 15.sp, top: 20.sp),
|
height: 65.sp,
|
||||||
child: Row(
|
margin: EdgeInsets.only(left: 15.sp, top: 20.sp,right: 15.sp),
|
||||||
children: [
|
child: Row(
|
||||||
Center(
|
children: [
|
||||||
child: Stack(
|
Center(
|
||||||
alignment: Alignment.center,
|
child: Stack(
|
||||||
children: [
|
alignment: Alignment.center,
|
||||||
Container(
|
children: [
|
||||||
width: 47.sp,
|
Container(
|
||||||
height: 47.sp,
|
width: 47.sp,
|
||||||
decoration: const BoxDecoration(
|
height: 47.sp,
|
||||||
shape: BoxShape.circle,
|
decoration: const BoxDecoration(
|
||||||
gradient: LinearGradient(
|
shape: BoxShape.circle,
|
||||||
colors: [
|
gradient: LinearGradient(
|
||||||
Color(0xFFDD3DF4),
|
colors: [
|
||||||
Color(0xFF30FFD9)
|
Color(0xFFDD3DF4),
|
||||||
],
|
Color(0xFF30FFD9)
|
||||||
begin: Alignment.topCenter,
|
],
|
||||||
end: Alignment.bottomCenter,
|
begin: Alignment.topCenter,
|
||||||
),
|
end: Alignment.bottomCenter,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(
|
),
|
||||||
width: 46.sp,
|
SizedBox(
|
||||||
height: 46.sp,
|
width: 46.sp,
|
||||||
child: _buildAvatar1(logic),
|
height: 46.sp,
|
||||||
|
child: _buildAvatar1(logic),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Container(
|
||||||
|
padding: EdgeInsets.only(left: 10.sp),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment:
|
||||||
|
CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
_buildNameRow(logic),
|
||||||
|
SizedBox(height: 10.sp),
|
||||||
|
_buildInfoRow(logic),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Image.asset(
|
||||||
|
getBaseImage("ic_launcher"),
|
||||||
|
width: 65.sp,
|
||||||
|
height: 65.sp,
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Expanded(
|
||||||
|
// child:
|
||||||
|
Container(
|
||||||
|
padding: EdgeInsets.only(left: 10.sp,right: 10.sp),
|
||||||
|
// color: Colors.red,
|
||||||
|
// height: 310.sp,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 5.sp,
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
padding: EdgeInsets.only(left: 15.sp,right: 15.sp),
|
||||||
|
child: Image.asset(
|
||||||
|
getMineImage('share_title'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 10.sp,
|
||||||
|
),
|
||||||
|
Image.asset(
|
||||||
|
getMineImage('share_content_bg'),
|
||||||
|
// height: 260.sp,
|
||||||
|
fit:BoxFit.fitWidth
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
// height: 90.sp,
|
||||||
|
// color: Color(0xFF334141),
|
||||||
|
alignment: Alignment.center,
|
||||||
|
// color: Colors.yellow,
|
||||||
|
// width: Get.width-40.sp,
|
||||||
|
margin: EdgeInsets.only(bottom: 15.sp,top: 10.sp),
|
||||||
|
padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
|
||||||
|
child: Row(
|
||||||
|
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Container(
|
||||||
|
// color: Colors.red,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment:
|
||||||
|
CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
// color: Colors.blue,
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'专属邀请码',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontSize: 18.sp),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 8.sp,
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
alignment: Alignment.center,
|
||||||
|
padding: EdgeInsets.only(
|
||||||
|
left: 10.sp, right: 10.sp),
|
||||||
|
height: 25.sp,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
// color: Color(0xFFDC5BFD),
|
||||||
|
gradient:
|
||||||
|
const LinearGradient(
|
||||||
|
colors: [
|
||||||
|
Color(0xFF0DF5F7),
|
||||||
|
Color(0xFFD263FB)
|
||||||
|
],
|
||||||
|
begin:
|
||||||
|
Alignment.centerLeft,
|
||||||
|
end:
|
||||||
|
Alignment.centerRight,
|
||||||
|
),
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius.circular(
|
||||||
|
12.5.sp)),
|
||||||
|
child: Text(
|
||||||
|
widget.code,
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.black,
|
||||||
|
fontSize: 12.sp),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Container(
|
||||||
|
margin: EdgeInsets.only(top: 10.sp),
|
||||||
|
width: Get.width - 200.sp,
|
||||||
|
child: Text(
|
||||||
|
'扫码或长按识别下载APP，认识更多小众圈子里的人，给生活带来更多乐趣～',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontSize: 15.sp)),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Expanded(
|
),
|
||||||
child: Container(
|
// Image.asset(getBaseImage("ic_launcher"),width: 80.sp,height: 80.sp,)
|
||||||
padding: EdgeInsets.only(left: 10.sp),
|
Stack(
|
||||||
child: Column(
|
alignment: Alignment.center,
|
||||||
crossAxisAlignment:
|
children: [
|
||||||
CrossAxisAlignment.start,
|
Container(
|
||||||
children: [
|
color: Colors.white,
|
||||||
_buildNameRow(logic),
|
width: 90.sp,
|
||||||
SizedBox(height: 10.sp),
|
height: 90.sp,
|
||||||
_buildInfoRow(logic),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
QrImageView(
|
||||||
Image.asset(
|
data: widget.link,
|
||||||
getBaseImage("ic_launcher"),
|
padding: EdgeInsets.zero,
|
||||||
width: 80.sp,
|
version: QrVersions.auto,
|
||||||
height: 80.sp,
|
size: 80.sp,
|
||||||
)
|
gapless: false,
|
||||||
],
|
// backgroundColor: Colors.black,
|
||||||
),
|
)
|
||||||
),
|
],
|
||||||
// Expanded(
|
)
|
||||||
// child:
|
|
||||||
Container(
|
|
||||||
padding: EdgeInsets.only(left: 10.sp,right: 10.sp),
|
|
||||||
// color: Colors.red,
|
|
||||||
// height: 310.sp,
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
SizedBox(
|
|
||||||
height: 20.sp,
|
|
||||||
),
|
|
||||||
Container(
|
|
||||||
padding: EdgeInsets.only(left: 15.sp,right: 15.sp),
|
|
||||||
child: Image.asset(
|
|
||||||
getMineImage('share_title'),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
height: 10.sp,
|
|
||||||
),
|
|
||||||
Image.asset(
|
|
||||||
getMineImage('share_content_bg'),
|
|
||||||
// height: 260.sp,
|
|
||||||
fit:BoxFit.fitWidth
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Container(
|
|
||||||
height: 90.sp,
|
|
||||||
// color: Color(0xFF334141),
|
|
||||||
alignment: Alignment.center,
|
|
||||||
// color: Colors.yellow,
|
|
||||||
// width: Get.width-40.sp,
|
|
||||||
margin: EdgeInsets.only(bottom: 15.sp,top: 10.sp),
|
|
||||||
padding: EdgeInsets.only(left: 15.sp, right: 15.sp),
|
|
||||||
child: Row(
|
|
||||||
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Container(
|
|
||||||
// color: Colors.red,
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment:
|
|
||||||
CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Container(
|
|
||||||
// color: Colors.blue,
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
Text(
|
|
||||||
'专属邀请码',
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
fontSize: 16.sp),
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
width: 8.sp,
|
|
||||||
),
|
|
||||||
Container(
|
|
||||||
alignment: Alignment.center,
|
|
||||||
padding: EdgeInsets.only(
|
|
||||||
left: 10.sp, right: 10.sp),
|
|
||||||
height: 25.sp,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
// color: Color(0xFFDC5BFD),
|
|
||||||
gradient:
|
|
||||||
const LinearGradient(
|
|
||||||
colors: [
|
|
||||||
Color(0xFF0DF5F7),
|
|
||||||
Color(0xFFD263FB)
|
|
||||||
],
|
|
||||||
begin:
|
|
||||||
Alignment.centerLeft,
|
|
||||||
end:
|
|
||||||
Alignment.centerRight,
|
|
||||||
),
|
|
||||||
borderRadius:
|
|
||||||
BorderRadius.circular(
|
|
||||||
12.5.sp)),
|
|
||||||
child: Text(
|
|
||||||
widget.code,
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.black,
|
|
||||||
fontSize: 12.sp),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Container(
|
|
||||||
margin: EdgeInsets.only(top: 10.sp),
|
|
||||||
width: Get.width - 200.sp,
|
|
||||||
child: Text(
|
|
||||||
'扫码或长按识别下载APP，认识更多小众圈子里的人，给生活带来更多乐趣～',
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
fontSize: 12.sp)),
|
|
||||||
)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
// Image.asset(getBaseImage("ic_launcher"),width: 80.sp,height: 80.sp,)
|
|
||||||
Stack(
|
|
||||||
alignment: Alignment.center,
|
|
||||||
children: [
|
|
||||||
Container(
|
|
||||||
color: Colors.white,
|
|
||||||
width: 90.sp,
|
|
||||||
height: 90.sp,
|
|
||||||
),
|
|
||||||
QrImageView(
|
|
||||||
data: widget.link,
|
|
||||||
padding: EdgeInsets.zero,
|
|
||||||
version: QrVersions.auto,
|
|
||||||
size: 80.sp,
|
|
||||||
gapless: false,
|
|
||||||
// backgroundColor: Colors.black,
|
|
||||||
)
|
|
||||||
],
|
|
||||||
)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
))
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Positioned(
|
|
||||||
bottom: 0,
|
|
||||||
child: SafeArea(
|
|
||||||
top: false,
|
|
||||||
child: Container(
|
|
||||||
height: 164.sp,
|
|
||||||
width: Get.width,
|
|
||||||
color: Color(0xFF292247),
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Container(
|
|
||||||
padding: EdgeInsets.only(
|
|
||||||
top: 15.sp, left: 15.sp, right: 15.sp),
|
|
||||||
alignment: Alignment.center,
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
shareAction('wx', '微信', () {
|
|
||||||
shareWxData(1);
|
|
||||||
}),
|
|
||||||
shareAction('wxq', '朋友圈', () {
|
|
||||||
shareWxData(2);
|
|
||||||
}),
|
|
||||||
shareAction('qq', 'QQ', () {
|
|
||||||
copyInviteText(logic.name);
|
|
||||||
}),
|
|
||||||
shareAction('wb', '微博', () {
|
|
||||||
copyInviteText(logic.name);
|
|
||||||
}),
|
|
||||||
shareAction('hb', '保存海报', () {
|
|
||||||
_saveLocalImage();
|
|
||||||
}),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)),
|
|
||||||
Container(
|
|
||||||
height: 1.sp,
|
|
||||||
color: Color(0x33FFFFFF),
|
|
||||||
),
|
|
||||||
GestureDetector(
|
|
||||||
onTap: () {
|
|
||||||
Get.back();
|
|
||||||
},
|
|
||||||
child: Container(
|
|
||||||
height: 67.sp,
|
|
||||||
alignment: Alignment.center,
|
|
||||||
child: Text(
|
|
||||||
'取消',
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.white, fontSize: 14.sp),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)))
|
))
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SafeArea(
|
||||||
|
top: false,
|
||||||
|
child: Container(
|
||||||
|
height: 164.sp,
|
||||||
|
width: Get.width,
|
||||||
|
color: Color(0xFF292247),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Container(
|
||||||
|
padding: EdgeInsets.only(
|
||||||
|
top: 15.sp, left: 15.sp, right: 15.sp),
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
shareAction('wx', '微信', () {
|
||||||
|
shareWxData(1);
|
||||||
|
}),
|
||||||
|
shareAction('wxq', '朋友圈', () {
|
||||||
|
shareWxData(2);
|
||||||
|
}),
|
||||||
|
shareAction('qq', 'QQ', () {
|
||||||
|
copyInviteText(logic.name);
|
||||||
|
}),
|
||||||
|
shareAction('wb', '微博', () {
|
||||||
|
copyInviteText(logic.name);
|
||||||
|
}),
|
||||||
|
shareAction('hb', '保存海报', () {
|
||||||
|
_saveLocalImage();
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
Container(
|
||||||
|
height: 1.sp,
|
||||||
|
color: Color(0x33FFFFFF),
|
||||||
|
),
|
||||||
|
GestureDetector(
|
||||||
|
onTap: () {
|
||||||
|
Get.back();
|
||||||
|
},
|
||||||
|
child: Container(
|
||||||
|
height: 67.sp,
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: Text(
|
||||||
|
'取消',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white, fontSize: 14.sp),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
))
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@ -52,28 +52,30 @@ class MinefragmentPage extends StatelessWidget {
|
|||||||
left: 11.sp,
|
left: 11.sp,
|
||||||
right: 11.sp,
|
right: 11.sp,
|
||||||
),
|
),
|
||||||
child: Column(
|
child: SingleChildScrollView(
|
||||||
children: [
|
child: Column(
|
||||||
_buildAvatarRow(logic),
|
children: [
|
||||||
_friendsRow(logic),
|
_buildAvatarRow(logic),
|
||||||
GestureDetector(
|
_friendsRow(logic),
|
||||||
onTap: () {
|
GestureDetector(
|
||||||
showRechargeDialog(logic);
|
onTap: () {
|
||||||
},
|
showRechargeDialog(logic);
|
||||||
child: Stack(children: [
|
},
|
||||||
MyImageWidget,
|
child: Stack(children: [
|
||||||
Positioned(
|
MyImageWidget,
|
||||||
top: 58.sp,
|
Positioned(
|
||||||
left: 90.sp,
|
top: 58.sp,
|
||||||
child: Text(logic.vipMsg,style: TextStyle(color: const Color(0x99FFFFFF),fontSize: 12.sp),)),
|
left: 90.sp,
|
||||||
Positioned(
|
child: Text(logic.vipMsg,style: TextStyle(color: const Color(0x99FFFFFF),fontSize: 12.sp),)),
|
||||||
top: 32.sp,
|
Positioned(
|
||||||
left: 90.sp,
|
top: 32.sp,
|
||||||
child: Text("会员-微乐园贵宾",style: TextStyle(color: const Color(0xFFFFFFFF),fontSize: 16.sp),))
|
left: 90.sp,
|
||||||
],),
|
child: Text("会员-微乐园贵宾",style: TextStyle(color: const Color(0xFFFFFFFF),fontSize: 16.sp),))
|
||||||
),
|
],),
|
||||||
_circleLiveView(logic),
|
),
|
||||||
],
|
_circleLiveView(logic),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user