3.6.11(2) UI 布局的一些改动

AIEmoji.xcodeproj/project.pbxproj

@@ -2512,7 +2512,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2551,7 +2551,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

AIEmoji/Business/AIChat/TSChatViewController/TSChatViewController/TSChatViewController+Keyboard.swift

@@ -62,7 +62,7 @@ extension TSChatViewController{
 
 
 extension TSChatViewController{
-    
+    ßß
     func setUpInputBarType(){
         inputBarBgView.addSubview(inputBarTopView)
         inputBarTopView.snp.makeConstraints { make in
@@ -77,7 +77,7 @@ extension TSChatViewController{
                 make.leading.equalTo(0)
                 make.trailing.equalTo(0)
                 make.top.equalTo(inputBarTopView.snp.bottom)
-                make.bottom.equalTo(-k_Height_safeAreaInsetsBottom())
+                make.bottom.equalTo(viewModel.uiStyle == .chat ? 0 : -k_Height_safeAreaInsetsBottom())
             }
         }
         inputBarType = .custom(inputBarBgView)

AIEmoji/Business/AIChat/TSChatViewController/TSChatViewController/TSChatViewController+NaviBar.swift

@@ -139,13 +139,13 @@ extension TSChatViewController {
         
         switch viewModel.uiStyle {
         case .chat:
-//            navBarContentView.addSubview(navBarView)
-//            navBarView.snp.makeConstraints { make in
-//                make.edges.equalToSuperview()
-//            }
-            addNormalNavBarView()
-            setPageTitle("AI Assistant".localized)
-            _ = setNavigationItem("", imageName: "aichat_history", direction: .right, action: #selector(clickHistory))
+            navBarContentView.addSubview(navBarView)
+            navBarView.snp.makeConstraints { make in
+                make.edges.equalToSuperview()
+            }
+//            addNormalNavBarView()
+//            setPageTitle("AI Assistant".localized)
+//            _ = setNavigationItem("", imageName: "aichat_history", direction: .right, action: #selector(clickHistory))
         case .history:
             addNormalNavBarView()
             setPageTitle("History".localized)

AIEmoji/Business/TSAILIstVC/TSAILIstVC/TSAILIstVC.swift

@@ -144,19 +144,19 @@ class TSAILIstVC: TSBaseVC {
                         kPushVC(target: self, modelVC: baseVc)
 //                    }
         }))
-        //AI 助手
-        sectionModel.addSubItemModel(
-            createItemModel(
-                leftImageName:"aiList_aiChat",
-                leftTitle: "AI Assistant".localized,
-                leftSubTitle: "Get smart and instant answers".localized,
-                rightViewStyle: 0,
-                tapBlock: { [weak self] model, _, _ in
-                   guard let self = self else { return }
-                    let vc = TSChatViewController()
-                    vc.viewModel.uiStyle = .chat
-                    kPushVC(target: self, modelVC: vc)
-        }))
+//        //AI 助手
+//        sectionModel.addSubItemModel(
+//            createItemModel(
+//                leftImageName:"aiList_aiChat",
+//                leftTitle: "AI Assistant".localized,
+//                leftSubTitle: "Get smart and instant answers".localized,
+//                rightViewStyle: 0,
+//                tapBlock: { [weak self] model, _, _ in
+//                   guard let self = self else { return }
+//                    let vc = TSChatViewController()
+//                    vc.viewModel.uiStyle = .chat
+//                    kPushVC(target: self, modelVC: vc)
+//        }))
         //预测老年
         sectionModel.addSubItemModel(
             createItemModel(

AIEmoji/Business/TSPTPGeneratorVC/TSGennertatorSelectStyleVC/TSGennertatorSelectStyleVC.swift

@@ -154,6 +154,7 @@ extension TSGennertatorSelectStyleVC: UICollectionViewDataSource ,UICollectionVi
             currentIndexPath = indexPath
             self.styleCollectionView.selectItem(at: self.currentIndexPath, animated: true, scrollPosition: .centeredVertically)
             selectedValueBlock?(indexPath,model)
+            clickView()
         }
     }
 }

AIEmoji/Business/TSTabBarController/TSTabBarController.swift

@@ -42,22 +42,24 @@ class TSTabBarController: UITabBarController {
     }
 
     @objc private func setUpData() {
-        viewControllerArray = ["TSPTPInputVC","TSAILIstVC","TSTTPInputVC","TSSetingVC"]
+        viewControllerArray = ["TSPTPInputVC","TSAILIstVC","TSChatViewController","TSTTPInputVC","TSSetingVC"]
 //        viewControllerArray = ["TSPTPInputVC","TSAILIstVC","TSChatViewController","TSSetingVC"]
 //        viewControllerArray = ["TSPTPInputVC","TSChatViewController","TSEmojisVC","TSSetingVC"]
 //        viewControllerArray = ["TSPhotoToPhotoVC","TSChatViewController","TSEmojisVC","TSSetingVC"]
 //        viewControllerArray = ["TSTTPInputVC","TSChatViewController","TSEmojisVC","TSSetingVC"]
 
-        titleArray = ["Photo","AI Store","Text","Setting"]
+        titleArray = ["Photo","AI Store","Chat","Text","Setting"]
         selectedImageArray = [
             "tabbar_select_pic",
             "tabbar_select_ailist",
+            "tabbar_select_aichat",
             "tabbar_select_text",
             "tabbar_select_setting"
         ]
         unselectedImageArray = [
             "tabbar_unSelect_pic",
             "tabbar_unSelect_ailist",
+            "tabbar_unSelect_aichat",
             "tabbar_unSelect_text",
             "tabbar_unSelect_setting"
         ]

AIEmoji/Res/text_to_photo_style.json

@@ -1,5 +1,11 @@
 [
-
+    {
+        "imageName": "ttp_style_none",
+        "imageText": "No Style",
+        "prompt":"",
+        "style":"No Style",
+        "isVip": false
+    },
     {
         "imageName": "ttp_style_DreamyAnime",
         "imageText": "Dreamy Anime",
@@ -223,13 +229,6 @@
         "prompt":"暗黑纹身图案、几何图腾、点刺阴影、红线勾勒，背景白色，",
         "specialStyle":0,
         "isVip":true
-    },
-    {
-        "imageName": "ttp_style_none",
-        "imageText": "No Style",
-        "prompt":"",
-        "style":"No Style",
-        "isVip": false
     }
 ]