xjw/circle_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.1.1代码提交

Browse Source
This commit is contained in:
CYH 2024-05-07 18:59:52 +08:00
parent 864bcabcbc
commit 7eeb820543
8 changed files with 139 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
circle_app/lib/app/circle_list/widgets/circle_type_item.dart
View File

@ -71,7 +71,7 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
SizedBox(height: 4.sp,), SizedBox(height: 4.sp,),
Container( Container(
// color: Colors.red, // color: Colors.red,
height: 100.sp, height: 145.sp,
width: Get.width, width: Get.width,
child: ListView.builder( child: ListView.builder(
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
@ -81,9 +81,9 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
// Get.toName(''); // Get.toName('');
}, },
child: Container( child: Container(
height: 100.sp, height: 145.sp,
width: 90.sp, width: 110.sp,
margin: EdgeInsets.only(right: 4.sp), margin: EdgeInsets.only(right: 8.sp),
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
fit: StackFit.expand, fit: StackFit.expand,
@ -93,8 +93,8 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
child: Image.network( child: Image.network(
dataList[index]['image'], dataList[index]['image'],
fit: BoxFit.cover, fit: BoxFit.cover,
height: 120.sp, height: 145.sp,
width: 90.sp, width: 110.sp,
)), )),
Column( Column(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
@ -110,12 +110,12 @@ class _CircleTypeItemState extends State<CircleTypeItem> {
padding: padding:
EdgeInsets.only(left: 10.sp, right: 10.sp), EdgeInsets.only(left: 10.sp, right: 10.sp),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColor.bgColor, color: AppColor.bgColor.withOpacity(0.65),
borderRadius: BorderRadius.circular(2.sp)), borderRadius: BorderRadius.circular(3.sp)),
child: Text( child: Text(
dataList[index]['title'], dataList[index]['title'],
style: TextStyle( style: TextStyle(
color: Colors.white, fontSize: 12.sp), color: Colors.white, fontSize: 13.sp),
), ),
), ),
], ],

6
circle_app/lib/app/home/logic.dart
View File

@ -110,9 +110,9 @@ class HomeLogic extends GetxController with WidgetsBindingObserver {
checkVersion(); checkVersion();
loadMyCircleData(); loadMyCircleData();
if (Platform.isAndroid) {
initWxApi(); initWxApi();
}
} }
void addMsgListener() { void addMsgListener() {

4
circle_app/lib/app/minefragment/view.dart
View File

@ -413,7 +413,7 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
SizedBox(width: 10.sp), SizedBox(width: 10.sp),
const Text( const Text(
"评价微乐园", "给个5星好评",
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
), ),
@ -430,7 +430,7 @@ class _MinefragmentPageState extends State<MinefragmentPage> with RouteAware {
shape: BoxShape.circle), shape: BoxShape.circle),
), ),
const Text( const Text(
"+3天会员时长", "免费领3天会员",
style: TextStyle(color: Colors.white60), style: TextStyle(color: Colors.white60),
), ),
Image( Image(

4
circle_app/lib/app/report/view.dart
View File

@ -53,7 +53,7 @@ class ReportPage extends StatelessWidget {
), ),
), ),
SizedBox( SizedBox(
height: 120.sp, height: 140.sp,
child: _reportAdapter(controller), child: _reportAdapter(controller),
), ),
Expanded( Expanded(
@ -72,7 +72,7 @@ class ReportPage extends StatelessWidget {
// 添加 RecyclerView（ListView） 的内容 // 添加 RecyclerView（ListView） 的内容
// 例如: MyRecyclerViewWidget(), // 例如: MyRecyclerViewWidget(),
SizedBox( SizedBox(
height: 130.sp, height: 150.sp,
child: _imageAdapter(controller)), child: _imageAdapter(controller)),
Text( Text(
'补充说明', '补充说明',

229
circle_app/lib/app/world_call_out/view.dart
View File

@ -487,123 +487,128 @@ class _World_call_outPageState extends State<World_call_outPage>
circleInfoItem(WorldLists list) { circleInfoItem(WorldLists list) {
return list.interest!.image != null return list.interest!.image != null
? ClipRRect( ? GestureDetector(
onTap: () {
Get.toNamed(AppRoutes.Signal_circle_list, arguments: list.interest!.id!);
},
child: ClipRRect(
child: Container( child: Container(
padding: EdgeInsets.only(left: 12.sp, right: 12.sp), padding: EdgeInsets.only(left: 12.sp, right: 12.sp),
height: 40.sp, height: 40.sp,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.sp), borderRadius: BorderRadius.circular(10.sp),
border: Border.all(color: Colors.white.withOpacity(0.1),width: 1.sp) border: Border.all(color: Colors.white.withOpacity(0.1),width: 1.sp)
// image: DecorationImage( // image: DecorationImage(
// fit: BoxFit.fill, // fit: BoxFit.fill,
// image: AssetImage(getCircleImage('top_circle_bg'))) // image: AssetImage(getCircleImage('top_circle_bg')))
), ),
child: Row( child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Container( Container(
width: 32.sp, width: 32.sp,
height: 32.sp, height: 32.sp,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
gradient: const LinearGradient( gradient: const LinearGradient(
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
colors: [ colors: [
Color(0xFF71F3F2), Color(0xFF71F3F2),
Color(0xFFF558FF), Color(0xFFF558FF),
], ],
stops: [0.0365, 0.9427], stops: [0.0365, 0.9427],
),
),
padding: EdgeInsets.all(1.sp),
child: ClipRRect(
borderRadius: BorderRadius.circular(8.0),
child: CachedNetworkImage(
imageUrl: list.interest!.image!,
width: 30.sp,
height: 30.sp,
fit: BoxFit.cover),
), ),
), ),
padding: EdgeInsets.all(1.sp), Expanded(
child: ClipRRect( child: GestureDetector(
borderRadius: BorderRadius.circular(8.0), behavior: HitTestBehavior.opaque,
child: CachedNetworkImage( onTap: () {
imageUrl: list.interest!.image!, // scrollController.animateTo(
width: 30.sp, // 0.0, // Scroll to the top
height: 30.sp, // duration: Duration(milliseconds: 300),
fit: BoxFit.cover), // curve: Curves.easeInOut,
), // );
),
Expanded(
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
// scrollController.animateTo(
// 0.0, // Scroll to the top
// duration: Duration(milliseconds: 300),
// curve: Curves.easeInOut,
// );
},
child: Container(
padding: EdgeInsets.only(left: 8.sp, top: 2.sp),
// alignment: Alignment.,
// height: 40.sp,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
list.interest!.title!,
style: TextStyle(
color: Colors.white,
fontSize: 14.sp,),
),
SizedBox(
height: 2.sp,
),
Text(
'${convertToTenThousand(list.interest!.viewTotal!)}人看过',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.white.withOpacity(0.5),
fontSize: 10.sp,
),
),
],
),
),
)),
GestureDetector(
//加入圈子
onTap: () async {
if (list.interest!.isJoin!) {
Map<String, dynamic> info = list.interest!.toJson();
Get.bottomSheet(
CircleShare('', '', Circle.fromJson(info)),
isScrollControlled: true,
enableDrag: false);
} else {
await logic.outCircle(list.interest!.id!.toString(),
list.interest!.isJoin!);
if (Get.isRegistered<LikeLogic>()) {
LikeLogic likeLogic = Get.find<LikeLogic>();
likeLogic.loadMyCircleData();
}
logic.update();
}
}, },
child: Stack( child: Container(
alignment: Alignment.center, padding: EdgeInsets.only(left: 8.sp, top: 2.sp),
children: [ // alignment: Alignment.,
Opacity( // height: 40.sp,
opacity: 0.5, child: Column(
child: Image.asset( crossAxisAlignment: CrossAxisAlignment.start,
getCircleImage('add'), children: [
width: 60.sp, Text(
list.interest!.title!,
style: TextStyle(
color: Colors.white,
fontSize: 14.sp,),
), ),
), SizedBox(
Text( height: 2.sp,
!list.interest!.isJoin! ? '申请加入' : '分享有奖', ),
style: Text(
TextStyle(color: Colors.white, fontSize: 12.sp), '${convertToTenThousand(list.interest!.viewTotal!)}人看过',
) textAlign: TextAlign.left,
], style: TextStyle(
)) color: Colors.white.withOpacity(0.5),
], fontSize: 10.sp,
), ),
)) ),
],
),
),
)),
GestureDetector(
//加入圈子
onTap: () async {
if (list.interest!.isJoin!) {
Map<String, dynamic> info = list.interest!.toJson();
Get.bottomSheet(
CircleShare('', '', Circle.fromJson(info)),
isScrollControlled: true,
enableDrag: false);
} else {
await logic.outCircle(list.interest!.id!.toString(),
list.interest!.isJoin!);
if (Get.isRegistered<LikeLogic>()) {
LikeLogic likeLogic = Get.find<LikeLogic>();
likeLogic.loadMyCircleData();
}
logic.update();
}
},
child: Stack(
alignment: Alignment.center,
children: [
Opacity(
opacity: 0.5,
child: Image.asset(
getCircleImage('add'),
width: 60.sp,
),
),
Text(
!list.interest!.isJoin! ? '申请加入' : '分享有奖',
style:
TextStyle(color: Colors.white, fontSize: 12.sp),
)
],
))
],
),
)),
)
: Container(); : Container();
} }

6
circle_app/lib/main.dart
View File

@ -360,9 +360,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
minTextAdapt: true, minTextAdapt: true,
splitScreenMode: true, splitScreenMode: true,
builder: (context, child) { builder: (context, child) {
return RefreshConfiguration( return OKToast(
footerBuilder: () => CustomLoadFooter(),
child: OKToast(
// 2-A: wrap your app with OKToast // 2-A: wrap your app with OKToast
textStyle: const TextStyle(fontSize: 19.0, color: Colors.white), textStyle: const TextStyle(fontSize: 19.0, color: Colors.white),
backgroundColor: Colors.grey, backgroundColor: Colors.grey,
@ -400,7 +398,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
}, },
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
), ),
)); );
}); });
} }

5
circle_app/lib/util/util.dart
View File

@ -87,8 +87,7 @@ showOKToast(String msg) {
position: ToastPosition.center, position: ToastPosition.center,
backgroundColor: Colors.black.withOpacity(0.8), backgroundColor: Colors.black.withOpacity(0.8),
radius: 13.0, radius: 13.0,
textStyle: const TextStyle(fontSize: 16.0), textStyle: const TextStyle(fontSize: 16.0,color: Colors.white),
// animationBuilder: const Miui10AnimBuilder(),
); );
} }
@ -1106,7 +1105,7 @@ pushPage(String action,String param,{String name = ''}) {
} else if (action == 'offsite_share') { } else if (action == 'offsite_share') {
Get.toNamed(AppRoutes.ExternalsharePage); Get.toNamed(AppRoutes.ExternalsharePage);
} else if (action == 'good_rate') { } else if (action == 'good_rate') {
await launch('https://apps.apple.com/cn/app/%E5%BE%AE%E4%B9%90%E5%9B%AD-%E4%BA%9A%E6%96%87%E5%8C%96%E5%A4%9A%E5%85%83%E4%BA%A4%E5%8F%8B%E5%9F%BA%E5%9C%B0/id6459449499', forceSafariVC: false); launch('https://apps.apple.com/cn/app/%E5%BE%AE%E4%B9%90%E5%9B%AD-%E4%BA%9A%E6%96%87%E5%8C%96%E5%A4%9A%E5%85%83%E4%BA%A4%E5%8F%8B%E5%9F%BA%E5%9C%B0/id6459449499', forceSafariVC: false);
} else if (action == 'buy_vip') { } else if (action == 'buy_vip') {
showOepnVipDialog(); showOepnVipDialog();
} else if (action == 'recharge') { } else if (action == 'recharge') {

12
circle_app/pubspec.lock
View File

@ -45,10 +45,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: app_settings name: app_settings
sha256: e6a34735d4ddb24ca9c5fd7e965ec65c8b611cbd3a329152c294f9e9f4bacb33 sha256: "2ec421f375d747916c4c0193933567074ea60c4f01c4a68642f07fef1002524e"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.1" version: "4.0.4"
archive: archive:
dependency: transitive dependency: transitive
description: description:
@ -630,14 +630,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.3" version: "1.1.3"
flutter_install_app:
dependency: "direct main"
description:
name: flutter_install_app
sha256: "9b117006d17c900e671c26bcbc9b15c7b8efd15d6f9b4442ad5d576de20fab53"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
flutter_intl: flutter_intl:
dependency: "direct main" dependency: "direct main"
description: description: