|
|
@@ -116,12 +116,7 @@ class MainPage extends BasePage<MainController> {
|
|
|
? null
|
|
|
: controller
|
|
|
.todayTrackReportMap[controller.selectedFriend?.id];
|
|
|
- if (controller.memberStatusInfo.value == null ||
|
|
|
- controller.memberStatusInfo.value?.expired == true) {
|
|
|
- return buildNoMemberView();
|
|
|
- } else {
|
|
|
- return buildTodayTrackView(todayTrack);
|
|
|
- }
|
|
|
+ return buildTodayTrackView(todayTrack);
|
|
|
})),
|
|
|
),
|
|
|
);
|
|
|
@@ -133,6 +128,10 @@ class MainPage extends BasePage<MainController> {
|
|
|
Visibility(
|
|
|
visible: todayTrack?.isRequestSuccess.value == false,
|
|
|
child: buildTodayTrackLoadingView()),
|
|
|
+ Visibility(
|
|
|
+ visible: controller.memberStatusInfo.value == null ||
|
|
|
+ controller.memberStatusInfo.value?.expired == true,
|
|
|
+ child: buildNoMemberView())
|
|
|
]);
|
|
|
}
|
|
|
|
|
|
@@ -313,9 +312,11 @@ class MainPage extends BasePage<MainController> {
|
|
|
},
|
|
|
child: Container(
|
|
|
margin: EdgeInsets.only(right: 16.w, left: 8.w),
|
|
|
- child: Platform.isIOS ? Assets.images.iconMainAddFriend
|
|
|
- .image(width: 60.w, height: 60.w) : Assets.images.iconMainAddFriendAndroid
|
|
|
- .image(width: 60.w, height: 60.w)),
|
|
|
+ child: Platform.isIOS
|
|
|
+ ? Assets.images.iconMainAddFriend
|
|
|
+ .image(width: 60.w, height: 60.w)
|
|
|
+ : Assets.images.iconMainAddFriendAndroid
|
|
|
+ .image(width: 60.w, height: 60.w)),
|
|
|
)
|
|
|
],
|
|
|
),
|
|
|
@@ -375,22 +376,34 @@ class MainPage extends BasePage<MainController> {
|
|
|
children: [
|
|
|
Expanded(
|
|
|
child: buildFunItem(
|
|
|
- Platform.isIOS ? Assets.images.iconMainFriendGuard.provider() : Assets.images.iconMainFriendGuardAndroid.provider(),
|
|
|
+ Platform.isIOS
|
|
|
+ ? Assets.images.iconMainFriendGuard.provider()
|
|
|
+ : Assets.images.iconMainFriendGuardAndroid.provider(),
|
|
|
StringName.mainFriendListTab,
|
|
|
() => controller.onFriendClick())),
|
|
|
Expanded(child: Obx(() {
|
|
|
- return buildFunItem(Platform.isIOS ? Assets.images.iconMainNews.provider() : Assets.images.iconMainNewsAndroid.provider(),
|
|
|
- StringName.mainNewsTab, () => controller.onNewsClick(),
|
|
|
+ return buildFunItem(
|
|
|
+ Platform.isIOS
|
|
|
+ ? Assets.images.iconMainNews.provider()
|
|
|
+ : Assets.images.iconMainNewsAndroid.provider(),
|
|
|
+ StringName.mainNewsTab,
|
|
|
+ () => controller.onNewsClick(),
|
|
|
isShowDot: controller.hasUnreadMessage);
|
|
|
})),
|
|
|
Expanded(
|
|
|
child: buildFunItem(
|
|
|
- Platform.isIOS ? Assets.images.iconMainHelp.provider() : Assets.images.iconMainHelpAndroid.provider(),
|
|
|
+ Platform.isIOS
|
|
|
+ ? Assets.images.iconMainHelp.provider()
|
|
|
+ : Assets.images.iconMainHelpAndroid.provider(),
|
|
|
StringName.mainHelpTab,
|
|
|
() => controller.onUrgentContactClick())),
|
|
|
Expanded(
|
|
|
- child: buildFunItem(Platform.isIOS ? Assets.images.iconMainMine.provider() : Assets.images.iconMainMineAndroid.provider(),
|
|
|
- StringName.mainMineTab, () => controller.onMineClick()))
|
|
|
+ child: buildFunItem(
|
|
|
+ Platform.isIOS
|
|
|
+ ? Assets.images.iconMainMine.provider()
|
|
|
+ : Assets.images.iconMainMineAndroid.provider(),
|
|
|
+ StringName.mainMineTab,
|
|
|
+ () => controller.onMineClick()))
|
|
|
],
|
|
|
);
|
|
|
}
|