Manual更新修正

Seilassist/Sailassist.xcodeproj/project.pbxproj

@@ -1238,7 +1238,7 @@
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;
@@ -1284,7 +1284,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;
@@ -1468,7 +1468,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;

Seilassist/Sailassist/Menu/MenuView.swift

@@ -73,21 +73,29 @@ enum MenuPath: String, Hashable{
     var fileIdntifer: String?{
         switch self {
         case .ManualECDISBasic:
-            "JAN-7201_9201(E)7ZPNA4449M"
+//            "JAN-7201_9201(E)7ZPNA4449M"
+            "9201(E)7ZPNA4449"
         case .ManualECDISFunction:
-            "JAN-7201_9201(E)7ZPNA4450K"
+//            "JAN-7201_9201(E)7ZPNA4450K"
+            "9201(E)7ZPNA4450"
         case .ManualVDR:
-            "JCY-1900(E)7ZPNA4384H"
+//            "JCY-1900(E)7ZPNA4384H"
+            "JCY-1900(E)7ZPNA4384"
         case .ManualAIS:
-            "JHS-183(E)7ZPJD0553E"
+//            "JHS-183(E)7ZPJD0553E"
+            "JHS-183(E)7ZPJD0553"
         case .ManualInternationalVHF:
-            "JHS-800S(E)7ZPJD0714B"
+//            "JHS-800S(E)7ZPJD0714B"
+            "JHS-800S(E)7ZPJD0714"
         case .ManualRADARBasic:
-            "JMR-7200_9200(E)7ZPNA4446K"
+//            "JMR-7200_9200(E)7ZPNA4446K"
+            "9200(E)7ZPNA4446"
         case .ManualRADARFunction:
-            "JMR-7200_9200(E)7ZPNA4447H"
+//            "JMR-7200_9200(E)7ZPNA4447H"
+            "9200(E)7ZPNA4447"
         case .ManualInmalsatC:
-            "JUE-87(E)7ZPSC0444A"
+//            "JUE-87(E)7ZPSC0444A"
+            "JUE-87(E)7ZPSC0444"
         default:
             nil
         }

Seilassist/Sailassist/Menu/View/MenuManualECDISView.swift

@@ -17,14 +17,14 @@ struct MenuManualECDISView: View {
             MenuTitleView(path: $path, title: MenuPath.ManualECDIS.title)
 
             if !isLoadingView {
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualECDISBasic.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualECDISBasic.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualECDISBasic, downloadUrl: manual.path,version: Preferences.ECDISBasicManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualECDISBasic)
                         Preferences.ECDISBasicManualVer = manual.name
                     }
                 }
 
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualECDISFunction.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualECDISFunction.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualECDISFunction, downloadUrl: manual.path,version: Preferences.ECDISFunctionManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualECDISFunction)
                         Preferences.ECDISFunctionManualVer = manual.name

Seilassist/Sailassist/Menu/View/MenuManualRADARView.swift

@@ -17,14 +17,14 @@ struct MenuManualRADARView: View {
             MenuTitleView(path: $path, title: MenuPath.ManualRADAR.title)
 
             if !isLoadingView {
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualRADARBasic.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualRADARBasic.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualRADARBasic, downloadUrl: manual.path,version: Preferences.RADARBasicManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualRADARBasic)
                         Preferences.RADARBasicManualVer = manual.name
                     }
                 }
 
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualRADARFunction.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualRADARFunction.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualRADARFunction, downloadUrl: manual.path,version: Preferences.RADARFunctionManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualRADARFunction)
                         Preferences.RADARFunctionManualVer = manual.name
@@ -34,7 +34,6 @@ struct MenuManualRADARView: View {
                 Text("Now Loading...").padding()
                 ProgressView()
             }
-
             Spacer()
         }
         .background(ColorSet.BackgroundPrimary.color)

Seilassist/Sailassist/Menu/View/MenuManualView.swift

@@ -30,28 +30,28 @@ struct MenuManualView: View {
                     MenuContentView(content: .ManualRADAR)
                 }
 
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualAIS.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualAIS.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualAIS, downloadUrl: manual.path,version: Preferences.AISManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualAIS)
                         Preferences.AISManualVer = manual.name
                     }
                 }
 
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualInmalsatC.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualInmalsatC.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualInmalsatC, downloadUrl: manual.path,version: Preferences.InmalsatCManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualInmalsatC)
                         Preferences.InmalsatCManualVer = manual.name
                     }
                 }
 
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualInternationalVHF.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualInternationalVHF.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualInternationalVHF, downloadUrl: manual.path,version: Preferences.InternationalVHFManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualInternationalVHF)
                         Preferences.InternationalVHFManualVer = manual.name
                     }
                 }
 
-                if let manual = SharingData.my.manualUrls.filter({$0.identifer == MenuPath.ManualVDR.fileIdntifer}).first{
+                if let manual = SharingData.my.manualUrls.filter({$0.identifer!.contains(MenuPath.ManualVDR.fileIdntifer!)}).first{
                     ManualDownloadButton(manualType: .ManualVDR, downloadUrl: manual.path,version: Preferences.VDRManualVer, newVersion: manual.name, isAlert: $isAlert, isLoadingView: $isLoadingView){
                         path.append(.ManualVDR)
                         Preferences.VDRManualVer = manual.name