diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index d9df6cf..0f63c93 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -14,7 +14,7 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController import kotlinx.android.synthetic.main.activity_methane.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_option_title.* class MethaneActivity : KotlinBaseActivity() { @@ -22,6 +22,8 @@ lateinit var weakReferenceHandler: WeakReferenceHandler } + private lateinit var host: List + private var isConnectSuccess = false //点击中间开关次数 @@ -46,14 +48,17 @@ true } - val host = configSpinner.selectedItem.toString().split(":") - + host = configSpinner.selectedItem.toString().split(":") SocketManager.get.connectNetty(host[0], host[1].toInt()) } override fun initEvent() { leftBackView.setOnClickListener { finish() } + rightOptionView.setOnClickListener { + SocketManager.get.connectNetty(host[0], host[1].toInt()) + } + wheelController.setOnWheelTouchListener(object : SteeringWheelController.OnWheelTouchListener { override fun onActionTurnUp(dir: SteeringWheelController.Direction) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index d9df6cf..0f63c93 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -14,7 +14,7 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController import kotlinx.android.synthetic.main.activity_methane.* -import kotlinx.android.synthetic.main.include_base_title.* +import kotlinx.android.synthetic.main.include_option_title.* class MethaneActivity : KotlinBaseActivity() { @@ -22,6 +22,8 @@ lateinit var weakReferenceHandler: WeakReferenceHandler } + private lateinit var host: List + private var isConnectSuccess = false //点击中间开关次数 @@ -46,14 +48,17 @@ true } - val host = configSpinner.selectedItem.toString().split(":") - + host = configSpinner.selectedItem.toString().split(":") SocketManager.get.connectNetty(host[0], host[1].toInt()) } override fun initEvent() { leftBackView.setOnClickListener { finish() } + rightOptionView.setOnClickListener { + SocketManager.get.connectNetty(host[0], host[1].toInt()) + } + wheelController.setOnWheelTouchListener(object : SteeringWheelController.OnWheelTouchListener { override fun onActionTurnUp(dir: SteeringWheelController.Direction) { diff --git a/app/src/main/res/layout/activity_methane.xml b/app/src/main/res/layout/activity_methane.xml index b813094..a897ae8 100644 --- a/app/src/main/res/layout/activity_methane.xml +++ b/app/src/main/res/layout/activity_methane.xml @@ -7,7 +7,7 @@ android:background="@color/mainBackColor" android:orientation="vertical"> - + + private var isConnectSuccess = false //点击中间开关次数 @@ -46,14 +48,17 @@ true } - val host = configSpinner.selectedItem.toString().split(":") - + host = configSpinner.selectedItem.toString().split(":") SocketManager.get.connectNetty(host[0], host[1].toInt()) } override fun initEvent() { leftBackView.setOnClickListener { finish() } + rightOptionView.setOnClickListener { + SocketManager.get.connectNetty(host[0], host[1].toInt()) + } + wheelController.setOnWheelTouchListener(object : SteeringWheelController.OnWheelTouchListener { override fun onActionTurnUp(dir: SteeringWheelController.Direction) { diff --git a/app/src/main/res/layout/activity_methane.xml b/app/src/main/res/layout/activity_methane.xml index b813094..a897ae8 100644 --- a/app/src/main/res/layout/activity_methane.xml +++ b/app/src/main/res/layout/activity_methane.xml @@ -7,7 +7,7 @@ android:background="@color/mainBackColor" android:orientation="vertical"> - + + + + + + + + + \ No newline at end of file