diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt
index 668332d442..30807202e5 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt
@@ -19,19 +19,9 @@ class DriverMoFangFunctionManager private constructor() {
}
}
- private var mContext: Context? = null
private val TAG = "DriverMoFangFunctionManager"
- private var startPressTime: Long = 0 //开始按键时间
- private var isPressEnd = false //按键是否结束
-
private var timerHorn: Timer? = null
private var timerAcc: Timer? = null
-
-
- fun init(context: Context) {
- mContext = context
- }
-
/**
* 发送加速和减速，复位的时候，isSend为false，其他都是true，acc就是具体的值
*/
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt
index d5d236204d..3d3ec84b87 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt
@@ -4,7 +4,10 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.och.common.module.R
+import com.mogo.och.common.module.manager.DriverMoFangFunctionManager
+import kotlinx.android.synthetic.main.driver_mofang_function_view.view.*
/**
* @author: wangmingjun
@@ -14,6 +17,26 @@ class DriverMoFangFunctionView @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null
) : ConstraintLayout(context, attrs) {
init {
-// LayoutInflater.from(context).inflate(R.layout.driver_mofang_function_view)
+ LayoutInflater.from(context).inflate(R.layout.driver_mofang_function_view,null)
+ initView()
}
+
+ private fun initView() {
+ moderateIv.onClick {
+ DriverMoFangFunctionManager.driverMoFangFunctionManager.sendAcc(true,0.1)
+ }
+
+ brakeStopIv.onClick {
+ DriverMoFangFunctionManager.driverMoFangFunctionManager.sendAcc(true,0.2)
+ }
+
+ resetIv.onClick {
+ DriverMoFangFunctionManager.driverMoFangFunctionManager.reset()
+ }
+
+ whistleIv.onClick {
+ DriverMoFangFunctionManager.driverMoFangFunctionManager.sendOperatorSetHornByDriver()
+ }
+ }
+
}
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png
new file mode 100644
index 0000000000..ba8d48e24a
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png
new file mode 100644
index 0000000000..1728ad0b4a
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png
new file mode 100644
index 0000000000..b0c8eb25ba
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png
new file mode 100644
index 0000000000..1cf6ad1798
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png
new file mode 100644
index 0000000000..a477bcd438
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png
new file mode 100644
index 0000000000..65884ac663
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png
new file mode 100644
index 0000000000..4e4cf034ba
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png
new file mode 100644
index 0000000000..b820701bb9
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png
new file mode 100644
index 0000000000..ae7623ede6
Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png differ
diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml
new file mode 100644
index 0000000000..e84f3b901b
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml
@@ -0,0 +1,6 @@
+
+
+