This commit is contained in:
YangYuhao 2023-07-04 10:32:59 +08:00
parent d8a55f3e3e
commit 2130d8b706
4 changed files with 66 additions and 77 deletions

View File

@ -220,7 +220,7 @@ class Call_outLogic extends GetxController {
width: 339.sp,
padding: EdgeInsets.only(left: 17.sp, right: 17.sp),
child: Text(
'为打造纯净的社交环境,更好地服务大家,基于以下几方面考虑:1、平台升级为全天24小时人工审核保证用户真实避免骗子、酒托、虚假人士等扰乱平台 ;2、杜绝未入圈用户随意骚扰或影响已入圈的跨友;3、谢绝只会白嫖的猎奇人士。',
'为打造纯净的社交环境,更好地服务大家,基于以下几方面考虑:1、平台升级为全天24小时人工审核保证用户真实避免骗子、酒托、虚假人士等扰乱平台 ;2、杜绝未入圈用户随意骚扰或影响已入圈;3、谢绝只会白嫖的猎奇人士。',
style: TextStyle(
color: Color.fromRGBO(247, 250, 250, 0.8),
fontSize: 12.sp)),

View File

@ -87,7 +87,7 @@ class _OffaccountState extends State<OffaccountPage> {
),
SizedBox(height: 8.sp),
Text(
"1、无法登录跨友app",
"1、无法登录app",
style: TextStyle(
color: Color(0xFFB7BECC),
fontSize: 12.sp,

View File

@ -1,4 +1,3 @@
import 'dart:math';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:circle_app/app/userinfo/widgets/home_call_out.dart';
@ -12,6 +11,8 @@ import '../../util/util.dart';
import 'logic.dart';
class UserinfoPage extends StatefulWidget {
const UserinfoPage({super.key});
@override
_MyTabbedScreenState createState() => _MyTabbedScreenState();
}
@ -27,7 +28,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
void initState() {
super.initState();
_tabController = TabController(
length: 2, vsync: this, animationDuration: Duration(milliseconds: 200));
length: 2, vsync: this, animationDuration: const Duration(milliseconds: 200));
_tabController.animation!.addListener(_handleTabChange);
// _tabController.addListener(_handleTabChange);
// _tabController
@ -39,7 +40,6 @@ class _MyTabbedScreenState extends State<UserinfoPage>
// int currentIndex = .toString());
logic.isShowAlbum = _tabController.index == 0;
logic.update();
print('Current tab index: ${_tabController.previousIndex}');
}
@override
@ -48,17 +48,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
super.dispose();
}
void _onScroll(offset) {
if (offset > 100) {
setState(() {
isShowBlackTitle = true;
});
} else {
setState(() {
isShowBlackTitle = false;
});
}
}
final logic = Get.find<UserinfoLogic>();
final state = Get.find<UserinfoLogic>().state;
@ -77,7 +67,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
backgroundColor: Colors.transparent,
appBar: MyAppBar(
centerTitle: logic.userInfoBean != null
? logic.userInfoBean!.nickname + "的主页"
? "${logic.userInfoBean!.nickname}的主页"
: "个人主页",
),
body: Stack(
@ -125,7 +115,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
height: 34.sp,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.sp),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0xFF06F9FA),
Color(0xFFDC5BFD),
@ -154,7 +144,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
height: 34.sp,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.sp),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0x26FFFFFF),
Color(0x26FFFFFF),
@ -202,12 +192,12 @@ class _MyTabbedScreenState extends State<UserinfoPage>
controller.userInfoBean != null
? controller.userInfoBean!.nickname
: "",
style: TextStyle(
style: const TextStyle(
color: Color.fromRGBO(247, 250, 250, 1.0),
fontSize: 16,
fontSize: 14,
),
),
SizedBox(width: 10.sp),
SizedBox(width: 8.sp),
_buildInfoRow(controller),
],
),
@ -220,22 +210,23 @@ class _MyTabbedScreenState extends State<UserinfoPage>
decoration: BoxDecoration(
shape: BoxShape.circle,
color: logic.isOnline
? Color(0xFF00FFF4)
: Color(0xFF787575),
? const Color(0xFF00FFF4)
: const Color(0xFF787575),
),
),
Text(
controller.onLineCity,
style: TextStyle(
fontSize: 12,
color: logic.isOnline
? Color(0xFF00FFF4)
: Color(0xFF787575)),
? const Color(0xFF00FFF4)
: const Color(0xFF787575)),
)
],
),
],
),
Container(
SizedBox(
// margin: EdgeInsets.only(top: 18.sp, bottom: 18.sp),
height: 59.sp,
child: ListView.builder(
@ -253,20 +244,20 @@ class _MyTabbedScreenState extends State<UserinfoPage>
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.0), //
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0xFF06F9FA),
Color(0xFFDC5BFD),
],
),
color: Color(0xFF392D53),
color: const Color(0xFF392D53),
),
child: Container(
margin: EdgeInsets.all(0.2.sp),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.0),
// shape: BoxShape.circle,
color: Color(0xFF392D53),
color: const Color(0xFF392D53),
),
child: Padding(
padding: EdgeInsets.only(
@ -274,7 +265,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
child: Center(
child: Text(
controller.userInfoBean!.interests[index].title,
style: TextStyle(
style: const TextStyle(
fontSize: 11.0,
color: Colors.white,
),
@ -289,17 +280,15 @@ class _MyTabbedScreenState extends State<UserinfoPage>
),
titleTab(controller),
Expanded(
child: Container(
margin: EdgeInsets.only(bottom: 26.sp),
// color: Colors.blue,
child: TabBarView(
controller: _tabController,
children: [
_imageAdapter(controller),
HomeCallOutView(controller.userId),
],
),
))
child: TabBarView(
controller: _tabController,
children: [
_imageAdapter(controller),
Container(
margin: EdgeInsets.only(bottom: 26.sp),
child: HomeCallOutView(controller.userId)),
],
))
],
),
);
@ -315,10 +304,10 @@ class _MyTabbedScreenState extends State<UserinfoPage>
TabBar(
isScrollable: true,
controller: _tabController,
indicatorColor: Color(0xFF00FFF4),
indicatorColor: const Color(0xFF00FFF4),
indicatorWeight: 2.sp,
labelColor: Color(0xFF00FFF4),
unselectedLabelColor: Color(0xB3FFFFFF),
labelColor: const Color(0xFF00FFF4),
unselectedLabelColor: const Color(0xB3FFFFFF),
indicatorSize: TabBarIndicatorSize.label,
tabs: const [
Tab(
@ -385,7 +374,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
style: const TextStyle(color: Colors.white30),
)):Container(),
Expanded(child: Container(
margin: EdgeInsets.only(bottom: 28.0),
margin: const EdgeInsets.only(bottom: 58.0),
child: GridView.builder(
shrinkWrap: true,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
@ -440,7 +429,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
? Positioned(
left: 0,
right: 0,
bottom: 27.sp,
bottom: 26.sp,
child: GestureDetector(
onTap: () {
// showToast("完善资料");
@ -452,7 +441,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0xFF06F9FA),
Color(0xFFDC5BFD),
@ -463,7 +452,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
),
padding: EdgeInsets.only(
top: 10.sp, bottom: 10.sp, left: 55.sp, right: 55.sp),
child: Text(
child: const Text(
"完善个人形象",
style: TextStyle(
color: Colors.white,
@ -484,7 +473,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color.fromRGBO(141, 255, 248, 1.0),
Color.fromRGBO(181, 211, 255, 1.0),
@ -497,7 +486,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
top: 2.sp, bottom: 2.sp, left: 10.sp, right: 10.sp),
child: Text(
controller.ageMsg,
style: TextStyle(
style: const TextStyle(
color: Colors.black,
fontSize: 10,
),
@ -533,7 +522,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
? controller.userInfoBean!.signature
: "",
maxLines: 2,
style: TextStyle(color: Colors.white),
style: const TextStyle(color: Colors.white),
overflow: TextOverflow.ellipsis,
),
),
@ -548,7 +537,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
Container(
width: 68.sp,
height: 68.sp,
decoration: BoxDecoration(
decoration: const BoxDecoration(
shape: BoxShape.circle,
gradient: LinearGradient(
colors: [Color(0xFFDD3DF4), Color(0xFF30FFD9)],
@ -568,7 +557,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
Widget _buildAvatar1(UserinfoLogic controller) {
if (controller.userInfoBean == null) {
return Container(
return SizedBox(
width: 66.sp,
height: 66.sp,
);
@ -596,7 +585,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
Widget _buildImageItem(String url, UserinfoLogic controller, int index) {
return Stack(
children: [
Container(
SizedBox(
width: double.infinity, //
height: double.infinity,
child: ClipRRect(
@ -604,9 +593,9 @@ class _MyTabbedScreenState extends State<UserinfoPage>
child: GestureDetector(
onTap: () {
List<String> imaglist = [];
controller.state.imaglist.forEach((element) {
for (var element in controller.state.imaglist) {
imaglist.add(element.url);
});
}
Get.toNamed(AppRoutes.Swiper,
arguments: {'imaglist': imaglist, 'index': index});
},
@ -644,7 +633,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
backgroundColor: Colors.transparent,
builder: (BuildContext context) {
return Container(
decoration: BoxDecoration(
decoration: const BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(16.0),
topRight: Radius.circular(16.0),
@ -682,7 +671,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
),
Container(
margin: EdgeInsets.only(top: 2.sp),
child: Text(
child: const Text(
"举报",
style: TextStyle(color: Colors.white),
),
@ -706,7 +695,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
),
Container(
margin: EdgeInsets.only(top: 2.sp),
child: Text(
child: const Text(
"拉黑",
style: TextStyle(color: Colors.white),
),
@ -730,14 +719,14 @@ class _MyTabbedScreenState extends State<UserinfoPage>
backgroundColor: Colors.transparent,
child: Container(
height: 160.sp,
padding: EdgeInsets.all(1.0),
padding: const EdgeInsets.all(1.0),
child: Stack(
children: [
Container(
decoration: BoxDecoration(
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(10.0),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [Color(0xFFDD3DF4), Color(0xFF30FFD9)],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
@ -749,7 +738,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
decoration: BoxDecoration(
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(10.0),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [Color(0xFF4C3E5F), Color(0xFF324140)],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
@ -775,7 +764,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
"是否确认删除该形象照。",
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xCCF7FAFA), fontSize: 16.sp),
color: const Color(0xCCF7FAFA), fontSize: 16.sp),
),
),
Row(
@ -790,7 +779,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
margin: EdgeInsets.only(top: 30.sp),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0x26FFFFFF),
Color(0x26FFFFFF),
@ -804,7 +793,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
bottom: 10.sp,
left: 52.sp,
right: 52.sp),
child: Text(
child: const Text(
"",
style: TextStyle(
color: Colors.white,
@ -823,7 +812,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
margin: EdgeInsets.only(top: 24.sp),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0xFF06F9FA),
Color(0xFFDC5BFD),
@ -837,7 +826,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
bottom: 10.sp,
left: 52.sp,
right: 52.sp),
child: Text(
child: const Text(
"",
style: TextStyle(
color: Colors.white,
@ -867,14 +856,14 @@ class _MyTabbedScreenState extends State<UserinfoPage>
backgroundColor: Colors.transparent,
child: Container(
height: 277.sp,
padding: EdgeInsets.all(1.0),
padding: const EdgeInsets.all(1.0),
child: Stack(
children: [
Container(
decoration: BoxDecoration(
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(10.0),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [Color(0xFFDD3DF4), Color(0xFF30FFD9)],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
@ -886,7 +875,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
decoration: BoxDecoration(
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(10.0),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [Color(0xFF4C3E5F), Color(0xFF324140)],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
@ -921,7 +910,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
"拉黑后,你将屏蔽对方的任何信息若您关注了对方,将自动取消关注。",
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xCCF7FAFA), fontSize: 16.sp),
color: const Color(0xCCF7FAFA), fontSize: 16.sp),
),
),
Row(
@ -936,7 +925,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
margin: EdgeInsets.only(top: 24.sp),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0x26FFFFFF),
Color(0x26FFFFFF),
@ -950,7 +939,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
bottom: 10.sp,
left: 52.sp,
right: 52.sp),
child: Text(
child: const Text(
"",
style: TextStyle(
color: Colors.white,
@ -968,7 +957,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
margin: EdgeInsets.only(top: 24.sp),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17),
gradient: LinearGradient(
gradient: const LinearGradient(
colors: [
Color(0xFF06F9FA),
Color(0xFFDC5BFD),
@ -982,7 +971,7 @@ class _MyTabbedScreenState extends State<UserinfoPage>
bottom: 10.sp,
left: 52.sp,
right: 52.sp),
child: Text(
child: const Text(
"",
style: TextStyle(
color: Colors.white,

View File

@ -50,7 +50,7 @@ joiinCircileTipWdiget(String cicleId) {
width: 339.sp,
padding: EdgeInsets.only(left: 17.sp, right: 17.sp),
child: Text(
'为打造纯净的社交环境,更好地服务大家,基于以下几方面考虑:1、平台升级为全天24小时人工审核保证用户真实避免骗子、酒托、虚假人士等扰乱平台 ;2、杜绝未入圈用户随意骚扰或影响已入圈的跨友;3、谢绝只会白嫖的猎奇人士。',
'为打造纯净的社交环境,更好地服务大家,基于以下几方面考虑:1、平台升级为全天24小时人工审核保证用户真实避免骗子、酒托、虚假人士等扰乱平台 ;2、杜绝未入圈用户随意骚扰或影响已入圈的;3、谢绝只会白嫖的猎奇人士。',
style: TextStyle(
color: Color.fromRGBO(247, 250, 250, 0.8),
fontSize: 12.sp)),