iOS Team / CNLiveMateCode · Commits

Commit 6a18d4305d9ed76c8d95094ef592ef67bea2b9d0

Authored by liushiyu
2 parents f7745d5d 60ab037a

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

# Conflicts:
#	metaCode.xcodeproj/project.pbxproj
Inline Side-by-side
Showing 4 changed files with 28 additions and 0 deletions
... ... @@ -35,6 +35,8 @@ target 'metaCode' do
35 35 pod 'Qiniu'
36 36 #加载GIF
37 37 pod 'SwiftGifOrigin', '~> 1.7.0'
  38 + #数据库存储
  39 + pod 'WCDB.swift'
38 40 #分类滚动切换视图
39 41 pod 'JXSegmentedView', :git => 'https://gitee.com/mirrors/JXSegmentedView.git'
40 42 pod 'JXPagingView/Paging'
... ...
metaCode.xcodeproj/project.pbxproj
  View file @6a18d43
... ... @@ -61,6 +61,7 @@
61 61 7C4931342A307B58000E44B4 /* slide_down.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931332A307B58000E44B4 /* slide_down.gif */; };
62 62 7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
63 63 7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */; };
  64 + 7C7C62F62A4D72E9007A912E /* CNMetaCodeDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */; };
64 65 7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
65 66 7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */; };
66 67 7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
... ... @@ -156,6 +157,7 @@
156 157 7C4931332A307B58000E44B4 /* slide_down.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_down.gif; sourceTree = "<group>"; };
157 158 7C4931352A307B60000E44B4 /* slide_up.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_up.gif; sourceTree = "<group>"; };
158 159 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageGuideView.swift; sourceTree = "<group>"; };
  160 + 7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNMetaCodeDB.swift; sourceTree = "<group>"; };
159 161 7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
160 162 7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
161 163 7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
... ... @@ -324,6 +326,7 @@
324 326 7963988A2A260B3300D045EB /* Classes */ = {
325 327 isa = PBXGroup;
326 328 children = (
  329 + 7C7C62F42A4D72BA007A912E /* DB */,
327 330 7C2703342A3AFD130061EC50 /* Environment */,
328 331 7C2703312A36CC430061EC50 /* GlobalBlock */,
329 332 798A44F32A3077ED00815935 /* CustomView */,
... ... @@ -467,6 +470,14 @@
467 470 path = Environment;
468 471 sourceTree = "<group>";
469 472 };
  473 + 7C7C62F42A4D72BA007A912E /* DB */ = {
  474 + isa = PBXGroup;
  475 + children = (
  476 + 7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */,
  477 + );
  478 + path = DB;
  479 + sourceTree = "<group>";
  480 + };
470 481 7CD675212A26F844008354C1 /* HomePage */ = {
471 482 isa = PBXGroup;
472 483 children = (
... ... @@ -820,6 +831,9 @@
820 831 790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
821 832 790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
822 833 790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
  834 + 7C7C62F62A4D72E9007A912E /* CNMetaCodeDB.swift in Sources */,
  835 + 790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */,
  836 + 790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */,
823 837 798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
824 838 7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
825 839 7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
... ...
metaCode/Classes/DB/CNMetaCodeDB.swift 0 → 100644
  View file @6a18d43
  1 +//
  2 +// CNMetaCodeDB.swift
  3 +// metaCode
  4 +// 数据库
  5 +// Created by daojian on 2023/6/29.
  6 +//
  7 +
  8 +import Foundation
  9 +
... ...
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
  View file @6a18d43
... ... @@ -151,6 +151,9 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
151 151 }
152 152 override func viewWillAppear(_ animated: Bool) {
153 153 super.viewWillAppear(animated)
  154 +
  155 + print("uid = ",UserInfoManager.shared.userInfo.uid)
  156 + print("1111")
154 157 }
155 158 override func viewDidAppear(_ animated: Bool) {
156 159 super.viewDidAppear(animated)
... ...