diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index e93378d..51e2a2f 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -23,10 +23,8 @@ 1E1EA28C2B93272700A5D5D2 /* CCSpatialDisplayTypeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E1EA28B2B93272700A5D5D2 /* CCSpatialDisplayTypeView.swift */; }; 1E1EA28E2B93393A00A5D5D2 /* UIButton+CCExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E1EA28D2B93393A00A5D5D2 /* UIButton+CCExtension.swift */; }; 1E1EA2902B933C8200A5D5D2 /* VideoWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E1EA28F2B933C8200A5D5D2 /* VideoWriter.swift */; }; - 1E1EA2922B93402400A5D5D2 /* img3.HEIC in Resources */ = {isa = PBXBuildFile; fileRef = 1E1EA2912B93402400A5D5D2 /* img3.HEIC */; }; 1E1EA2942B9364F000A5D5D2 /* CCSpatialVideoDisplayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E1EA2932B9364F000A5D5D2 /* CCSpatialVideoDisplayController.swift */; }; 1E1EA2962B936C9600A5D5D2 /* VideoConvertor2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E1EA2952B936C9600A5D5D2 /* VideoConvertor2.swift */; }; - 1E1EA2982B93A21A00A5D5D2 /* IMG_0071.MOV in Resources */ = {isa = PBXBuildFile; fileRef = 1E1EA2972B93A21A00A5D5D2 /* IMG_0071.MOV */; }; 1E277B76988DF1691E8E5A49 /* Pods_SwiftProject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EA4E292727B09E3FAEA5146 /* Pods_SwiftProject.framework */; }; 1E3945A02B8398B000D0F5CA /* VRVideoTransformController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E39459F2B8398B000D0F5CA /* VRVideoTransformController.swift */; }; 1EE5C5F72B8F973A00EDFC2F /* CCSpatialShootController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE5C5F62B8F973A00EDFC2F /* CCSpatialShootController.swift */; }; @@ -109,10 +107,8 @@ 1E1EA28B2B93272700A5D5D2 /* CCSpatialDisplayTypeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CCSpatialDisplayTypeView.swift; sourceTree = ""; }; 1E1EA28D2B93393A00A5D5D2 /* UIButton+CCExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+CCExtension.swift"; sourceTree = ""; }; 1E1EA28F2B933C8200A5D5D2 /* VideoWriter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoWriter.swift; sourceTree = ""; }; - 1E1EA2912B93402400A5D5D2 /* img3.HEIC */ = {isa = PBXFileReference; lastKnownFileType = file; path = img3.HEIC; sourceTree = ""; }; 1E1EA2932B9364F000A5D5D2 /* CCSpatialVideoDisplayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CCSpatialVideoDisplayController.swift; sourceTree = ""; }; 1E1EA2952B936C9600A5D5D2 /* VideoConvertor2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoConvertor2.swift; sourceTree = ""; }; - 1E1EA2972B93A21A00A5D5D2 /* IMG_0071.MOV */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = IMG_0071.MOV; sourceTree = ""; }; 1E39459F2B8398B000D0F5CA /* VRVideoTransformController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VRVideoTransformController.swift; sourceTree = ""; }; 1EE5C5F62B8F973A00EDFC2F /* CCSpatialShootController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CCSpatialShootController.swift; sourceTree = ""; }; 1EE5C5F92B8F97BF00EDFC2F /* SpatialVideoWriter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpatialVideoWriter.swift; sourceTree = ""; }; @@ -341,8 +337,6 @@ AF21208C2B4E7F1A00400B7F /* SwiftProject */ = { isa = PBXGroup; children = ( - 1E1EA2912B93402400A5D5D2 /* img3.HEIC */, - 1E1EA2972B93A21A00A5D5D2 /* IMG_0071.MOV */, AF2120A12B4E83AF00400B7F /* CCKit */, AF2120A62B4E83B000400B7F /* Project */, AF21208D2B4E7F1A00400B7F /* AppDelegate.swift */, @@ -552,8 +546,6 @@ files = ( AF21209A2B4E7F1C00400B7F /* LaunchScreen.storyboard in Resources */, AF2120972B4E7F1C00400B7F /* Assets.xcassets in Resources */, - 1E1EA2982B93A21A00A5D5D2 /* IMG_0071.MOV in Resources */, - 1E1EA2922B93402400A5D5D2 /* img3.HEIC in Resources */, 00B946232B67B26D00DA668F /* ddd_video.mp4 in Resources */, AF2120952B4E7F1A00400B7F /* Main.storyboard in Resources */, ); diff --git a/SwiftProject/SwiftProject/IMG_0071.MOV b/SwiftProject/SwiftProject/IMG_0071.MOV deleted file mode 100644 index e84cb0c..0000000 Binary files a/SwiftProject/SwiftProject/IMG_0071.MOV and /dev/null differ diff --git a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift index 3dedc9e..a310968 100644 --- a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift @@ -320,7 +320,8 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate { //空间转码 // gotoSpatialPlayVC() - CCBottomMenuPopView.share.show(imageNameArray: ["Icon_PopUp_Icon_Scenes","Icon_PopUp_Icon_Photo","Icon_PopUp_Icon_Folder"], textArray: ["空间相簿","照片图库","本机文件"]) { index in +// CCBottomMenuPopView.share.show(imageNameArray: ["Icon_PopUp_Icon_Scenes","Icon_PopUp_Icon_Photo","Icon_PopUp_Icon_Folder"], textArray: ["空间相簿","照片图库","本机文件"]) { index in + CCBottomMenuPopView.share.show(imageNameArray: ["Icon_PopUp_Icon_Scenes","Icon_PopUp_Icon_Photo"], textArray: ["空间相簿","照片图库"]) { index in if index == 0 { self.spaceAlbum() @@ -382,7 +383,7 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate { if((dic["name"] as! String).elementsEqual("隐私政策")){ let vc:CCWebController = CCWebController() - vc.urlString = "http://www.baidu.com" + vc.urlString = "https://www.wolai.com/9BZr3sEbpbXJEUorHEyAoP" self.navigationController?.pushViewController(vc, animated: true) } self.deleteMenu() diff --git a/SwiftProject/SwiftProject/Project/View/CCMineView.swift b/SwiftProject/SwiftProject/Project/View/CCMineView.swift index c82517d..ac00d6f 100644 --- a/SwiftProject/SwiftProject/Project/View/CCMineView.swift +++ b/SwiftProject/SwiftProject/Project/View/CCMineView.swift @@ -78,12 +78,19 @@ class CCMineView: UIView,UITableViewDelegate,UITableViewDataSource{ } func addDatas(){ +// let arr = [["img":"Icon_Menu_all_Icon_Connect", +// "name":"分享给VR爱好者"], +// ["img":"Icon_Menu_all_Icon_Connect", +// "name":"联系我们"], +// ["img":"Icon_Menu_all_Icon_Connect", +// "name":"隐私政策"]] + let arr = [["img":"Icon_Menu_all_Icon_Connect", - "name":"分享给VR爱好者"], - ["img":"Icon_Menu_all_Icon_Connect", "name":"联系我们"], ["img":"Icon_Menu_all_Icon_Connect", "name":"隐私政策"]] + + datas.addObjects(from: arr) self.mTableView!.reloadData() } diff --git a/SwiftProject/SwiftProject/img3.HEIC b/SwiftProject/SwiftProject/img3.HEIC deleted file mode 100644 index 2ad332e..0000000 Binary files a/SwiftProject/SwiftProject/img3.HEIC and /dev/null differ