Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

# Conflicts: # metaCode.xcodeproj/project.pbxproj

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode.xcodeproj/project.pbxproj
liushiyu
2 parents f7745d5d 60ab037a
Showing 4 changed files with 28 additions and 0 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/DB/CNMetaCodeDB.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
@@ -35,6 +35,8 @@ target &#39;metaCode&#39; do
   pod 'Qiniu'
   #加载GIF
   pod 'SwiftGifOrigin', '~> 1.7.0'
+  #数据库存储
+  pod 'WCDB.swift'
   #分类滚动切换视图
   pod 'JXSegmentedView', :git => 'https://gitee.com/mirrors/JXSegmentedView.git'
   pod 'JXPagingView/Paging'
@@ -61,6 +61,7 @@
 		7C4931342A307B58000E44B4 /* slide_down.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931332A307B58000E44B4 /* slide_down.gif */; };
 		7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
 		7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */; };
+		7C7C62F62A4D72E9007A912E /* CNMetaCodeDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */; };
 		7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
 		7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */; };
 		7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
@@ -156,6 +157,7 @@
 		7C4931332A307B58000E44B4 /* slide_down.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_down.gif; sourceTree = "<group>"; };
 		7C4931352A307B60000E44B4 /* slide_up.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_up.gif; sourceTree = "<group>"; };
 		7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageGuideView.swift; sourceTree = "<group>"; };
+		7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNMetaCodeDB.swift; sourceTree = "<group>"; };
 		7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
 		7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
 		7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
@@ -324,6 +326,7 @@
 		7963988A2A260B3300D045EB /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				7C7C62F42A4D72BA007A912E /* DB */,
 				7C2703342A3AFD130061EC50 /* Environment */,
 				7C2703312A36CC430061EC50 /* GlobalBlock */,
 				798A44F32A3077ED00815935 /* CustomView */,
@@ -467,6 +470,14 @@
 			path = Environment;
 			sourceTree = "<group>";
 		};
+		7C7C62F42A4D72BA007A912E /* DB */ = {
+			isa = PBXGroup;
+			children = (
+				7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */,
+			);
+			path = DB;
+			sourceTree = "<group>";
+		};
 		7CD675212A26F844008354C1 /* HomePage */ = {
 			isa = PBXGroup;
 			children = (
@@ -820,6 +831,9 @@
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				7C7C62F62A4D72E9007A912E /* CNMetaCodeDB.swift in Sources */,
+				790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */,
+				790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
 				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
+//
+//  CNMetaCodeDB.swift
+//  metaCode
+//  数据库
+//  Created by daojian on 2023/6/29.
+//
+
+import Foundation
+
@@ -151,6 +151,9 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        
+        print("uid = ",UserInfoManager.shared.userInfo.uid)
+        print("1111")
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)