文字内容调整

travelExport/Home.cs

@@ -463,21 +463,34 @@ namespace travelExport
                                                 }
                                                 else if (index == timeArr.Count)
                                                 {
+                                                    if (takeOffTime.AddHours(-3).Hour > 9)
+                                                    {
+                                                        trip += "08:00 早餐于酒店；\r\n";
+                                                    }
+
                                                     trip += $"{takeOffTime.AddHours(-3).ToString("HH:mm")} 抵达{start_Object.AirPort}{tabRow["StartBuilding"].ToString().Trim()}航站楼,办理登机手续：\r\n";
                                                 }
                                                 else
                                                 {
-                                                    if (takeOffTime.Hour >= 14)
+                                                    if(takeOffTime.AddHours(-2).Hour > 9)
+                                                    {
+                                                        trip += "08:00 早餐于酒店；\r\n";
+                                                    }
+
+                                                    if (takeOffTime.Hour >= 12)
                                                     {
                                                         trip += "09:00 公务活动；\r\n";
                                                     }
-                                                    if (takeOffTime.Hour >= 17)
+                                                    if (takeOffTime.Hour > 14)
                                                     {
                                                         trip += "10:30 公务活动；\r\n";
+                                                    }
+                                                    if (takeOffTime.Hour > 15)
+                                                    {
                                                         trip += "12:00 午餐于当地餐厅；\r\n";
                                                         trip += "14:00 公务活动；\r\n";
                                                     }
-                                                    if (takeOffTime.Hour >= 20)
+                                                    if (takeOffTime.Hour > 17)
                                                     {
                                                         trip += "16:00 公务活动；\r\n";
                                                     }
@@ -711,7 +724,10 @@ namespace travelExport
 
                                         if (nextDayNum == 0)
                                         {
-                                            trip += $"{time.ToString("HH:mm")} 搭乘专车前往市区（{end_Object.AirPort} - {end_Object.City}市区 路程{Distance}，耗时{Time}）；";
+                                            if (index != timeArr.Count)
+                                            {
+                                                trip += $"{time.ToString("HH:mm")} 搭乘专车前往市区（{end_Object.AirPort} - {end_Object.City}市区 路程{Distance}，耗时{Time}）；";
+                                            }
 
                                             if ((time > new DateTime(time.Year, time.Month, time.Day, 20,30,00) || time.AddMinutes(GetGoogleResult).Day > time.Day) && index != timeArr.Count)
                                             {
@@ -728,6 +744,12 @@ namespace travelExport
 
                                             if (index == timeArr.Count)
                                             {
+                                                trip = trip.RemoveEnd("\r\n");
+                                                if (trip.EndsWith("；"))
+                                                {
+                                                    trip = trip.RemoveEnd("；");
+                                                    trip += ",";
+                                                }
                                                 trip += "圆满结束此次访问之行！";
                                                 NewListTravel.Add(new Grp_TravelList
                                                 {
@@ -1548,20 +1570,33 @@ namespace travelExport
                                                 else if (index == timeArr.Count)
                                                 {
                                                     trip += $"{takeOffTime.AddHours(-3).ToString("HH:mm")} 抵达{start_Object.AirPort}{tabRow["StartBuilding"].ToString().Trim()}航站楼,办理登机手续：\r\n";
+
+                                                    if (takeOffTime.AddHours(-3).Hour > 9)
+                                                    {
+                                                        trip += "08:00 早餐于酒店；\r\n";
+                                                    }
                                                 }
                                                 else
                                                 {
-                                                    if (takeOffTime.Hour >= 14)
+                                                    if (takeOffTime.AddHours(-2).Hour > 9)
+                                                    {
+                                                        trip += "08:00 早餐于酒店；\r\n";
+                                                    }
+
+                                                    if (takeOffTime.Hour >= 12)
                                                     {
                                                         trip += "09:00 公务活动；\r\n";
                                                     }
-                                                    if (takeOffTime.Hour >= 17)
+                                                    if (takeOffTime.Hour > 14)
                                                     {
                                                         trip += "10:30 公务活动；\r\n";
+                                                    }
+                                                    if (takeOffTime.Hour > 15)
+                                                    {
                                                         trip += "12:00 午餐于当地餐厅；\r\n";
                                                         trip += "14:00 公务活动；\r\n";
                                                     }
-                                                    if (takeOffTime.Hour >= 20)
+                                                    if (takeOffTime.Hour > 17)
                                                     {
                                                         trip += "16:00 公务活动；\r\n";
                                                     }
@@ -1717,12 +1752,22 @@ namespace travelExport
                                         if (nextDayNum == 0)
                                         {
 
-                                            trip += $"{time.ToString("HH:mm")} 搭乘专车前往市区（{end_Object.AirPort} - {end_Object.City}市区 路程{Distance}，耗时{Time}）；";
+                                            if (index != timeArr.Count)
+                                            {
+                                                trip += $"{time.ToString("HH:mm")} 搭乘专车前往市区（{end_Object.AirPort} - {end_Object.City}市区 路程{Distance}，耗时{Time}）；";
+                                            }
 
                                             time = time.AddMinutes(GetGoogleResult);  //到达市区时间
 
                                             if (index == timeArr.Count)
                                             {
+                                                trip = trip.RemoveEnd("\r\n");
+                                                if (trip.EndsWith("；"))
+                                                {
+                                                    trip = trip.RemoveEnd("；");
+                                                    trip += ",";
+                                                }
+
                                                 trip += "圆满结束此次访问之行！";
                                                 NewListTravel.Add(new Grp_TravelList
                                                 {
@@ -1740,8 +1785,6 @@ namespace travelExport
                                                     IsDel = 0,
                                                 });
 
-
-
                                                 continue;
                                             }