tabbar调整

Visual_Novel_iOS.xcodeproj/project.pbxproj

@@ -348,7 +348,7 @@
 				DEVELOPMENT_TEAM = 6GS5RC7C89;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravelTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -366,7 +366,7 @@
 				DEVELOPMENT_TEAM = 6GS5RC7C89;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravelTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -460,7 +460,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravel;
 				PRODUCT_NAME = Visual_Novel_iOSLevel;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = CLPRODUCT;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -479,7 +479,7 @@
 				DEVELOPMENT_TEAM = 6GS5RC7C89;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravelTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -573,7 +573,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravel;
 				PRODUCT_NAME = Visual_Novel_iOSLevel;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = CLAPPSTORE;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -592,7 +592,7 @@
 				DEVELOPMENT_TEAM = 6GS5RC7C89;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravelTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -630,7 +630,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravel;
 				PRODUCT_NAME = Visual_Novel_iOSLevel;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Visual_Novel_iOS/CL-Bridging-Header.h";
@@ -668,7 +668,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.person.ChinaTravel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.personal.ChinaTravel;
 				PRODUCT_NAME = Visual_Novel_iOSLevel;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Visual_Novel_iOS/CL-Bridging-Header.h";

Visual_Novel_iOS/Assets.xcassets/Base/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Visual_Novel_iOS/Assets.xcassets/Base/base_bg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_me@2x.png",
+      "filename" : "base_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_me@3x.png",
+      "filename" : "base_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_bg_img.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_foryou@2x.png",
+      "filename" : "tabbar_bg_img@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_foryou@3x.png",
+      "filename" : "tabbar_bg_img@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_explore_selected.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "tabbar_explore_selected@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "tabbar_explore_selected@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_foryou_selected.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "tabbar_foryou_selected@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "tabbar_foryou_selected@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_history_normal.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tabbar_history_normal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tabbar_history_normal@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_history_selected.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_contact_selected@2x.png",
+      "filename" : "tabbar_history_selected@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_contact_selected@3x.png",
+      "filename" : "tabbar_history_selected@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_home_normal.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_create_app@2x.png",
+      "filename" : "tabbar_home_normal@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_create_app@3x.png",
+      "filename" : "tabbar_home_normal@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_home_selected.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tabbar_home_selected@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tabbar_home_selected@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_me_selected.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "tabbar_me_selected@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "tabbar_me_selected@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_role_normal.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_contact@2x.png",
+      "filename" : "base_role_normal@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_contact@3x.png",
+      "filename" : "base_role_normal@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_role_selected.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tabbar_explore@2x.png",
+      "filename" : "base_role_selected@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tabbar_explore@3x.png",
+      "filename" : "base_role_selected@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_video_normal.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tabbar_video_normal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tabbar_video_normal@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Visual_Novel_iOS/Assets.xcassets/Tabbar/tabbar_video_selected.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tabbar_video_selected@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tabbar_video_selected@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Visual_Novel_iOS/Info.plist

@@ -57,5 +57,7 @@
 	<array>
 		<string>audio</string>
 	</array>
+	<key>UIDesignRequiresCompatibility</key>
+	<true/>
 </dict>
 </plist>

Visual_Novel_iOS/Src/Components/Base/H5BaseViewController.swift

@@ -59,7 +59,7 @@ class H5BaseViewController: CLBaseViewController {
 
     lazy var closeButton: UIButton = {
         let button = UIButton(type: .custom)
-//        button.setImage(R.image.icon_close_20(), for: .normal)
+        button.setImage(R.image.icon_close_20(), for: .normal)
         button.addTarget(self, action: #selector(tapNaviCloseBtn), for: .touchUpInside)
         button.isHidden = true
         navigationView.leftStackH.addArrangedSubview(button)

Visual_Novel_iOS/Src/Components/Base/H5Controller.swift

@@ -82,7 +82,7 @@ class H5Controller: H5BaseViewController {
             naviTitleIgnoreAlpha = true
             setupViewsByBgColor(alpha: 0)
             if didFinish {
-//                navigationView.backButton.setImage(R.image.nav_back_white(), for: .normal)
+                navigationView.backButton.setImage(R.image.nav_back_white(), for: .normal)
             }
             webView.evaluateJavaScript("document.body.style.backgroundColor=\"#F04545\"") { _, _ in
             }

Visual_Novel_iOS/Src/Components/Photo/PhotoPicker/ImagePicker.swift

@@ -53,11 +53,11 @@ class ImagePicker: TZImagePickerController {
         previewBtnTitleStr = "Preview" // R.string.localizable.preview.localized()
         fullImageBtnTitleStr = "Original Photo" // R.string.localizable.original_photo.localized()
 
-//        photoOriginDefImage = R.image.icon_tag_gray_default()
-//        photoOriginSelImage = R.image.icon_tag_selected()
-//        photoDefImage = R.image.icon_tag_gray_default()
-//        photoSelImage = R.image.icon_tag_selected_bg()
-//        takePictureImage = R.image.icon_album_camera()
+        photoOriginDefImage = R.image.icon_tag_gray_default()
+        photoOriginSelImage = R.image.icon_tag_selected()
+        photoDefImage = R.image.icon_tag_gray_default()
+        photoSelImage = R.image.icon_tag_selected_bg()
+        takePictureImage = R.image.icon_album_camera()
 
         photoPickerPageUIConfigBlock = { (_ collectionView: UICollectionView?,
                                           _ bottomToolBar: UIView?,

Visual_Novel_iOS/Src/Components/UI/NaviBar/NavigationView.swift

@@ -52,7 +52,7 @@ import UIKit
     @objc lazy var backButton: UIButton = {
         let backButton = UIButton(type: .custom)
         leftStackH.addArrangedSubview(backButton)
-//        backButton.setImage(R.image.nav_back_white()!, for: .normal)
+        backButton.setImage(R.image.nav_back_white()!, for: .normal)
         backButton.contentHorizontalAlignment = .left
         backButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: -16)
         backButton.addTarget(self, action: #selector(popAction), for: .touchUpInside)
@@ -151,12 +151,12 @@ import UIKit
     }
 
     @objc open func setupBackButtonCloseIcon(black: Bool = false) {
-//        if black {
-//            backButton.setImage(R.image.icon_close_20_black(), for: .normal)
-//        } else {
-//            backButton.setImage(R.image.icon_close_20(), for: .normal)
-//            
-//        }
+        if black {
+            backButton.setImage(R.image.icon_close_20_black(), for: .normal)
+        } else {
+            backButton.setImage(R.image.icon_close_20(), for: .normal)
+            
+        }
         backButton.isHidden = false
     }
 }

Visual_Novel_iOS/Src/Modules/Discover/DiscoverRolesGridController.swift

@@ -26,6 +26,7 @@ class DiscoverRolesGridController: CLBaseGridController {
         super.viewDidLoad()
 
         // Do any additional setup after loading the view.
+        view.backgroundColor = .clear
         setupViews()
         setupDatas()
         setupEvents()

Visual_Novel_iOS/Src/Modules/Discover/DiscoverRootPageController.swift

@@ -16,9 +16,17 @@ class DiscoverRootPageController: CLTabRootController<DiscoverRootPageView> {
 
         // Do any additional setup after loading the view.
 
+        let baseImageView = UIImageView(image: R.image.base_bg())
+        baseImageView.contentMode = .scaleAspectFill
+        self.view.insertSubview(baseImageView, at: 0)
+        baseImageView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
         setupViews()
         setupDatas()
         setupEvents()
+        
+        
     }
 
     private func setupViews() {

Visual_Novel_iOS/Src/Modules/Discover/View/DiscoverRootPageView.swift

@@ -203,7 +203,7 @@ extension DiscoverRootPageView: JXPagingViewDelegate, JXSegmentedViewDelegate {
     }
 
     func mainTableViewDidScroll(_ scrollView: UIScrollView) {
-        NaviAlphaHandle.changeNaviViewsAlpha(scrollView: scrollView, alphaViews: [bgBdView, navigationView?.bgView], oppositeViews: [])
+//        NaviAlphaHandle.changeNaviViewsAlpha(scrollView: scrollView, alphaViews: [bgBdView, navigationView?.bgView], oppositeViews: [])
     }
 }
 

Visual_Novel_iOS/Src/Modules/Tab/TabBarController.swift

@@ -68,34 +68,34 @@ extension TabBarController {
         viewControllers = [home, friend, discover, me]
 
         let homeItem = TitleItem(title: "1",
-                                 image: UIImage(named: "tabbar_foryou")!,
-                                 selectedImage: UIImage(named: "tabbar_foryou_selected")!,
+                                 image: UIImage(named: "tabbar_home_normal")!,
+                                 selectedImage: UIImage(named: "tabbar_home_selected")!,
                                  itemIndex: .home)
         homeItem.count = 0
 
         let friendItem = TitleItem(title: "2",
-                                   image: UIImage(named: "tabbar_contact")!,
-                                   selectedImage: UIImage(named: "tabbar_contact_selected")!,
+                                   image: UIImage(named: "tabbar_video_normal")!,
+                                   selectedImage: UIImage(named: "tabbar_video_selected")!,
                                    itemIndex: .friend)
         friendItem.count = 0
 
         let discoverItem = TitleItem(title: "3",
-                                     image: UIImage(named: "tabbar_explore")!,
-                                     selectedImage: UIImage(named: "tabbar_explore_selected")!,
+                                     image: UIImage(named: "tabbar_role_normal")!,
+                                     selectedImage: UIImage(named: "tabbar_role_selected")!,
                                      itemIndex: .discover)
 
         let meItem = TitleItem(title: "4",
-                               image: UIImage(named: "tabbar_me")!,
-                               selectedImage: UIImage(named: "tabbar_me_selected")!,
+                               image: UIImage(named: "tabbar_history_normal")!,
+                               selectedImage: UIImage(named: "tabbar_history_selected")!,
                                itemIndex: .me)
         meItem.count = 0
 
-        let addItem = TitleItem(title: "+",
-                                image: UIImage(named: "tabbar_create_app")!,
-                                selectedImage: UIImage(named: "tabbar_create_app")!,
-                                itemIndex: .add)
+//        let addItem = TitleItem(title: "+",
+//                                image: UIImage(named: "tabbar_create_app")!,
+//                                selectedImage: UIImage(named: "tabbar_create_app")!,
+//                                itemIndex: .add)
 
-        let childItem: [TabbarItem] = [homeItem, friendItem, addItem, discoverItem, meItem]
+        let childItem: [TabbarItem] = [homeItem, friendItem, /*addItem,*/ discoverItem, meItem]
         customTabBar.tabItems = childItem
         customTabBar.tabBarDelegate = self
         setValue(customTabBar, forKey: "tabBar")

Visual_Novel_iOS/Src/Modules/Tab/View/TabBar.swift

@@ -30,7 +30,7 @@ class TabBar: UITabBar {
         }
     }
 
-    static let containerHeight: CGFloat = 52
+    static let containerHeight: CGFloat = 49
     private var containerInsets = UIEdgeInsets(top: 20, left: 24, bottom: 24, right: 24)
 
     private var container: UIView = {
@@ -43,13 +43,15 @@ class TabBar: UITabBar {
         let stack = UIStackView()
         stack.axis = .horizontal
         stack.distribution = .fillEqually
+        stack.alignment = .fill
         stack.spacing = 0
         return stack
     }()
 
     private lazy var bgView: UIView = {
         let view = UIView()
-        view.backgroundColor = .c.csdn
+//        view.backgroundColor = .c.csdn
+        view.backgroundColor = .clear // clear
         return view
     }()
 
@@ -70,7 +72,17 @@ class TabBar: UITabBar {
             barTintColor = .clear
         }
         
-        backgroundColor = .c.cbd
+//        backgroundColor = .c.cbd
+        backgroundColor = .clear
+        
+        let bgImgView = UIImageView(image: R.image.tabbar_bg_img())
+        
+        bgImgView.contentMode = .scaleToFill
+        bgImgView.clipsToBounds = true
+        addSubview(bgImgView)
+        bgImgView.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+        }
 
         addSubview(bgView)
         bgView.addSubview(container)
@@ -84,11 +96,9 @@ class TabBar: UITabBar {
 
         let bottom = safeAreaInsets.bottom > 0 ? safeAreaInsets.bottom : containerInsets.bottom
         container.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(16)//(containerInsets.left)
-            make.right.equalToSuperview().offset(-16)//(-containerInsets.right)
             make.height.equalTo(TabBar.containerHeight)
+            make.left.right.equalToSuperview()
             make.bottom.equalToSuperview().offset(-bottom)
-            make.bottom.equalToSuperview()
         }
 
         containerStack.snp.makeConstraints { make in