diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 602ac89..4dcc096 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 602ac89..4dcc096 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 0926e4b..f811c5d 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -41,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: SCREEN_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) // 在inspectView添加相应的控件 addInspectSubview() view.addSubview(inspectView) // 添加按钮 - let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 + let buttonWidth = SCREEN_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) + make.top.equalTo(SCREEN_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -207,7 +207,7 @@ // 设置视图大小 make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 @@ -216,7 +216,7 @@ // 设置视图大小 make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } }