diff --git a/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios.xcodeproj/project.pbxproj index 97bdd2e..00c6ef6 100644 --- a/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios.xcodeproj/project.pbxproj @@ -14,12 +14,11 @@ E86A43AA2B85DFA90084C04D /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43A92B85DFA90084C04D /* BaseViewController.swift */; }; E86A43AE2B85DFEA0084C04D /* Color+.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43AD2B85DFEA0084C04D /* Color+.swift */; }; E86A43B02B85E11B0084C04D /* BaseNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43AF2B85E11B0084C04D /* BaseNavigationViewController.swift */; }; - E86A43B62B85E2520084C04D /* AuthAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43B52B85E2520084C04D /* AuthAPI.swift */; }; E86A43B82B85F0B80084C04D /* AuthLaunchVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43B72B85F0B80084C04D /* AuthLaunchVC.swift */; }; E86A43BA2B85F1360084C04D /* AuthLoginVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43B92B85F1360084C04D /* AuthLoginVC.swift */; }; E86A43BC2B85FA640084C04D /* AuthForgetVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43BB2B85FA640084C04D /* AuthForgetVC.swift */; }; E86A43BF2B8620C40084C04D /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43BE2B8620C40084C04D /* Utils.swift */; }; - E86A43C32B8628AF0084C04D /* BaeTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43C22B8628AF0084C04D /* BaeTabBarViewController.swift */; }; + E86A43C32B8628AF0084C04D /* BaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43C22B8628AF0084C04D /* BaseTabBarViewController.swift */; }; E86A43C62B862CC70084C04D /* UIImage+.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43C52B862CC70084C04D /* UIImage+.swift */; }; E86A43C82B8743EA0084C04D /* AuthFillDataVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43C72B8743EA0084C04D /* AuthFillDataVC.swift */; }; E86A43CB2B874C6F0084C04D /* AuthPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86A43CA2B874C6F0084C04D /* AuthPrivacyView.swift */; }; @@ -39,6 +38,10 @@ E8D15AA62B89B0C600369467 /* List+.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8D15AA52B89B0C600369467 /* List+.swift */; }; E8D15AA82B89B74700369467 /* YMRequestX.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8D15AA72B89B74700369467 /* YMRequestX.swift */; }; E8D15AAA2B8ACC6B00369467 /* YMNetworkFun.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8D15AA92B8ACC6B00369467 /* YMNetworkFun.swift */; }; + E8D15AB02B8AFFCE00369467 /* HomeVoiceVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8D15AAF2B8AFFCE00369467 /* HomeVoiceVC.swift */; }; + E8D15AB32B8B000400369467 /* PlanetStarVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8D15AB22B8B000400369467 /* PlanetStarVC.swift */; }; + E8D15AB62B8B002700369467 /* ChatVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8D15AB52B8B002700369467 /* ChatVC.swift */; }; + E8D15AB82B8B003C00369467 /* UserInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8D15AB72B8B003C00369467 /* UserInfoVC.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -54,12 +57,11 @@ E86A43A92B85DFA90084C04D /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = ""; }; E86A43AD2B85DFEA0084C04D /* Color+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+.swift"; sourceTree = ""; }; E86A43AF2B85E11B0084C04D /* BaseNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNavigationViewController.swift; sourceTree = ""; }; - E86A43B52B85E2520084C04D /* AuthAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthAPI.swift; sourceTree = ""; }; E86A43B72B85F0B80084C04D /* AuthLaunchVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthLaunchVC.swift; sourceTree = ""; }; E86A43B92B85F1360084C04D /* AuthLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthLoginVC.swift; sourceTree = ""; }; E86A43BB2B85FA640084C04D /* AuthForgetVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthForgetVC.swift; sourceTree = ""; }; E86A43BE2B8620C40084C04D /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; - E86A43C22B8628AF0084C04D /* BaeTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaeTabBarViewController.swift; sourceTree = ""; }; + E86A43C22B8628AF0084C04D /* BaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTabBarViewController.swift; sourceTree = ""; }; E86A43C52B862CC70084C04D /* UIImage+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+.swift"; sourceTree = ""; }; E86A43C72B8743EA0084C04D /* AuthFillDataVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthFillDataVC.swift; sourceTree = ""; }; E86A43CA2B874C6F0084C04D /* AuthPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthPrivacyView.swift; sourceTree = ""; }; @@ -81,6 +83,10 @@ E8D15AA52B89B0C600369467 /* List+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "List+.swift"; sourceTree = ""; }; E8D15AA72B89B74700369467 /* YMRequestX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YMRequestX.swift; sourceTree = ""; }; E8D15AA92B8ACC6B00369467 /* YMNetworkFun.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YMNetworkFun.swift; sourceTree = ""; }; + E8D15AAF2B8AFFCE00369467 /* HomeVoiceVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeVoiceVC.swift; sourceTree = ""; }; + E8D15AB22B8B000400369467 /* PlanetStarVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanetStarVC.swift; sourceTree = ""; }; + E8D15AB52B8B002700369467 /* ChatVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatVC.swift; sourceTree = ""; }; + E8D15AB72B8B003C00369467 /* UserInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoVC.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -137,7 +143,7 @@ children = ( E86A43A92B85DFA90084C04D /* BaseViewController.swift */, E86A43AF2B85E11B0084C04D /* BaseNavigationViewController.swift */, - E86A43C22B8628AF0084C04D /* BaeTabBarViewController.swift */, + E86A43C22B8628AF0084C04D /* BaseTabBarViewController.swift */, E86A43CC2B874C8E0084C04D /* BaseView.swift */, ); path = ViewController; @@ -165,6 +171,10 @@ E86A43B12B85E1FC0084C04D /* Modules */ = { isa = PBXGroup; children = ( + E8D15AB92B8B004000369467 /* User */, + E8D15AB42B8B001900369467 /* Chat */, + E8D15AB12B8AFFE000369467 /* Star */, + E8D15AAB2B8AFF7000369467 /* Home */, E86A43B22B85E2170084C04D /* Auth */, ); path = Modules; @@ -195,7 +205,6 @@ E86A43B42B85E2340084C04D /* VM */ = { isa = PBXGroup; children = ( - E86A43B52B85E2520084C04D /* AuthAPI.swift */, E86A43D42B8774B70084C04D /* AuthViewModel.swift */, E8D15A9E2B89AED500369467 /* AuthManager.swift */, E8D15AA02B89AF4F00369467 /* UserTokenObject.swift */, @@ -296,6 +305,38 @@ path = List; sourceTree = ""; }; + E8D15AAB2B8AFF7000369467 /* Home */ = { + isa = PBXGroup; + children = ( + E8D15AAF2B8AFFCE00369467 /* HomeVoiceVC.swift */, + ); + path = Home; + sourceTree = ""; + }; + E8D15AB12B8AFFE000369467 /* Star */ = { + isa = PBXGroup; + children = ( + E8D15AB22B8B000400369467 /* PlanetStarVC.swift */, + ); + path = Star; + sourceTree = ""; + }; + E8D15AB42B8B001900369467 /* Chat */ = { + isa = PBXGroup; + children = ( + E8D15AB52B8B002700369467 /* ChatVC.swift */, + ); + path = Chat; + sourceTree = ""; + }; + E8D15AB92B8B004000369467 /* User */ = { + isa = PBXGroup; + children = ( + E8D15AB72B8B003C00369467 /* UserInfoVC.swift */, + ); + path = User; + sourceTree = ""; + }; E8EE60802B8858A500D02F6E /* Security */ = { isa = PBXGroup; children = ( @@ -426,7 +467,6 @@ files = ( E86A43AE2B85DFEA0084C04D /* Color+.swift in Sources */, E8D15A9F2B89AED600369467 /* AuthManager.swift in Sources */, - E86A43B62B85E2520084C04D /* AuthAPI.swift in Sources */, E86A43B02B85E11B0084C04D /* BaseNavigationViewController.swift in Sources */, E86A43E82B884C5E0084C04D /* String+.swift in Sources */, E8D15AA32B89B03D00369467 /* Deserialized.swift in Sources */, @@ -435,14 +475,16 @@ E81A7BAE2B885B20009E736E /* Base64.m in Sources */, E81A7BB22B886299009E736E /* HUDTool.swift in Sources */, E86A43BC2B85FA640084C04D /* AuthForgetVC.swift in Sources */, - E86A43C32B8628AF0084C04D /* BaeTabBarViewController.swift in Sources */, + E86A43C32B8628AF0084C04D /* BaseTabBarViewController.swift in Sources */, E86A43AA2B85DFA90084C04D /* BaseViewController.swift in Sources */, E884E85F2B6900C500ADE6EE /* AppDelegate.swift in Sources */, E8D15AAA2B8ACC6B00369467 /* YMNetworkFun.swift in Sources */, + E8D15AB82B8B003C00369467 /* UserInfoVC.swift in Sources */, E86A43B82B85F0B80084C04D /* AuthLaunchVC.swift in Sources */, E86A43C82B8743EA0084C04D /* AuthFillDataVC.swift in Sources */, E86A43CD2B874C8E0084C04D /* BaseView.swift in Sources */, E8D15AA12B89AF4F00369467 /* UserTokenObject.swift in Sources */, + E8D15AB62B8B002700369467 /* ChatVC.swift in Sources */, E86A43C62B862CC70084C04D /* UIImage+.swift in Sources */, E86A43D32B8773C90084C04D /* APPUtils.swift in Sources */, E86A43CB2B874C6F0084C04D /* AuthPrivacyView.swift in Sources */, @@ -450,7 +492,9 @@ E86A43BA2B85F1360084C04D /* AuthLoginVC.swift in Sources */, E81A7BAF2B885B20009E736E /* MAIDESEncryptTool.m in Sources */, E8D15AA82B89B74700369467 /* YMRequestX.swift in Sources */, + E8D15AB02B8AFFCE00369467 /* HomeVoiceVC.swift in Sources */, E86A43D52B8774B70084C04D /* AuthViewModel.swift in Sources */, + E8D15AB32B8B000400369467 /* PlanetStarVC.swift in Sources */, E8D15A9D2B899E1500369467 /* YMNetworkHelper.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/UserInterfaceState.xcuserstate b/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/UserInterfaceState.xcuserstate index dab80ea..72338a8 100644 Binary files a/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/UserInterfaceState.xcuserstate and b/yinmeng-ios.xcworkspace/xcuserdata/fengshuo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/yinmeng-ios/AppDelegate.swift b/yinmeng-ios/AppDelegate.swift index 093e0b1..c4694b0 100644 --- a/yinmeng-ios/AppDelegate.swift +++ b/yinmeng-ios/AppDelegate.swift @@ -29,7 +29,7 @@ var window: UIWindow? ///如果登录成功显示tabbar self.window = UIWindow.init(frame: UIScreen.main.bounds) self.window?.backgroundColor = UIColor.white - self.window?.rootViewController = BaeTabBarViewController() + self.window?.rootViewController = BaseTabBarViewController() } else { ///去登录 self.window = UIWindow.init(frame: UIScreen.main.bounds) diff --git a/yinmeng-ios/Assets.xcassets/tab/Contents.json b/yinmeng-ios/Assets.xcassets/tab/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/Contents.json new file mode 100644 index 0000000..2ca4d23 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_chat@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_chat@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/tabbar_icon_chat@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/tabbar_icon_chat@2x.png new file mode 100644 index 0000000..a637d85 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/tabbar_icon_chat@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/tabbar_icon_chat@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/tabbar_icon_chat@3x.png new file mode 100644 index 0000000..222692e Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat.imageset/tabbar_icon_chat@3x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/Contents.json new file mode 100644 index 0000000..2f39671 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_chat_sel@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_chat_sel@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/tabbar_icon_chat_sel@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/tabbar_icon_chat_sel@2x.png new file mode 100644 index 0000000..75559e6 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/tabbar_icon_chat_sel@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/tabbar_icon_chat_sel@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/tabbar_icon_chat_sel@3x.png new file mode 100644 index 0000000..03e9194 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_chat_sel.imageset/tabbar_icon_chat_sel@3x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/Contents.json new file mode 100644 index 0000000..f9cdc9c --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_planet@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_planet@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/tabbar_icon_planet@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/tabbar_icon_planet@2x.png new file mode 100644 index 0000000..fe4694b Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/tabbar_icon_planet@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/tabbar_icon_planet@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/tabbar_icon_planet@3x.png new file mode 100644 index 0000000..4fc2b9c Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet.imageset/tabbar_icon_planet@3x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/Contents.json new file mode 100644 index 0000000..7f8ab10 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_planet_sel@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_planet_sel@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/tabbar_icon_planet_sel@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/tabbar_icon_planet_sel@2x.png new file mode 100644 index 0000000..e1b187e Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/tabbar_icon_planet_sel@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/tabbar_icon_planet_sel@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/tabbar_icon_planet_sel@3x.png new file mode 100644 index 0000000..88b0c05 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_planet_sel.imageset/tabbar_icon_planet_sel@3x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/Contents.json new file mode 100644 index 0000000..385fdf2 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_song@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_song@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/tabbar_icon_song@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/tabbar_icon_song@2x.png new file mode 100644 index 0000000..7b2b89d Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/tabbar_icon_song@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/tabbar_icon_song@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/tabbar_icon_song@3x.png new file mode 100644 index 0000000..39f6385 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song.imageset/tabbar_icon_song@3x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/Contents.json new file mode 100644 index 0000000..3e59cf2 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_song_sel@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_song_sel@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/tabbar_icon_song_sel@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/tabbar_icon_song_sel@2x.png new file mode 100644 index 0000000..03a380f Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/tabbar_icon_song_sel@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/tabbar_icon_song_sel@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/tabbar_icon_song_sel@3x.png new file mode 100644 index 0000000..27cab33 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_song_sel.imageset/tabbar_icon_song_sel@3x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/Contents.json new file mode 100644 index 0000000..2405ee2 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_user@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_user@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/tabbar_icon_user@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/tabbar_icon_user@2x.png new file mode 100644 index 0000000..691cbfb Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/tabbar_icon_user@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/tabbar_icon_user@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/tabbar_icon_user@3x.png new file mode 100644 index 0000000..68b3c57 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user.imageset/tabbar_icon_user@3x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/Contents.json b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/Contents.json new file mode 100644 index 0000000..d4eab59 --- /dev/null +++ b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_icon_user_sel@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_icon_user_sel@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/tabbar_icon_user_sel@2x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/tabbar_icon_user_sel@2x.png new file mode 100644 index 0000000..f8cc5c7 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/tabbar_icon_user_sel@2x.png differ diff --git a/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/tabbar_icon_user_sel@3x.png b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/tabbar_icon_user_sel@3x.png new file mode 100644 index 0000000..79f2f06 Binary files /dev/null and b/yinmeng-ios/Assets.xcassets/tab/tabbar_icon_user_sel.imageset/tabbar_icon_user_sel@3x.png differ diff --git a/yinmeng-ios/Base/ViewController/BaeTabBarViewController.swift b/yinmeng-ios/Base/ViewController/BaeTabBarViewController.swift deleted file mode 100644 index 155b2f4..0000000 --- a/yinmeng-ios/Base/ViewController/BaeTabBarViewController.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// BaeTabBarViewController.swift -// yinmeng-ios -// -// Created by MaiMang on 2024/2/21. -// - -import UIKit - -class BaeTabBarViewController: UITabBarController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - -} diff --git a/yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift b/yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift new file mode 100644 index 0000000..9a2ec36 --- /dev/null +++ b/yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift @@ -0,0 +1,58 @@ +// +// BaeTabBarViewController.swift +// yinmeng-ios +// +// Created by MaiMang on 2024/2/21. +// + +import UIKit + +class BaseTabBarViewController: UITabBarController { + + override func viewDidLoad() { + super.viewDidLoad() + + setupChildControllers() + } + + +} + +private extension BaseTabBarViewController { + func setupChildControllers() { + let encounter: (BaseViewController, String, UIImage?, UIImage?) = (HomeVoiceVC(), "", UIImage(named: "tabbar_icon_song"), UIImage(named: "tabbar_icon_song_sel")) + + let home: (BaseViewController, String, UIImage?, UIImage?) = (PlanetStarVC(), "", UIImage(named: "tabbar_icon_planet"), UIImage(named: "tabbar_icon_planet_sel")) + + let message: (BaseViewController, String, UIImage?, UIImage?) = (ChatVC(), "",UIImage(named: "tabbar_icon_chat"), UIImage(named: "tabbar_icon_chat_sel")) + + let person: (BaseViewController, String, UIImage?, UIImage?) = (UserInfoVC(), "",UIImage(named: "tabbar_icon_user"), UIImage(named: "tabbar_icon_user_sel")) + + let controllers = [encounter, home, message, person] + var controllerList:[BaseNavigationViewController] = [] + controllers.forEach { viewController, title, image, selectedImage in + let nav = configVGNavigationController(viewController: viewController, title: title, image: image, selectedImage: selectedImage) + controllerList.append(nav) + } + self.viewControllers = controllerList + + } + + func configVGNavigationController(viewController: BaseViewController, title: String?, image: UIImage?, selectedImage: UIImage?) -> BaseNavigationViewController + { + let navigationController = BaseNavigationViewController(rootViewController: viewController) + viewController.navigationItem.title = title + + let tabBarItem = UITabBarItem(title: title, + image: image?.withRenderingMode(.alwaysOriginal), + selectedImage: selectedImage?.withRenderingMode(.alwaysOriginal)) + self.tabBar.backgroundColor = ThemeColor(hexStr: "#1D2126") + tabBarItem.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: ThemeColor(hexStr: "#FFFFFF"), NSAttributedString.Key.font: UIFont.systemFont(ofSize: 10, weight: .bold)], for: .selected) + tabBarItem.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: ThemeColor(hexStr: "#FFFFFF"), NSAttributedString.Key.font: UIFont.systemFont(ofSize: 10 ,weight: .bold)], for: .normal) + tabBar.unselectedItemTintColor = UIColor.white + navigationController.tabBarItem = tabBarItem + + return navigationController + } +} + diff --git a/yinmeng-ios/Modules/Auth/VM/AuthAPI.swift b/yinmeng-ios/Modules/Auth/VM/AuthAPI.swift deleted file mode 100644 index a1655ee..0000000 --- a/yinmeng-ios/Modules/Auth/VM/AuthAPI.swift +++ /dev/null @@ -1,54 +0,0 @@ -// -// AuthAPI.swift -// yinmeng-ios -// -// Created by MaiMang on 2024/2/21. -// - -//import Foundation -//import Moya -//enum AuthAPI { -// case appConfig -// case getCode(String, String) -// case authToken(String, String) -//} -// -//extension AuthAPI: YMNetworkAPI { -// var hostUrl: APIHost { -// return YMRequestConfig.baseURL -// } -// -// var pararms: APIParameters? { -// switch self { -// case .getCode(let phone, let type): -// return ["mobile":phone, "type":type] -// case .authToken(let phone, let code): -// return ["phone":phone, "code":code, "client_secret":"uyzjdhds", "version":"1", "client_id":"erban-client", "grant_type":"password"] -// default: -// return [:] -// } -// } -// -// var path: String { -// switch self { -// case .appConfig: -// return "/client/init" -// case .getCode: -// return "/sms/getCode" -// case .authToken: -// return "/oauth/token" -// } -// -// } -// -// var method: Moya.Method { -// switch self { -// case .appConfig: -// return .get -// case .getCode: -// return .post -// case .authToken: -// return .post -// } -// } -//} diff --git a/yinmeng-ios/Modules/Chat/ChatVC.swift b/yinmeng-ios/Modules/Chat/ChatVC.swift new file mode 100644 index 0000000..f465f7a --- /dev/null +++ b/yinmeng-ios/Modules/Chat/ChatVC.swift @@ -0,0 +1,29 @@ +// +// ChatVC.swift +// yinmeng-ios +// +// Created by MaiMang on 2024/2/25. +// + +import UIKit + +class ChatVC: BaseViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + view.backgroundColor = .orange + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/yinmeng-ios/Modules/Home/HomeVoiceVC.swift b/yinmeng-ios/Modules/Home/HomeVoiceVC.swift new file mode 100644 index 0000000..6f228f2 --- /dev/null +++ b/yinmeng-ios/Modules/Home/HomeVoiceVC.swift @@ -0,0 +1,29 @@ +// +// HomeVoiceVC.swift +// yinmeng-ios +// +// Created by MaiMang on 2024/2/25. +// + +import UIKit + +class HomeVoiceVC: BaseViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + view.backgroundColor = .red + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/yinmeng-ios/Modules/Star/PlanetStarVC.swift b/yinmeng-ios/Modules/Star/PlanetStarVC.swift new file mode 100644 index 0000000..da4497b --- /dev/null +++ b/yinmeng-ios/Modules/Star/PlanetStarVC.swift @@ -0,0 +1,29 @@ +// +// PlanetStarVC.swift +// yinmeng-ios +// +// Created by MaiMang on 2024/2/25. +// + +import UIKit + +class PlanetStarVC: BaseViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + view.backgroundColor = .yellow + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/yinmeng-ios/Modules/User/UserInfoVC.swift b/yinmeng-ios/Modules/User/UserInfoVC.swift new file mode 100644 index 0000000..a2f47d5 --- /dev/null +++ b/yinmeng-ios/Modules/User/UserInfoVC.swift @@ -0,0 +1,17 @@ +// +// UserInfoVC.swift +// yinmeng-ios +// +// Created by MaiMang on 2024/2/25. +// + +import UIKit + +class UserInfoVC: BaseViewController { + + override func viewDidLoad() { + super.viewDidLoad() + view.backgroundColor = .lightGray + } + +}