diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index 8b1849a..5cdae80 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -106,7 +106,6 @@ AF2121042B4EA61A00400B7F /* CCMineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF2121032B4EA61A00400B7F /* CCMineView.swift */; }; AF2121072B4EA63000400B7F /* CCHomeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF2121062B4EA63000400B7F /* CCHomeData.swift */; }; AF2121092B4EA7E200400B7F /* CCRequestDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF2121082B4EA7E200400B7F /* CCRequestDefine.swift */; }; - AF21210B2B4EA7FE00400B7F /* CCRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF21210A2B4EA7FE00400B7F /* CCRequest.swift */; }; AF21210D2B4EA86700400B7F /* RootData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF21210C2B4EA86700400B7F /* RootData.swift */; }; AFD9F5932B58C34A008716DE /* ImageProcessingShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = AFD9F5922B58C34A008716DE /* ImageProcessingShaders.metal */; }; AFD9F5952B58D029008716DE /* MetalPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFD9F5942B58D029008716DE /* MetalPlayer.swift */; }; @@ -139,7 +138,6 @@ 009DFB0D2BC8CFA2007B56E8 /* FeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackView.swift; sourceTree = ""; }; 009DFB102BC8E2E9007B56E8 /* MenuVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuVC.swift; sourceTree = ""; }; 009DFB122BC8EA90007B56E8 /* MenuVCCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuVCCell.swift; sourceTree = ""; }; - 00B946222B67B26D00DA668F /* ddd_video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = ddd_video.mp4; sourceTree = ""; }; 00B946242B67B7DE00DA668F /* CCSpatialPlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CCSpatialPlayView.swift; sourceTree = ""; }; 00C665722BAA81F900C309C3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 00C665772BAA941E00C309C3 /* CopyCrashHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyCrashHandler.swift; sourceTree = ""; }; @@ -578,7 +576,6 @@ 006B61C82BBA4AF2003FCB49 /* MembershipVC */, 1EEF683C2B8D076B00B953F7 /* VRPreview */, 1E39459C2B83837900D0F5CA /* RecordingVideo */, - 00B946222B67B26D00DA668F /* ddd_video.mp4 */, AF2120F92B4EA5BD00400B7F /* CCHomeController.swift */, AF2120FB2B4EA5C800400B7F /* CCMineController.swift */, AF2120FD2B4EA5F100400B7F /* CCLoginController.swift */, @@ -800,7 +797,6 @@ 009DFB0E2BC8CFA2007B56E8 /* FeedbackView.swift in Sources */, AF2120C42B4E95DA00400B7F /* UIImage+Add.swift in Sources */, 1EFAF0C02B8B7A59002A1773 /* VRPhotoTransformController.swift in Sources */, - AF21210B2B4EA7FE00400B7F /* CCRequest.swift in Sources */, AF2120D82B4E9AC500400B7F /* CCAddImageView.swift in Sources */, 00D33BF42B998BF700604A44 /* SpatialImageConvertor.swift in Sources */, 006B61CA2BBA4B0D003FCB49 /* MembershipVC.swift in Sources */, diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index f6518df..4fae5dd 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 001473c..098f871 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -611,8 +611,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "387" - endingLineNumber = "387" + startingLineNumber = "388" + endingLineNumber = "388" landmarkName = "viewDidAppear(_:)" landmarkType = "7"> @@ -627,8 +627,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "551" - endingLineNumber = "551" + startingLineNumber = "552" + endingLineNumber = "552" landmarkName = "displayUpdate(caDisplayLink:)" landmarkType = "7"> diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index f962e80..097cfe3 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -119,7 +119,8 @@ class CCSpatialVideoDisplayController: BaseController { lazy var mTopImgView:UIImageView = { //393*236 - let view = UIImageView(frame: CGRect(x: 0, y: 0, width: SCREEN_Width, height: SCREEN_Height * 236/393)) +// let view = UIImageView(frame: CGRect(x: 0, y: 0, width: SCREEN_Width, height: SCREEN_Height * 236/393)) + let view = UIImageView(frame: CGRect(x: 0, y: 0, width: SCREEN_Width, height: 236)) view.image = UIImage.init(named: "BG_Top") return view diff --git a/SwiftProject/SwiftProject/Project/Controller/ddd_video.mp4 b/SwiftProject/SwiftProject/Project/Controller/ddd_video.mp4 deleted file mode 100644 index 2c1bf92..0000000 Binary files a/SwiftProject/SwiftProject/Project/Controller/ddd_video.mp4 and /dev/null differ diff --git a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings index 1e10998..05b9f53 100644 --- a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings +++ b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings @@ -117,6 +117,10 @@ "右侧中间键长按3s" = "右侧中间键长按3s"; "右侧亮度循环按键" ="右侧亮度循环按键\n长按 3s 切换 HSBS\n长按 7s 切换 FSBS"; + +"v1.5_praise" = "赏个好评"; +"v1.5_negative" = "下次再说"; +"v1.5_feedbackdesc" = "喜欢我们吗？你的好评是我们无限的动力"; //V1.5版本，用于功能集合页 "v1.5_share vpcamera" = "分享 VPCamera"; "v1.5_feedback" = "反馈意见"; @@ -128,5 +132,5 @@ "v1.5_contact information title" = "联系信息"; "v1.5_contact information placeholder" = "请输入 @xxxx.com"; "v1.5_submit" = "提交"; -"v1.5_menu_lang" = "en"; +"v1.5_menu_lang" = "zh"; "v1.5_提交中..." = "提交中...";