diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt index cde60c8612..98bffc7f57 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt @@ -17,7 +17,7 @@ import com.mogo.eagle.core.utilcode.util.* import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus import com.zhjt.mogo_core_function_devatools.status.entity.GpsStatus import com.zhjt.mogo_core_function_devatools.status.entity.IpcStatus -import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus +//import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus import com.zhjt.mogo_core_function_devatools.status.entity.RTKStatus import com.zhjt.mogo_core_function_devatools.status.entity.Status import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus @@ -26,7 +26,7 @@ import com.zhjt.mogo_core_function_devatools.status.flow.IFlow import com.zhjt.mogo_core_function_devatools.status.flow.can.CanImpl import com.zhjt.mogo_core_function_devatools.status.flow.gps.GpsImpl import com.zhjt.mogo_core_function_devatools.status.flow.ipc.IpcImpl -import com.zhjt.mogo_core_function_devatools.status.flow.nets.NetsImpl +//import com.zhjt.mogo_core_function_devatools.status.flow.nets.NetsImpl import com.zhjt.mogo_core_function_devatools.status.flow.rtk.RTKImpl import com.zhjt.mogo_core_function_devatools.status.flow.trace.TracingImpl import com.zhjt.mogo_core_function_devatools.status.ui.StatusView @@ -116,7 +116,7 @@ object StatusManager { when (it) { is CanStatus -> CanImpl(ctx) is IpcStatus -> IpcImpl(ctx) - is NetStatus -> NetsImpl(ctx) +// is NetStatus -> NetsImpl(ctx) is GpsStatus -> GpsImpl(ctx) is TracingStatus -> TracingImpl(ctx) is RTKStatus -> RTKImpl(ctx) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt index 1804b27ecd..84bc45f909 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt @@ -37,28 +37,28 @@ class IpcStatus(val enabled: Boolean = false): Status() { override fun isException(): Boolean = !enabled } -class NetStatus(val enabled: Boolean = false, var name: String? = null): Status() { - - override fun equals(other: Any?): Boolean { - if (javaClass != other?.javaClass) return false - other as NetStatus - if (enabled != other.enabled) return false - if (name != other.name) return false - return true - } - - override fun hashCode(): Int { - var result = enabled.hashCode() - result = 31 * result + (name?.hashCode() ?: 0) - return result - } - - override fun toString(): String { - return "NetStatus(enabled=$enabled, name=$name)" - } - - override fun isException(): Boolean = !enabled -} +//class NetStatus(val enabled: Boolean = false, var name: String? = null): Status() { +// +// override fun equals(other: Any?): Boolean { +// if (javaClass != other?.javaClass) return false +// other as NetStatus +// if (enabled != other.enabled) return false +// if (name != other.name) return false +// return true +// } +// +// override fun hashCode(): Int { +// var result = enabled.hashCode() +// result = 31 * result + (name?.hashCode() ?: 0) +// return result +// } +// +// override fun toString(): String { +// return "NetStatus(enabled=$enabled, name=$name)" +// } +// +// override fun isException(): Boolean = !enabled +//} /** * android系统定位状态 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt index 89564cb8e0..3c24a01358 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt @@ -1,122 +1,122 @@ package com.zhjt.mogo_core_function_devatools.status.flow.nets -import android.* -import android.content.* -import android.location.* -import android.net.* -import android.net.wifi.* -import android.os.Build.VERSION -import android.os.Build.VERSION_CODES -import androidx.core.location.* -import com.mogo.eagle.core.utilcode.kotlin.* -import com.mogo.eagle.core.utilcode.util.* -import com.zhjt.mogo_core_function_devatools.status.flow.IFlow -import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus -import kotlinx.coroutines.* -import java.util.concurrent.atomic.* - -internal class NetsImpl(ctx: Context): IFlow(ctx) { - - companion object { - const val TAG = "NetsImpl" - } - - private val registered = AtomicBoolean(false) - - private val connectMgr by lazy { - ctx.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - } - - private val wifiMgr by lazy { - ctx.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager - } - - private val cb = object : ConnectivityManager.NetworkCallback() { - - override fun onAvailable(network: Network) { - super.onAvailable(network) - checkAndSend() - } - - override fun onLosing(network: Network, maxMsToLive: Int) { - super.onLosing(network, maxMsToLive) - } - - override fun onLost(network: Network) { - super.onLost(network) - checkAndSend() - } - - override fun onUnavailable() { - super.onUnavailable() - checkAndSend() - } - - override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) { - super.onCapabilitiesChanged(network, networkCapabilities) - checkAndSend() - } - - override fun onLinkPropertiesChanged(network: Network, linkProperties: LinkProperties) { - super.onLinkPropertiesChanged(network, linkProperties) - } - } - - - override fun onCreate() { - checkAndSend() - val builder = NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_WIFI) - if (VERSION.SDK_INT >= VERSION_CODES.O) { - builder.addTransportType(NetworkCapabilities.TRANSPORT_WIFI_AWARE) - } - if (registered.compareAndSet(false, true)) { - connectMgr.registerNetworkCallback(builder.build(), cb) - } - } - - private var loopCheckAndSendJob: Job? = null - - private fun checkAndSend() { - loopCheckAndSendJob?.safeCancel() - launch(Dispatchers.Unconfined) { - val connectionInfo = wifiMgr.connectionInfo - val enabled = isNetConnected() - val name = - try { - if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "WI-FI" - } catch (t: Throwable) { - t.printStackTrace() - "WI-FI" - } - send(enabled, name) - delay(1000); - checkAndSend() - }.also { loopCheckAndSendJob = it } - } - - private fun isLocationEnabled() = - LocationManagerCompat.isLocationEnabled(ctx.getSystemService(Context.LOCATION_SERVICE) as LocationManager) && PermissionUtils.isGranted(Manifest.permission.ACCESS_FINE_LOCATION) - - - private fun isNetConnected(): Boolean = - if (VERSION.SDK_INT >= VERSION_CODES.M) { - val networkCapabilities = connectMgr.getNetworkCapabilities(connectMgr.activeNetwork) - networkCapabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false - } else { - val activeNetworkInfo = connectMgr.activeNetworkInfo - activeNetworkInfo != null && activeNetworkInfo.isConnected - } - - private fun send(enabled: Boolean, name: String?) { - send(NetStatus(enabled, name)) - } - - override fun onDestroy() { - super.onDestroy() - if (registered.compareAndSet(true, false)) { - connectMgr.unregisterNetworkCallback(cb) - } - loopCheckAndSendJob?.safeCancel() - } -} \ No newline at end of file +//import android.* +//import android.content.* +//import android.location.* +//import android.net.* +//import android.net.wifi.* +//import android.os.Build.VERSION +//import android.os.Build.VERSION_CODES +//import androidx.core.location.* +//import com.mogo.eagle.core.utilcode.kotlin.* +//import com.mogo.eagle.core.utilcode.util.* +//import com.zhjt.mogo_core_function_devatools.status.flow.IFlow +//import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus +//import kotlinx.coroutines.* +//import java.util.concurrent.atomic.* +// +//internal class NetsImpl(ctx: Context): IFlow(ctx) { +// +// companion object { +// const val TAG = "NetsImpl" +// } +// +// private val registered = AtomicBoolean(false) +// +// private val connectMgr by lazy { +// ctx.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager +// } +// +// private val wifiMgr by lazy { +// ctx.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager +// } +// +// private val cb = object : ConnectivityManager.NetworkCallback() { +// +// override fun onAvailable(network: Network) { +// super.onAvailable(network) +// checkAndSend() +// } +// +// override fun onLosing(network: Network, maxMsToLive: Int) { +// super.onLosing(network, maxMsToLive) +// } +// +// override fun onLost(network: Network) { +// super.onLost(network) +// checkAndSend() +// } +// +// override fun onUnavailable() { +// super.onUnavailable() +// checkAndSend() +// } +// +// override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) { +// super.onCapabilitiesChanged(network, networkCapabilities) +// checkAndSend() +// } +// +// override fun onLinkPropertiesChanged(network: Network, linkProperties: LinkProperties) { +// super.onLinkPropertiesChanged(network, linkProperties) +// } +// } +// +// +// override fun onCreate() { +// checkAndSend() +// val builder = NetworkRequest.Builder() +// .addTransportType(NetworkCapabilities.TRANSPORT_WIFI) +// if (VERSION.SDK_INT >= VERSION_CODES.O) { +// builder.addTransportType(NetworkCapabilities.TRANSPORT_WIFI_AWARE) +// } +// if (registered.compareAndSet(false, true)) { +// connectMgr.registerNetworkCallback(builder.build(), cb) +// } +// } +// +// private var loopCheckAndSendJob: Job? = null +// +// private fun checkAndSend() { +// loopCheckAndSendJob?.safeCancel() +// launch(Dispatchers.Unconfined) { +// val connectionInfo = wifiMgr.connectionInfo +// val enabled = isNetConnected() +// val name = +// try { +// if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "WI-FI" +// } catch (t: Throwable) { +// t.printStackTrace() +// "WI-FI" +// } +// send(enabled, name) +// delay(1000); +// checkAndSend() +// }.also { loopCheckAndSendJob = it } +// } +// +// private fun isLocationEnabled() = +// LocationManagerCompat.isLocationEnabled(ctx.getSystemService(Context.LOCATION_SERVICE) as LocationManager) && PermissionUtils.isGranted(Manifest.permission.ACCESS_FINE_LOCATION) +// +// +// private fun isNetConnected(): Boolean = +// if (VERSION.SDK_INT >= VERSION_CODES.M) { +// val networkCapabilities = connectMgr.getNetworkCapabilities(connectMgr.activeNetwork) +// networkCapabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false +// } else { +// val activeNetworkInfo = connectMgr.activeNetworkInfo +// activeNetworkInfo != null && activeNetworkInfo.isConnected +// } +// +// private fun send(enabled: Boolean, name: String?) { +// send(NetStatus(enabled, name)) +// } +// +// override fun onDestroy() { +// super.onDestroy() +// if (registered.compareAndSet(true, false)) { +// connectMgr.unregisterNetworkCallback(cb) +// } +// loopCheckAndSendJob?.safeCancel() +// } +//} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt index 3e0d728e81..17a2fa5456 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt @@ -5,7 +5,7 @@ import com.mogo.eagle.core.function.call.autopilot.* import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus import com.zhjt.mogo_core_function_devatools.status.entity.GpsStatus import com.zhjt.mogo_core_function_devatools.status.entity.IpcStatus -import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus +//import com.zhjt.mogo_core_function_devatools.status.entity.NetStatus import com.zhjt.mogo_core_function_devatools.status.entity.RTKStatus import com.zhjt.mogo_core_function_devatools.status.entity.Status import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus @@ -19,11 +19,11 @@ internal class StatusModel : ViewModel() { const val TAG = "StatusModel" val DEFAULTS = Pair(null, ArrayList().also { + it += RTKStatus("", -1) it += IpcStatus(CallerAutoPilotManager.isConnected()) - it += NetStatus(false) + // it += NetStatus(false) it += CanStatus(false) it += TracingStatus(UNKNOWN) - it += RTKStatus("", -1) it += GpsStatus(enabled = false, isGranted = false) }) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index 1eebcf28e9..b7c6924d50 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -2,14 +2,8 @@ package com.zhjt.mogo_core_function_devatools.status.ui import android.annotation.* import android.content.* -import android.graphics.* -import android.graphics.drawable.* -import android.transition.* -import android.util.* import android.view.* -import androidx.appcompat.widget.* import androidx.constraintlayout.widget.* -import androidx.core.content.* import androidx.lifecycle.* import androidx.recyclerview.widget.* import com.mogo.eagle.core.utilcode.kotlin.* @@ -29,29 +23,16 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra const val TAG = "StatusView" } - private val iv: AppCompatImageView private val rv: RecyclerView - private val dot: View private var observer: Observer>>? = null init { LayoutInflater.from(context).inflate(R.layout.layout_status_bar, this, true) - iv = findViewById(R.id.iv) rv = findViewById(R.id.rv) - dot = findViewById(R.id.dot) init() } private fun init() { - dot.background = shape(solid = Color.parseColor("#F33F1D"), shape = GradientDrawable.OVAL, width = 30.PX, height = 30.PX) - iv.also { - it.background = ContextCompat.getDrawable(context, R.drawable.icon_dev_status_un_fold) - it.onClick { v -> - val expand = v.tag as? Boolean ?: false - animate(expand) - v.tag = !expand - } - } rv.also { itx -> itx.itemAnimator?.run { changeDuration = 0 @@ -59,25 +40,16 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra moveDuration = 0 removeDuration = 0 } - itx.layoutManager = GridLayoutManager(context,4, GridLayoutManager.VERTICAL, false) - itx.background = shape(solid = Color.parseColor("#80000000"), radius = 40.PX) + itx.layoutManager = LinearLayoutManager(context,LinearLayoutManager.HORIZONTAL, false) itx.addItemDecoration( CommonDividerItemDecoration.Builder() - .horizontalExternalSpace(38.PX) - .verticalExternalSpace(30.PX) - .verticalInnerSpace(20.PX) .spanCountTBCare(false) - .horizontalInnerSpace(50.PX) + .horizontalInnerSpace(10.PX) .build() ) val adapter = model.status.value?.let { data -> StatusAdapter(context, data.second) }?.also { adapter -> itx.adapter = adapter } adapter?.let { _ -> model.status.observeForever(Observer>> { data -> - if (data.first != null) { - dot.visibility = View.VISIBLE - } else { - dot.visibility = View.INVISIBLE - } val old = adapter.data val result = DiffUtil.calculateDiff(StatusDiffCallback(old, data.second)) adapter.data = data.second @@ -101,10 +73,4 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra } } } - - private fun animate(expand: Boolean) { - TransitionManager.beginDelayedTransition(this, AutoTransition().setDuration(200)) - rv.visibility = if (expand) View.VISIBLE else View.INVISIBLE - } - } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt index 56955dcda9..8eb2ccbe6f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt @@ -39,9 +39,9 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } fun bind(status: Status) { - itemView.onClick { - ToastUtils.showShort(getText(status)) - } +// itemView.onClick { +// ToastUtils.showShort(getText(status)) +// } when(status) { is IpcStatus -> { if (status.enabled) { @@ -57,13 +57,13 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_can_disable) } } - is NetStatus -> { - if (status.enabled) { - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_enable) - } else { - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_disable) - } - } +// is NetStatus -> { +// if (status.enabled) { +// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_enable) +// } else { +// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_disable) +// } +// } is GpsStatus -> { if (status.enabled && status.isGranted) { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_enable) @@ -106,7 +106,7 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec is CanStatus -> "CAN:${ if (status.enabled) "状态正常" else "非正常连接" }" is GpsStatus -> "GPS:${ if (status.enabled) "状态正常" else "非正常连接" }" is IpcStatus -> "工控机:${ if (status.enabled) "状态正常" else "非正常连接" }" - is NetStatus -> "WIFI:${ if (status.enabled) "${status.name}" else "非正常连接" }" +// is NetStatus -> "WIFI:${ if (status.enabled) "${status.name}" else "非正常连接" }" is RTKStatus -> when(status.desc) { "RTK" -> when(status.state) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png index 6b518b07f1..7a40e74502 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png index 302775b794..5a8ba8f113 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png index 3574b7d2d1..c222f9e753 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_disable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png index 939a047a33..ef0fb961bd 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_gps_enable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png index 2df0b2fb4b..8af610ac55 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png index 553f1a6854..679d995098 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png index 6891e2c698..aab25db226 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_route_enable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png index 99c4bb9294..34b284c771 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png index 208fd70c88..389ca405d9 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png index e48a945624..a70bddcd7b 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png index a2e8c4c842..18de44bf02 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png index 416bb6d2cb..8b7e063f06 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png index 26dd0d3675..7669036a6a 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png index d76f3d74b7..29af9e896a 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_trace_unkown.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png index 43e1cff91a..73e8ce9f30 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_track_enable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml index 0ce9082586..cb70767345 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml @@ -8,33 +8,11 @@ - - - - + app:layout_constraintBottom_toBottomOf="parent" + android:overScrollMode="never" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml index 6258622aa4..d3a2d42858 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml @@ -1,5 +1,5 @@ \ No newline at end of file + android:layout_width="@dimen/dp_115" + android:layout_height="@dimen/dp_46" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index c28afd84ef..2d37c7ea43 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -290,9 +290,9 @@ class MoGoHmiFragment : MvpFragment(), setProxyTrafficLightView(viewTrafficLightVr) setProxyLimitingSpeedView(viewLimitingVelocity) setViewNotificationProvider(this) - context?.also { - CallerDevaToolsManager.showStatusBar(it, statusBarContainer) - } +// context?.also { +// CallerDevaToolsManager.showStatusBar(it, statusBarContainer) +// } } override fun getNotificationView(): IViewNotification? = @@ -1580,7 +1580,7 @@ class MoGoHmiFragment : MvpFragment(), } } ?.commitAllowingStateLoss() - context?.let { CallerDevaToolsManager.showStatusBar(it, statusBarContainer) } +// context?.let { CallerDevaToolsManager.showStatusBar(it, statusBarContainer) } } override fun onDestroy() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt index 766c2f62b9..82cefaf11a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt @@ -2,10 +2,10 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.content.Context import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.RelativeLayout +import android.view.* +import android.widget.* import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener +import com.mogo.eagle.core.function.call.devatools.* import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.BarUtils @@ -17,13 +17,14 @@ class StatusBarView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : RelativeLayout(context, attrs, defStyleAttr), IMoGoSkinModeChangeListener { +) : LinearLayout(context, attrs, defStyleAttr), IMoGoSkinModeChangeListener { companion object { const val TAG = "StatusBarView" } init { + orientation = HORIZONTAL LayoutInflater.from(context).inflate(R.layout.view_status_bar, this, true) } @@ -31,18 +32,11 @@ class StatusBarView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() - val layoutParamsLeft = - LayoutParams(ScreenUtils.getScreenWidth() / 3, BarUtils.getStatusBarHeight()) - viewStatusBarLeft.layoutParams = layoutParamsLeft - val layoutParamsRight = - LayoutParams(ScreenUtils.getScreenWidth() / 3 * 2, BarUtils.getStatusBarHeight()) - layoutParamsRight.addRule(ALIGN_PARENT_END) - layoutParamsRight.addRule(CENTER_HORIZONTAL) - layoutParamsRight.addRule(CENTER_IN_PARENT) - layoutParamsRight.marginEnd = context.resources.getDimension(R.dimen.dp_44).toInt() - viewStatusBarRight.layoutParams = layoutParamsRight viewStatusBarRight.addView(BatteryGroupView(this.context)) + //将状态窗口中的状态移到状态栏上 + CallerDevaToolsManager.showStatusBar(context, status_container) + // 添加换肤监听 CallerSkinModeListenerManager.addListener(TAG, this) } @@ -84,7 +78,7 @@ class StatusBarView @JvmOverloads constructor( override fun onDetachedFromWindow() { super.onDetachedFromWindow() CallerSkinModeListenerManager.removeListener(TAG) + CallerDevaToolsManager.hideStatusBar() } - } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml index 57fd8a6b0a..e9a9a68ad0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml @@ -1,56 +1,60 @@ - + android:layout_height="@dimen/dp_72" + tools:parentTag="android.widget.LinearLayout"> + + + + + + + + + + - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 9404898a6d..ccf45ee278 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -78,6 +78,7 @@ 55dp 56dp 57dp + 57.5dp 58dp 59dp 60dp