UI修复
This commit is contained in:
parent
5498315117
commit
bc26977539
Binary file not shown.
@ -467,8 +467,8 @@
|
||||
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "257"
|
||||
endingLineNumber = "257"
|
||||
startingLineNumber = "279"
|
||||
endingLineNumber = "279"
|
||||
landmarkName = "setttinisScreenMirroring(isScreenMirroring:)"
|
||||
landmarkType = "7">
|
||||
<Locations>
|
||||
|
||||
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Center.png
vendored
Normal file
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Center.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Center@2x.png
vendored
Normal file
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Center@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.3 KiB |
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Center@3x.png
vendored
Normal file
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Center@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.4 KiB |
23
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Contents.json
vendored
Normal file
23
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_en.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "Center.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Center@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Center@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Center.png
vendored
Normal file
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Center.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Center@2x.png
vendored
Normal file
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Center@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.7 KiB |
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Center@3x.png
vendored
Normal file
BIN
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Center@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
23
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Contents.json
vendored
Normal file
23
SwiftProject/SwiftProject/Assets.xcassets/displayvc_desc_zh.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "Center.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Center@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "Center@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@ -55,7 +55,24 @@ class CCSpatialPhotoDisplayController: BaseController {
|
||||
return view
|
||||
}()
|
||||
|
||||
|
||||
lazy var tipsButton: UIButton = {
|
||||
|
||||
//76*56
|
||||
let button = UIButton.init(type: UIButton.ButtonType.custom)
|
||||
button.tag = 203
|
||||
button.backgroundColor = .clear
|
||||
button.addTarget(self, action: #selector(showTipsView(sender:)), for: UIControl.Event.touchUpInside)
|
||||
let img2:UIImage = UIImage.init(named: NSLocalizedString("displayvc_desc", comment: ""))!
|
||||
button.setImage(img2, for: UIControl.State.normal)
|
||||
button.frame = CGRect(x: 0, y: 0, width: 173, height: 42)
|
||||
// button.titleLabel?.font = KFont_Regular(14)
|
||||
// button.titleLabel?.adjustsFontSizeToFitWidth = true
|
||||
// button.updateBtnEdgeInsets(style: .Left, space: 8)
|
||||
button.centerY = KScreenHeight - 120
|
||||
button.centerX = self.view.centerX
|
||||
|
||||
return button
|
||||
}()
|
||||
|
||||
|
||||
lazy var transformButton: UIButton = {
|
||||
@ -199,7 +216,7 @@ class CCSpatialPhotoDisplayController: BaseController {
|
||||
navtionBar?.addSubview(mTopCenterTypeButton)
|
||||
self.view.addSubview(mImgView)
|
||||
|
||||
|
||||
self.view.addSubview(tipsButton)
|
||||
checkAirPlayStatus()
|
||||
|
||||
|
||||
@ -211,6 +228,11 @@ class CCSpatialPhotoDisplayController: BaseController {
|
||||
Analytics.logEvent("preview_pv", parameters: ["refer_page":"图片预览页面","duration":sec])
|
||||
}
|
||||
|
||||
@objc func showTipsView(sender:UIButton) {
|
||||
//tips
|
||||
let view = CCDeviceOperationListView.init(frame: CGRectMake(0, 0, KScreenWidth, KScreenHeight))
|
||||
KWindow?.addSubview(view)
|
||||
}
|
||||
//MARK: - 外接屏幕 链接 与 断开
|
||||
@objc func exScreenWillConnectNotification(notification:Notification){
|
||||
print("exScreenWillConnectNotification>>>>>")
|
||||
|
||||
@ -192,12 +192,12 @@ class CCSpatialVideoDisplayController: BaseController {
|
||||
button.tag = 203
|
||||
button.backgroundColor = .clear
|
||||
button.addTarget(self, action: #selector(navgationButtonClick2(sender:)), for: UIControl.Event.touchUpInside)
|
||||
let img2:UIImage = UIImage.init(named: "tips_button" as String)!
|
||||
let img2:UIImage = UIImage.init(named: NSLocalizedString("displayvc_desc", comment: ""))!
|
||||
button.setImage(img2, for: UIControl.State.normal)
|
||||
button.frame = CGRect(x: 0, y: 0, width: 130, height: 30)
|
||||
button.titleLabel?.font = KFont_Regular(14)
|
||||
button.titleLabel?.adjustsFontSizeToFitWidth = true
|
||||
button.updateBtnEdgeInsets(style: .Left, space: 8)
|
||||
button.frame = CGRect(x: 0, y: 0, width: 173, height: 42)
|
||||
// button.titleLabel?.font = KFont_Regular(14)
|
||||
// button.titleLabel?.adjustsFontSizeToFitWidth = true
|
||||
// button.updateBtnEdgeInsets(style: .Left, space: 8)
|
||||
button.centerY = progressView.top - 70
|
||||
button.centerX = self.view.centerX
|
||||
|
||||
|
||||
@ -30,10 +30,15 @@ class CCDeviceOperationListView: UIView,UITableViewDelegate, UITableViewDataSour
|
||||
let tableView = UITableView(frame: CGRect.zero, style: .plain)
|
||||
tableView.showsVerticalScrollIndicator = false
|
||||
tableView.backgroundColor = UIColor(hexString: "#1F1E20")
|
||||
// tableView.backgroundColor = .orange
|
||||
tableView.delegate = self
|
||||
tableView.dataSource = self
|
||||
tableView.register(CCDeviceOperationListCell.self, forCellReuseIdentifier: TopCellId)
|
||||
|
||||
tableView.contentInsetAdjustmentBehavior = .never
|
||||
tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0 )
|
||||
// tableView.estimatedRowHeight = 0
|
||||
// tableView.estimatedSectionHeaderHeight = 0
|
||||
// tableView.estimatedSectionFooterHeight = 0
|
||||
//去掉下划线
|
||||
tableView.separatorStyle = .none
|
||||
return tableView
|
||||
@ -68,7 +73,7 @@ class CCDeviceOperationListView: UIView,UITableViewDelegate, UITableViewDataSour
|
||||
backView.addSubview(listTableView)
|
||||
|
||||
|
||||
backView.frame = CGRect.init(x: 0, y: KScreenHeight + 10 , width: KScreenWidth, height: CGFloat(Back_Height))
|
||||
backView.frame = CGRect.init(x: 0, y: KScreenHeight+10 , width: KScreenWidth, height: CGFloat(Back_Height))
|
||||
|
||||
|
||||
closeButton.snp.makeConstraints { (make) in
|
||||
@ -82,7 +87,7 @@ class CCDeviceOperationListView: UIView,UITableViewDelegate, UITableViewDataSour
|
||||
make.bottom.equalTo(closeButton.snp.top).offset(-16)
|
||||
make.leading.equalTo(backView.snp.leading)
|
||||
make.trailing.equalTo(backView.snp.trailing)
|
||||
make.top.equalTo(backView.snp.top)
|
||||
make.top.equalToSuperview()
|
||||
|
||||
}
|
||||
|
||||
@ -168,7 +173,7 @@ class CCDeviceOperationListView: UIView,UITableViewDelegate, UITableViewDataSour
|
||||
|
||||
|
||||
let headerView :UIView = UIView.init(frame: CGRect.init(x: 0, y: 0, width: tableView.frame.size.width, height: 52))
|
||||
headerView.backgroundColor = .clear
|
||||
headerView.backgroundColor = backView.backgroundColor//.clear
|
||||
//title
|
||||
let label = UILabel()
|
||||
label.text = "常用AR设备操作"
|
||||
|
||||
@ -105,3 +105,5 @@
|
||||
"Membership activated" = "Membership activated";
|
||||
"restorevip" = "Restore";
|
||||
"支付中..." = "Paying...";
|
||||
|
||||
"displayvc_desc" = "displayvc_desc_en";
|
||||
|
||||
@ -105,3 +105,4 @@
|
||||
"Membership activated" = "Membership activated";
|
||||
"restorevip" = "恢复购买";
|
||||
"支付中..." = "支付中...";
|
||||
"displayvc_desc" = "displayvc_desc_zh";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user