RFC TWR2024用

TRViS.IO/Loaders/LoaderJson.cs

@@ -119,6 +119,8 @@ private LoaderJson(WorkGroupData[] workGroups)
 							TrainNumber = trainData.TrainNumber,
 							WorkId = workId,
 							WorkType = trainData.WorkType,
+							// TODO: JSONでのNextTrainIdのサポート
+							NextTrainId = trainIndex != trainList.Length - 1 ? trainList[trainIndex + 1].Id : null
 						},
 						trainData.TimetableRows.Select((v, i) => new TimetableRow(
 							Id: v.Id ?? i.ToString(),
@@ -207,7 +209,8 @@ public void Dispose()
 			IsRideOnMoving: t.IsRideOnMoving,
 
 			// TODO: E電時刻表用の線色設定のサポート
-			LineColor_RGB: null
+			LineColor_RGB: null,
+			NextTrainId: t.NextTrainId
 		);
 	}
 

TRViS.IO/Models/DBStructure.cs

@@ -324,6 +324,9 @@ public class TrainData : IHasRemarksProperty, IEquatable<TrainData>
 	[Column("color_id")]
 	public int? ColorId { get; set; }
 
+	[Column("next_train_id")]
+	public string? NextTrainId { get; set; }
+
 	public bool Equals(TrainData? obj)
 	{
 		if (obj is null)
@@ -371,6 +374,8 @@ public bool Equals(TrainData? obj)
 			IsRideOnMoving == obj.IsRideOnMoving
 			&&
 			ColorId == obj.ColorId
+			&&
+			NextTrainId == obj.NextTrainId
 		);
 	}
 
@@ -401,11 +406,12 @@ public override int GetHashCode()
 		hashCode.Add(DayCount);
 		hashCode.Add(IsRideOnMoving);
 		hashCode.Add(ColorId);
+		hashCode.Add(NextTrainId);
 		return hashCode.ToHashCode();
 	}
 
 	public override string ToString()
-		=> $"TrainData[{WorkId} / {Id}](TrainNumber='{TrainNumber}', MaxSpeed='{MaxSpeed}', SpeedType='{SpeedType}', NominalTractiveCapacity='{NominalTractiveCapacity}', CarCount={CarCount}, Destination='{Destination}', BeginRemarks='{BeginRemarks}', AfterRemarks='{AfterRemarks}', Remarks='{Remarks}', BeforeDeparture='{BeforeDeparture}', TrainInfo='{TrainInfo}', Direction={Direction}, WorkType={WorkType}, AfterArrive='{AfterArrive}', BeforeDeparture_OnStationTrackCol='{BeforeDeparture_OnStationTrackCol}', AfterArrive_OnStationTrackCol='{AfterArrive_OnStationTrackCol}', DayCount={DayCount}, IsRideOnMoving={IsRideOnMoving}, ColorId={ColorId})";
+		=> $"TrainData[{WorkId} / {Id}](TrainNumber='{TrainNumber}', MaxSpeed='{MaxSpeed}', SpeedType='{SpeedType}', NominalTractiveCapacity='{NominalTractiveCapacity}', CarCount={CarCount}, Destination='{Destination}', BeginRemarks='{BeginRemarks}', AfterRemarks='{AfterRemarks}', Remarks='{Remarks}', BeforeDeparture='{BeforeDeparture}', TrainInfo='{TrainInfo}', Direction={Direction}, WorkType={WorkType}, AfterArrive='{AfterArrive}', BeforeDeparture_OnStationTrackCol='{BeforeDeparture_OnStationTrackCol}', AfterArrive_OnStationTrackCol='{AfterArrive_OnStationTrackCol}', DayCount={DayCount}, IsRideOnMoving={IsRideOnMoving}, ColorId={ColorId}, NextTrainId={NextTrainId})";
 }
 
 [Table("timetable_row")]

TRViS.IO/Models/TrainData.cs

@@ -22,5 +22,6 @@ public record TrainData(
 	string? AfterArriveOnStationTrackCol = null,
 	int DayCount = 0,
 	bool? IsRideOnMoving = null,
-	int? LineColor_RGB = null
+	int? LineColor_RGB = null,
+	string? NextTrainId = null
 ) : IHasRemarksProperty;

TRViS.NetworkSyncService/HttpDataProvider.cs

@@ -95,12 +95,13 @@ void UpdateNextUri()
 		public async Task<SyncedData> GetSyncedDataAsync(CancellationToken token)
 		{
 			using HttpResponseMessage response = await _HttpClient.GetAsync(nextUri, token);
+			System.Diagnostics.Debug.WriteLine($"Uri: {nextUri}");
 			// 接続に失敗等しない限り、成功として扱う
 			// (ログ出力は今後検討)
 			if (!response.IsSuccessStatusCode)
 			{
 				return new(
-					Location_m: 0,
+					Location_m: double.NaN,
 					Time_ms: (long)DateTime.Now.TimeOfDay.TotalMilliseconds,
 					CanStart: false
 				);
@@ -110,16 +111,20 @@ public async Task<SyncedData> GetSyncedDataAsync(CancellationToken token)
 			if (json is null)
 			{
 				return new(
-					Location_m: 0,
+					Location_m: double.NaN,
 					Time_ms: (long)DateTime.Now.TimeOfDay.TotalMilliseconds,
 					CanStart: false
 				);
 			}
 			JsonElement root = json.RootElement;
-			double location_m = 0;
+			double location_m = double.NaN;
 			try
 			{
-				location_m = root.GetProperty(LOCATION_M_JSON_KEY).GetDouble();
+				JsonElement location_m_element = root.GetProperty(LOCATION_M_JSON_KEY);
+				if (location_m_element.ValueKind == JsonValueKind.Null)
+					location_m = double.NaN;
+				else
+					location_m = location_m_element.GetDouble();
 			}
 			catch (KeyNotFoundException) {}
 			catch (FormatException) {}

TRViS.NetworkSyncService/NetworkSyncService.cs

@@ -89,7 +89,7 @@ public async Task TickAsync(CancellationToken? cancellationToken = null)
 
 	void UpdateCurrentStationWithLocation(double location_m)
 	{
-		if (StaLocationInfo is null || !IsEnabled)
+		if (StaLocationInfo is null || !IsEnabled || double.IsNaN(location_m))
 			return;
 
 		bool isIn(double threshold1, double threshold2)

TRViS/AppShell.xaml.cs

@@ -5,6 +5,7 @@
 using System.Runtime.CompilerServices;
 using TRViS.RootPages;
 using TRViS.ViewModels;
+using TRViS.IO.RequestInfo;
 
 namespace TRViS;
 
@@ -54,6 +55,13 @@ public AppShell()
 		InstanceManager.AppViewModel.WindowHeight = DeviceDisplay.Current.MainDisplayInfo.Height;
 		logger.Trace("Display Width/Height: {0}x{1}", InstanceManager.AppViewModel.WindowWidth, InstanceManager.AppViewModel.WindowHeight);
 
+		Task.Run(() => InstanceManager.AppViewModel.HandleAppLinkUriAsync(new AppLinkInfo(
+			AppLinkInfo.FileType.Json,
+			new(1,0,0),
+			ResourceUri: new("http://twr.railway-fan-club.com/api/v1/trvis/timetable.json"),
+			RealtimeServiceUri: new("http://twr.railway-fan-club.com/api/v1/trvis/state")
+		), CancellationToken.None));
+
 		logger.Trace("AppShell Created");
 	}
 

TRViS/Controls/ToggleButton.cs

@@ -4,6 +4,7 @@
 namespace TRViS.Controls;
 
 [DependencyProperty<bool>("IsChecked", DefaultBindingMode = DefaultBindingMode.TwoWay)]
+[DependencyProperty<bool>("IsRadio", DefaultBindingMode = DefaultBindingMode.OneWay)]
 public partial class ToggleButton : ContentView
 {
 	private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
@@ -21,7 +22,7 @@ public ToggleButton()
 				Point? pt = e.GetPosition(this);
 				logger.Debug("Tapped (Pont: {0}, IsEnabled: {1}, IsChecked Before: {2})", pt, IsEnabled, IsChecked);
 				if (IsEnabled)
-					IsChecked = !IsChecked;
+					IsChecked = IsRadio || !IsChecked;
 			}
 			catch (Exception ex)
 			{

TRViS/DTAC/DTACElementStyles.cs

@@ -41,6 +41,10 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 		new(0x00, 0x80, 0x00),
 		new(0x00, 0x80, 0x00)
 	);
+	public static readonly AppThemeColorBindingExtension SemiDarkGreen = new(
+		new(0x00, 0x77, 0x00),
+		new(0x00, 0x77, 0x00)
+	);
 	public static readonly AppThemeColorBindingExtension DarkGreen = new(
 		new(0x00, 0x44, 0x00),
 		new(0x00, 0x33, 0x00)
@@ -61,6 +65,8 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 	public static readonly double DefaultTextSize = 14;
 	public static readonly double DefaultTextSizePlus = 15;
 	public static readonly double LargeTextSize = 24;
+	public static readonly double TimetableFontSize = DeviceInfo.Current.Platform == DevicePlatform.iOS ? 28 : 26;
+	public static readonly double TimetableRunLimitFontSize = DeviceInfo.Current.Platform == DevicePlatform.iOS ? 24 : 22;
 
 	public const int BeforeDeparture_AfterArrive_Height = 45;
 
@@ -165,6 +171,7 @@ public static Style BeforeRemarksStyleResource
 		v.HorizontalOptions = LayoutOptions.Start;
 		v.VerticalOptions = LayoutOptions.Start;
 		v.FontSize = DefaultTextSizePlus;
+		v.FontAttributes = FontAttributes.Bold;
 		v.LineHeight = DeviceInfo.Platform == DevicePlatform.Android ? 1.0 : 1.6;
 		// LineHeight分だけ上に隙間が空くため、MarginTopは設定しない
 		v.Margin = new(32, 0, 0, 0);
@@ -251,7 +258,7 @@ public static Style TimetableLabelStyleResource
 			};
 
 			_timetableLabelStyleResource.Setters.Add(Label.TextColorProperty, TimetableTextColor);
-			_timetableLabelStyleResource.Setters.Add(Label.FontSizeProperty, DeviceInfo.Current.Platform == DevicePlatform.iOS ? 28 : 26);
+			_timetableLabelStyleResource.Setters.Add(Label.FontSizeProperty, TimetableFontSize);
 			_timetableLabelStyleResource.Setters.Add(Label.FontAttributesProperty, FontAttributes.Bold);
 			_timetableLabelStyleResource.Setters.Add(Label.InputTransparentProperty, true);
 
@@ -263,7 +270,7 @@ public static Style TimetableLabelStyleResource
 		T v = LabelStyle<T>();
 
 		TimetableTextColor.Apply(v, Label.TextColorProperty);
-		v.FontSize = DeviceInfo.Current.Platform == DevicePlatform.iOS ? 28 : 26;
+		v.FontSize = TimetableFontSize;
 		v.FontAttributes = FontAttributes.Bold;
 		v.InputTransparent = true;
 
@@ -305,7 +312,7 @@ public static Style TimetableLargeNumberLabelStyleResource
 	{
 		T v = TimetableLargeNumberLabel<T>();
 
-		v.FontSize = DeviceInfo.Current.Platform == DevicePlatform.iOS ? 24 : 22;
+		v.FontSize = TimetableRunLimitFontSize;
 		v.Margin = v.Padding = new(0);
 		v.VerticalOptions = LayoutOptions.Center;
 

TRViS/DTAC/HakoParts/SimpleRow.cs

@@ -79,12 +79,13 @@ static Frame GenSelectTrainButtonFrame(Label TrainNumberLabel)
 		return v;
 	}
 
-	readonly ToggleButton SelectTrainButton = new();
+	readonly ToggleButton SelectTrainButton;
 	static ToggleButton GenSelectTrainButton(Frame SelectTrainButtonFrame, EventHandler<ValueChangedEventArgs<bool>> IsSelectedChanged, int rowIndex)
 	{
 		ToggleButton v = new()
 		{
 			Content = SelectTrainButtonFrame,
+			IsRadio = true,
 		};
 
 		Grid.SetColumn(v, 1);
@@ -130,26 +131,21 @@ static Line GenRouteLine(int rowIndex)
 	}
 
 	public TrainData TrainData { get; }
-	public IO.Models.DB.TrainData DBTrainData { get; }
 	public TimetableRow? FirstRow { get; } = null;
 	public TimetableRow? LastRow { get; } = null;
 
-	readonly Grid ParentGrid;
-
-	public SimpleRow(Grid parentGrid, int dataIndex, TrainData TrainData, IO.Models.DB.TrainData DBTrainData)
+	public SimpleRow(Grid parentGrid, int dataIndex, TrainData TrainData)
 	{
 		logger.Debug("Creating");
 
 		this.TrainData = TrainData;
-		this.DBTrainData = DBTrainData;
+
 		if (TrainData.Rows is not null)
 		{
 			FirstRow = TrainData.Rows.FirstOrDefault(v => !v.IsInfoRow);
 			LastRow = TrainData.Rows.LastOrDefault(v => !v.IsInfoRow);
 		}
 
-		ParentGrid = parentGrid;
-
 		int rowIndex_StaName_SelectBtn = dataIndex * 2;
 		int rowIndex_time = rowIndex_StaName_SelectBtn + 1;
 
@@ -177,7 +173,7 @@ public SimpleRow(Grid parentGrid, int dataIndex, TrainData TrainData, IO.Models.
 		parentGrid.Add(RouteLine);
 		parentGrid.Add(ToTimeLabel);
 
-		SelectTrainButton.IsChecked = InstanceManager.AppViewModel.SelectedDBTrainData?.Id == DBTrainData.Id;
+		SelectTrainButton.IsChecked = InstanceManager.AppViewModel.SelectedTrainData?.Id == TrainData.Id;
 		SetTrainNumberButtonState();
 
 		logger.Debug("Created");