Skip to content

Commit

Permalink
コントロール不具合修正
Browse files Browse the repository at this point in the history
  • Loading branch information
@umiryu417
umiryu417 committed Oct 29, 2016
1 parent 67732ee commit cf6d741
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 51 deletions.
4 changes: 2 additions & 2 deletions MaBeeeCar.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -268,7 +268,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
61 changes: 31 additions & 30 deletions MaBeeeCar/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2548a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
Expand All @@ -16,32 +16,18 @@
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="736" height="414"/>
<rect key="frame" x="0.0" y="0.0" width="1366" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="接続なし" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c4Z-0c-X9S">
<frame key="frameInset" minX="162" minY="45" width="80" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="アクセル" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3uP-FC-RfF">
<frame key="frameInset" minX="72" minY="17" width="82" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="接続なし" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aot-4s-eQl">
<frame key="frameInset" minX="162" minY="12" width="104" height="31"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="左MaBeee" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3uP-FC-RfF">
<frame key="frameInset" minX="20" minY="20" width="82" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="ハンドル" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tFC-bi-dph">
<frame key="frameInset" minX="72" minY="45" width="82" height="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="右MaBeee" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tFC-bi-dph">
<frame key="frameInset" minX="20" minY="48" width="82" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
Expand Down Expand Up @@ -93,20 +79,35 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cR6-1R-fCO">
<state key="normal" title="MaBeee接続"/>
<connections>
<action selector="MaBeee接続:" destination="BYZ-38-t0r" eventType="touchUpInside" id="KdZ-eP-jcW"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F0m-kh-ODK">
<frame key="frameInset" minX="20" minY="22" width="31" height="30"/>
<frame key="frameInset" minX="640" minY="21" width="31" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="交換"/>
<connections>
<action selector="MaBeee交換:" destination="BYZ-38-t0r" eventType="touchUpInside" id="r7S-ME-dGG"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cR6-1R-fCO">
<frame key="frameInset" minX="20" minY="974" width="87" height="30"/>
<state key="normal" title="MaBeee接続"/>
<connections>
<action selector="MaBeee接続:" destination="BYZ-38-t0r" eventType="touchUpInside" id="1yU-7t-VaI"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="接続なし" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c4Z-0c-X9S">
<frame key="frameInset" minX="110" minY="48" width="151" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="接続なし" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aot-4s-eQl">
<frame key="frameInset" minX="110" minY="15" width="151" height="31"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
Expand All @@ -119,17 +120,17 @@
</constraints>
</view>
<connections>
<outlet property="アクセルMaBeee" destination="aot-4s-eQl" id="RFJ-AG-tBP"/>
<outlet property="アクセルスライダー" destination="Kwz-gN-7A7" id="ZQ4-7s-kAy"/>
<outlet property="ハンドルMaBeee" destination="c4Z-0c-X9S" id="Cag-bX-03C"/>
<outlet property="ハンドルスライダー" destination="Gbk-Vh-DMY" id="z6a-JF-h4C"/>
<outlet property="右MaBeee" destination="c4Z-0c-X9S" id="20a-ER-tSZ"/>
<outlet property="右MaBeee出力" destination="d8y-GL-8g7" id="044-z4-riX"/>
<outlet property="左MaBeee" destination="aot-4s-eQl" id="BvF-Nv-Dbd"/>
<outlet property="左MaBeee出力" destination="NoZ-nC-BBU" id="SrH-RJ-ZWH"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="134.5108695652174" y="152.17391304347828"/>
<point key="canvasLocation" x="133.96778916544656" y="151.7578125"/>
</scene>
</scenes>
</document>
40 changes: 21 additions & 19 deletions MaBeeeCar/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class ViewController: UIViewController {
@IBOutlet weak var 左MaBeee出力: UILabel!
@IBOutlet weak var 右MaBeee出力: UILabel!

@IBOutlet weak var アクセルMaBeee: UILabel!
@IBOutlet weak var ハンドルMaBeee: UILabel!
@IBOutlet weak var 左MaBeee: UILabel!
@IBOutlet weak var 右MaBeee: UILabel!

override func viewDidLoad() {
super.viewDidLoad()
Expand Down Expand Up @@ -52,39 +52,39 @@ class ViewController: UIViewController {
self.右MaBeee出力.text = String(Int32(右*100))

for device in MaBeeeApp.instance().devices() {
if(self.アクセルMaBeee.text == device.name) {
if(self.左MaBeee.text == device.name) {
device.pwmDuty = Int32(左*100)
continue
}
if(self.ハンドルMaBeee.text == device.name) {
if(self.右MaBeee.text == device.name) {
device.pwmDuty = Int32(右*100)
break;
continue;
}
}

}

func 接続チェック() {
self.アクセルMaBeee.text = "接続なし"
self.ハンドルMaBeee.text = "接続なし"
if let mabeee = MaBeeeApp.instance() {
// if(mabeee.devices().count == 0) {
// return;
// }
for device in mabeee.devices() {
if(self.アクセルMaBeee.text == "接続なし") {
self.アクセルMaBeee.text = device.name
if(self.左MaBeee.text == "接続なし") {
self.左MaBeee.text = device.name
continue
}
if(self.ハンドルMaBeee.text == "接続なし") {
self.ハンドルMaBeee.text = device.name
if(self.右MaBeee.text == "接続なし") {
self.右MaBeee.text = device.name
break;
}
}
let when = DispatchTime.now() + 2.0
DispatchQueue.main.asyncAfter(deadline: when, execute: {
self.接続チェック()
})
if(self.左MaBeee.text == "接続なし" || self.右MaBeee.text == "接続なし") {
let when = DispatchTime.now() + 2.0
DispatchQueue.main.asyncAfter(deadline: when, execute: {
self.接続チェック()
})
}
}
}

Expand All @@ -97,13 +97,15 @@ class ViewController: UIViewController {
@IBAction func MaBeee接続(_ sender: UIButton) {
let mabeee = MaBeeeScanViewController()
mabeee.show(self)
self.左MaBeee.text = "接続なし"
self.右MaBeee.text = "接続なし"
self.接続チェック()
}

@IBAction func MaBeee交換(_ sender: UIButton) {
let tmp = self.アクセルMaBeee.text
self.アクセルMaBeee.text = self.ハンドルMaBeee.text
self.ハンドルMaBeee.text = tmp
let tmp = self.左MaBeee.text
self.左MaBeee.text = self.右MaBeee.text
self.右MaBeee.text = tmp
}
}

0 comments on commit cf6d741

Please sign in to comment.