Merge branch 'v1.1.0' into v1.1.0-iOS

lib/module/main/main_controller.dart

@@ -91,8 +91,6 @@ class MainController extends BaseController {
 
   double? lastVisibleFraction;
 
-  final Debounce _queryTodayTrackDebounce = Debounce(debounceTime: 500);
-
   final Map<String, int> electricMap = {};
 
   RxMap<String, TodayTrackReportBean> get todayTrackReportMap =>
@@ -515,9 +513,7 @@ class MainController extends BaseController {
   void onFriendVisibleFraction(double visibleFraction) {
     lastVisibleFraction = visibleFraction;
     if (visibleFraction > 0.2) {
-      _queryTodayTrackDebounce.onClick(() {
-        _requestSelectedFriendTrack();
-      });
+      _requestSelectedFriendTrack();
     }
   }
 

lib/module/main/main_page.dart

@@ -126,7 +126,8 @@ class MainPage extends BasePage<MainController> {
     return Stack(children: [
       buildTodayTrackDetailView(todayTrack),
       Visibility(
-          visible: todayTrack?.isRequestSuccess.value == false,
+          visible:
+              todayTrack == null || todayTrack.isRequestSuccess.value == false,
           child: buildTodayTrackLoadingView()),
       Visibility(
           visible: controller.memberStatusInfo.value == null ||

lib/module/track/track_controller.dart

@@ -18,6 +18,7 @@ import 'package:sliding_sheet2/sliding_sheet2.dart';
 import '../../data/bean/track_daily_bean.dart';
 import '../../data/bean/user_info.dart';
 import '../../dialog/common_confirm_dialog_impl.dart';
+import '../../dialog/loading_dialog.dart';
 import '../../dialog/location_permission_dialog.dart';
 import '../../sdk/map/map_helper.dart';
 import '../../sdk/wechat/wechat_share_util.dart';
@@ -266,9 +267,15 @@ class TrackController extends BaseController
     if (day == null || userInfo == null) {
       return;
     }
-    _shareTrackData.value = summary;
-    await Future.delayed(Duration(milliseconds: 100));
-    await WechatShareUtil.shareWidgetToWeChat(shareGlobalKey);
+    try {
+      CustomLoadingDialog.show();
+      _shareTrackData.value = summary;
+      await Future.delayed(Duration(milliseconds: 500));
+      await WechatShareUtil.shareWidgetToWeChat(shareGlobalKey);
+    } catch (e) {
+      print(e);
+    }
+    CustomLoadingDialog.hide();
     _shareTrackData.value = null;
   }
 

lib/module/track/track_day_detail/track_day_detail_controller.dart

@@ -412,7 +412,8 @@ class TrackDayDetailController extends BaseController {
       return;
     }
     if (summary.showTrackSituation == true &&
-        summary.trackSituation?.isEmpty == true) {
+        (summary.trackSituation == null ||
+            summary.trackSituation?.isEmpty == true)) {
       ToastUtil.show(StringName.trackStayShareAnalysis);
       return;
     }

lib/module/track/track_day_detail/track_share_view.dart

@@ -68,6 +68,12 @@ class TrackShareView extends StatelessWidget {
             ),
           ),
           buildContent2View(),
+          Visibility(
+              visible: trackDailySummary.stayLongest == null,
+              child: SizedBox(height: 80.w)),
+          Visibility(
+              visible: !trackDailySummary.showTrackSituation,
+              child: SizedBox(height: 80.w)),
           SizedBox(height: 96.w),
           buildAppLogoView(),
           SizedBox(height: 16.w),
@@ -114,7 +120,7 @@ class TrackShareView extends StatelessWidget {
               isShowDivider: trackDailySummary.stayLongest != null),
           _buildSituationItem(Assets.images.iconShareStay.provider(),
               StringName.trackDailySummaryStay, trackDailySummary.stayLongest,
-              isShowDivider:
+              isShowDivider: trackDailySummary.showTrackSituation &&
                   trackDailySummary.trackSituation?.isNotEmpty == true),
           _buildDailyTrack()
         ],