diff --git a/.DS_Store b/.DS_Store index 21dddfb..23f1c44 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Design/iMJ UI.sketch b/Design/iMJ UI.sketch index b84e8aa..a15b48f 100755 Binary files a/Design/iMJ UI.sketch and b/Design/iMJ UI.sketch differ diff --git a/iMeiJu_Mac.xcodeproj/project.pbxproj b/iMeiJu_Mac.xcodeproj/project.pbxproj index 1d1f097..b3d1405 100644 --- a/iMeiJu_Mac.xcodeproj/project.pbxproj +++ b/iMeiJu_Mac.xcodeproj/project.pbxproj @@ -53,6 +53,8 @@ A536D60E221BCAA30035A177 /* IZDetailWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A536D60C221BCAA30035A177 /* IZDetailWindowController.swift */; }; A536D60F221BCAA30035A177 /* IZDetailWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A536D60D221BCAA30035A177 /* IZDetailWindowController.xib */; }; A537C3012217D45F00DE59FC /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = A537C3002217D45F00DE59FC /* dsa_pub.pem */; }; + A53F2EAC221D186000065D72 /* IZTracingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53F2EAA221D186000065D72 /* IZTracingViewController.swift */; }; + A53F2EAD221D186000065D72 /* IZTracingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A53F2EAB221D186000065D72 /* IZTracingViewController.xib */; }; DC8CB4A1F6C2CCBB5C4973B1 /* Pods_iMeiJu_Mac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24E8B0BE509C7166EBA48B1E /* Pods_iMeiJu_Mac.framework */; }; /* End PBXBuildFile section */ @@ -109,6 +111,8 @@ A536D60C221BCAA30035A177 /* IZDetailWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IZDetailWindowController.swift; sourceTree = ""; }; A536D60D221BCAA30035A177 /* IZDetailWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IZDetailWindowController.xib; sourceTree = ""; }; A537C3002217D45F00DE59FC /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; + A53F2EAA221D186000065D72 /* IZTracingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IZTracingViewController.swift; sourceTree = ""; }; + A53F2EAB221D186000065D72 /* IZTracingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IZTracingViewController.xib; sourceTree = ""; }; BEC8AFFE637A62C7979464AD /* Pods-iMeiJu_Mac.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iMeiJu_Mac.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iMeiJu_Mac/Pods-iMeiJu_Mac.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -207,6 +211,8 @@ 2723E377220821E900EB9CE1 /* IZPlotMessageViewController.xib */, 2794040E22127D6A00970316 /* IZCollectionViewController.swift */, 2794040F22127D6A00970316 /* IZCollectionViewController.xib */, + A53F2EAA221D186000065D72 /* IZTracingViewController.swift */, + A53F2EAB221D186000065D72 /* IZTracingViewController.xib */, 27940416221292D000970316 /* IZSettingViewController.swift */, 27940417221292D000970316 /* IZSettingViewController.xib */, ); @@ -392,6 +398,7 @@ files = ( 2705F0E92205BFB6005A0BB1 /* Assets.xcassets in Resources */, 2794041F2212A86500970316 /* IZMoreWindowController.xib in Resources */, + A53F2EAD221D186000065D72 /* IZTracingViewController.xib in Resources */, 2794041122127D6A00970316 /* IZCollectionViewController.xib in Resources */, A536D60F221BCAA30035A177 /* IZDetailWindowController.xib in Resources */, 278604AF2209418D0097192A /* IZMoreViewController.xib in Resources */, @@ -485,6 +492,7 @@ 2705F12F2205C3ED005A0BB1 /* IZExtension.swift in Sources */, 2723E38322085FBF00EB9CE1 /* IZEpisodeItem.swift in Sources */, 2794041B2212A18F00970316 /* IZSearchView.swift in Sources */, + A53F2EAC221D186000065D72 /* IZTracingViewController.swift in Sources */, 278604B92209A27B0097192A /* IZSearchViewController.swift in Sources */, 279403D22211527A00970316 /* IZClipView.swift in Sources */, 278604AE2209418D0097192A /* IZMoreViewController.swift in Sources */, diff --git a/iMeiJu_Mac/Assets.xcassets/.DS_Store b/iMeiJu_Mac/Assets.xcassets/.DS_Store new file mode 100644 index 0000000..8b6266a Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/.DS_Store differ diff --git a/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@2x.png b/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@2x.png index 4ddf984..5904068 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@2x.png and b/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@3x.png b/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@3x.png index b639ce6..7615255 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@3x.png and b/iMeiJu_Mac/Assets.xcassets/movie.imageset/movie@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/movie_select@2x.png b/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/movie_select@2x.png deleted file mode 100644 index 5812ff9..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/movie_select@2x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/movie_select@3x.png b/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/movie_select@3x.png deleted file mode 100644 index 894e669..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/movie_select@3x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/search_select.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/Contents.json similarity index 75% rename from iMeiJu_Mac/Assets.xcassets/search_select.imageset/Contents.json rename to iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/Contents.json index 9a47de1..00e6202 100644 --- a/iMeiJu_Mac/Assets.xcassets/search_select.imageset/Contents.json +++ b/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "search_select@2x.png", + "filename" : "movie_selected@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "search_select@3x.png", + "filename" : "movie_selected@3x.png", "scale" : "3x" } ], diff --git a/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/movie_selected@2x.png b/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/movie_selected@2x.png new file mode 100644 index 0000000..b81996d Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/movie_selected@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/movie_selected@3x.png b/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/movie_selected@3x.png new file mode 100644 index 0000000..5040f88 Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/movie_selected.imageset/movie_selected@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@2x.png b/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@2x.png index cdba9e7..c58962f 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@2x.png and b/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@3x.png b/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@3x.png index 67bcbcb..f5f5800 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@3x.png and b/iMeiJu_Mac/Assets.xcassets/recommend.imageset/recommend@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/recommend_select@2x.png b/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/recommend_select@2x.png deleted file mode 100644 index b957d7b..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/recommend_select@2x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/recommend_select@3x.png b/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/recommend_select@3x.png deleted file mode 100644 index 7c79d53..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/recommend_select@3x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/Contents.json new file mode 100644 index 0000000..0c25fd6 --- /dev/null +++ b/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "recommend_selected@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "recommend_selected@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/recommend_selected@2x.png b/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/recommend_selected@2x.png new file mode 100644 index 0000000..8bdd450 Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/recommend_selected@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/recommend_selected@3x.png b/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/recommend_selected@3x.png new file mode 100644 index 0000000..c71ca1c Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/recommend_selected.imageset/recommend_selected@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/search.imageset/search@2x.png b/iMeiJu_Mac/Assets.xcassets/search.imageset/search@2x.png index 8b41440..68455e9 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/search.imageset/search@2x.png and b/iMeiJu_Mac/Assets.xcassets/search.imageset/search@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/search.imageset/search@3x.png b/iMeiJu_Mac/Assets.xcassets/search.imageset/search@3x.png index 3477637..ed81fc8 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/search.imageset/search@3x.png and b/iMeiJu_Mac/Assets.xcassets/search.imageset/search@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/search_select.imageset/search_select@2x.png b/iMeiJu_Mac/Assets.xcassets/search_select.imageset/search_select@2x.png deleted file mode 100644 index 342eba8..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/search_select.imageset/search_select@2x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/search_select.imageset/search_select@3x.png b/iMeiJu_Mac/Assets.xcassets/search_select.imageset/search_select@3x.png deleted file mode 100644 index ed2002d..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/search_select.imageset/search_select@3x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/setting_select.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/Contents.json similarity index 75% rename from iMeiJu_Mac/Assets.xcassets/setting_select.imageset/Contents.json rename to iMeiJu_Mac/Assets.xcassets/search_selected.imageset/Contents.json index 2ab82c2..73ad181 100644 --- a/iMeiJu_Mac/Assets.xcassets/setting_select.imageset/Contents.json +++ b/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "setting_select@2x.png", + "filename" : "search_selected@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "setting_select@3x.png", + "filename" : "search_selected@3x.png", "scale" : "3x" } ], diff --git a/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/search_selected@2x.png b/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/search_selected@2x.png new file mode 100644 index 0000000..c31dc55 Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/search_selected@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/search_selected@3x.png b/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/search_selected@3x.png new file mode 100644 index 0000000..c9398b8 Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/search_selected.imageset/search_selected@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/setting_selected.imageset/Contents.json similarity index 74% rename from iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/Contents.json rename to iMeiJu_Mac/Assets.xcassets/setting_selected.imageset/Contents.json index 654a4a1..178c679 100644 --- a/iMeiJu_Mac/Assets.xcassets/recommend_select.imageset/Contents.json +++ b/iMeiJu_Mac/Assets.xcassets/setting_selected.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "recommend_select@2x.png", + "filename" : "setting_selected@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "recommend_select@3x.png", + "filename" : "setting_selected@3x.png", "scale" : "3x" } ], diff --git a/iMeiJu_Mac/Assets.xcassets/setting_select.imageset/setting_select@2x.png b/iMeiJu_Mac/Assets.xcassets/setting_selected.imageset/setting_selected@2x.png similarity index 100% rename from iMeiJu_Mac/Assets.xcassets/setting_select.imageset/setting_select@2x.png rename to iMeiJu_Mac/Assets.xcassets/setting_selected.imageset/setting_selected@2x.png diff --git a/iMeiJu_Mac/Assets.xcassets/setting_select.imageset/setting_select@3x.png b/iMeiJu_Mac/Assets.xcassets/setting_selected.imageset/setting_selected@3x.png similarity index 100% rename from iMeiJu_Mac/Assets.xcassets/setting_select.imageset/setting_select@3x.png rename to iMeiJu_Mac/Assets.xcassets/setting_selected.imageset/setting_selected@3x.png diff --git a/iMeiJu_Mac/Assets.xcassets/television.imageset/television@2x.png b/iMeiJu_Mac/Assets.xcassets/television.imageset/television@2x.png index c439ce2..8da0b10 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/television.imageset/television@2x.png and b/iMeiJu_Mac/Assets.xcassets/television.imageset/television@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/television.imageset/television@3x.png b/iMeiJu_Mac/Assets.xcassets/television.imageset/television@3x.png index 67e03e0..52d6d76 100644 Binary files a/iMeiJu_Mac/Assets.xcassets/television.imageset/television@3x.png and b/iMeiJu_Mac/Assets.xcassets/television.imageset/television@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/television_select.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/television_select.imageset/Contents.json deleted file mode 100644 index bca8177..0000000 --- a/iMeiJu_Mac/Assets.xcassets/television_select.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "television_select@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "television_select@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iMeiJu_Mac/Assets.xcassets/television_select.imageset/television_select@2x.png b/iMeiJu_Mac/Assets.xcassets/television_select.imageset/television_select@2x.png deleted file mode 100644 index c90f386..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/television_select.imageset/television_select@2x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/television_select.imageset/television_select@3x.png b/iMeiJu_Mac/Assets.xcassets/television_select.imageset/television_select@3x.png deleted file mode 100644 index 2c00d04..0000000 Binary files a/iMeiJu_Mac/Assets.xcassets/television_select.imageset/television_select@3x.png and /dev/null differ diff --git a/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/Contents.json new file mode 100644 index 0000000..8ad6484 --- /dev/null +++ b/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "television_selected@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "television_selected@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/television_selected@2x.png b/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/television_selected@2x.png new file mode 100644 index 0000000..1076f32 Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/television_selected@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/television_selected@3x.png b/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/television_selected@3x.png new file mode 100644 index 0000000..4139a85 Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/television_selected.imageset/television_selected@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/tracing.imageset/Contents.json similarity index 76% rename from iMeiJu_Mac/Assets.xcassets/movie_select.imageset/Contents.json rename to iMeiJu_Mac/Assets.xcassets/tracing.imageset/Contents.json index 87895bf..0f26ecd 100644 --- a/iMeiJu_Mac/Assets.xcassets/movie_select.imageset/Contents.json +++ b/iMeiJu_Mac/Assets.xcassets/tracing.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "movie_select@2x.png", + "filename" : "tracing@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "movie_select@3x.png", + "filename" : "tracing@3x.png", "scale" : "3x" } ], diff --git a/iMeiJu_Mac/Assets.xcassets/tracing.imageset/tracing@2x.png b/iMeiJu_Mac/Assets.xcassets/tracing.imageset/tracing@2x.png new file mode 100644 index 0000000..272a4d1 Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/tracing.imageset/tracing@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/tracing.imageset/tracing@3x.png b/iMeiJu_Mac/Assets.xcassets/tracing.imageset/tracing@3x.png new file mode 100644 index 0000000..4821fad Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/tracing.imageset/tracing@3x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/Contents.json b/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/Contents.json new file mode 100644 index 0000000..8c7e250 --- /dev/null +++ b/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tracing_selected@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tracing_selected@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/tracing_selected@2x.png b/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/tracing_selected@2x.png new file mode 100644 index 0000000..f5b5a3a Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/tracing_selected@2x.png differ diff --git a/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/tracing_selected@3x.png b/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/tracing_selected@3x.png new file mode 100644 index 0000000..6288c4f Binary files /dev/null and b/iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/tracing_selected@3x.png differ diff --git a/iMeiJu_Mac/Base.lproj/Main.storyboard b/iMeiJu_Mac/Base.lproj/Main.storyboard index 40ef1d2..568fc6e 100644 --- a/iMeiJu_Mac/Base.lproj/Main.storyboard +++ b/iMeiJu_Mac/Base.lproj/Main.storyboard @@ -171,9 +171,9 @@ + - - - + + + - - - - - + + + + + + + @@ -269,6 +285,7 @@ + @@ -277,10 +294,11 @@ - - - + + + - + + diff --git a/iMeiJu_Mac/Controls/IZMainViewController.swift b/iMeiJu_Mac/Controls/IZMainViewController.swift index c20c1e5..db1febf 100644 --- a/iMeiJu_Mac/Controls/IZMainViewController.swift +++ b/iMeiJu_Mac/Controls/IZMainViewController.swift @@ -14,7 +14,8 @@ enum MenuType: Int { case movie = 1 case television = 2 case search = 3 - case setting = 4 + case tracing = 4 + case setting = 5 } class IZMainViewController: NSViewController { @@ -24,12 +25,13 @@ class IZMainViewController: NSViewController { var menusType: MenuType? - @IBOutlet var recommend: NSButton! - @IBOutlet var movie: NSButton! - @IBOutlet var television: NSButton! - @IBOutlet var search: NSButton! - @IBOutlet var setting: NSButton! - + @IBOutlet weak var recommend: NSButton! + @IBOutlet weak var movie: NSButton! + @IBOutlet weak var television: NSButton! + @IBOutlet weak var search: NSButton! + @IBOutlet weak var setting: NSButton! + @IBOutlet weak var tracing: NSButton! + override func viewDidLoad() { super.viewDidLoad() @@ -58,16 +60,23 @@ class IZMainViewController: NSViewController { changeViewController(type: .search) } + @IBAction func tracing(_ sender: NSButton) { + changeViewController(type: .tracing) + } + @IBAction func setting(_: NSButton) { // changeViewController(type: .setting) } + + func initImages() { recommend.image = NSImage(named: "recommend") movie.image = NSImage(named: "movie") television.image = NSImage(named: "television") search.image = NSImage(named: "search") setting.image = NSImage(named: "setting") + tracing.image = NSImage(named: "tracing"); } func changeViewController(type: MenuType) { @@ -78,32 +87,35 @@ class IZMainViewController: NSViewController { initImages() var vc: NSViewController! if type == .recommend { - recommend.image = NSImage(named: "recommend_select") + recommend.image = NSImage(named: "recommend_selected") let cvc = IZCollectionViewController(nibName: "IZCollectionViewController", bundle: nil) cvc.api = .index(vsize: "15") cvc.isZtid = true cvc.isMenu = type vc = cvc } else if type == .movie { - movie.image = NSImage(named: "movie_select") + movie.image = NSImage(named: "movie_selected") let cvc = IZCollectionViewController(nibName: "IZCollectionViewController", bundle: nil) cvc.api = .movie(id: "1", vsize: "15") cvc.isZtid = false cvc.isMenu = type vc = cvc } else if type == .television { - television.image = NSImage(named: "television_select") + television.image = NSImage(named: "television_selected") let cvc = IZCollectionViewController(nibName: "IZCollectionViewController", bundle: nil) cvc.api = .movie(id: "2", vsize: "15") cvc.isZtid = false cvc.isMenu = type vc = cvc } else if type == .search { - search.image = NSImage(named: "search_select") + search.image = NSImage(named: "search_selected") vc = IZSearchViewController(nibName: "IZSearchViewController", bundle: nil) + } else if type == .tracing { + tracing.image = NSImage(named: "tracing_selected") + vc = IZTracingViewController(nibName: "IZTracingViewController", bundle: nil) } else if type == .setting { - setting.image = NSImage(named: "setting_select") + setting.image = NSImage(named: "setting_selected") vc = IZSettingViewController(nibName: "IZSettingViewController", bundle: nil) } addChild(vc) diff --git a/iMeiJu_Mac/Controls/IZTracingViewController.swift b/iMeiJu_Mac/Controls/IZTracingViewController.swift new file mode 100644 index 0000000..f66e067 --- /dev/null +++ b/iMeiJu_Mac/Controls/IZTracingViewController.swift @@ -0,0 +1,20 @@ +// +// IZTracingViewController.swift +// iMeiJu_Mac +// +// Created by 鼎立华服 on 2019/2/20. +// Copyright © 2019 iizvv. All rights reserved. +// + +import Cocoa + +class IZTracingViewController: NSViewController { + + @IBOutlet weak var collectionView: IZCollectionView! + + override func viewDidLoad() { + super.viewDidLoad() + // Do view setup here. + } + +} diff --git a/iMeiJu_Mac/Controls/IZTracingViewController.xib b/iMeiJu_Mac/Controls/IZTracingViewController.xib new file mode 100644 index 0000000..41d2d51 --- /dev/null +++ b/iMeiJu_Mac/Controls/IZTracingViewController.xib @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +