From 30b3432cb15e1f9625433adc0c7c38632e9132ab Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 28 Oct 2022 14:38:47 +0800 Subject: [PATCH] .. --- app/build.gradle | 6 +- .../com/mogo/launcher/MogoApplication.java | 66 +++++++++--------- .../network/FuncConfigNetWorkModel.kt | 4 ++ .../hmi/ui/widget/BatteryGroupView.kt | 19 ++++- .../function/hmi/ui/widget/WifiStateView.kt | 59 ++++++++++++---- .../main/res/drawable/battery_charge_dark.png | Bin 0 -> 640 bytes ...ry_charge.png => battery_charge_light.png} | Bin .../res/drawable/wifi_dark_state_five.png | Bin 0 -> 1819 bytes .../res/drawable/wifi_dark_state_four.png | Bin 0 -> 1785 bytes .../main/res/drawable/wifi_dark_state_one.png | Bin 0 -> 2277 bytes .../res/drawable/wifi_dark_state_three.png | Bin 0 -> 1742 bytes .../main/res/drawable/wifi_dark_state_two.png | Bin 0 -> 1720 bytes .../main/res/layout/view_battery_group.xml | 2 +- gradle.properties | 4 +- 14 files changed, 107 insertions(+), 53 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge_dark.png rename core/function-impl/mogo-core-function-hmi/src/main/res/drawable/{battery_charge.png => battery_charge_light.png} (100%) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_dark_state_five.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_dark_state_four.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_dark_state_one.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_dark_state_three.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_dark_state_two.png diff --git a/app/build.gradle b/app/build.gradle index 5da6dde1f4..444dec13fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ if (!isAndroidTestBuild()) { if (!isAndroidTestBuild()) { apply plugin: 'chain.log.hook' - hooklog{ + hooklog { enableTraceToServer false enableLoggerToLocal true } @@ -264,7 +264,7 @@ dependencies { } else { implementation project(':tts:tts-pad') implementation project(':core:function-impl:mogo-core-function-hmi') - + androidTestImplementation project(':core:mogo-core-function-call') androidTestImplementation project(':core:mogo-core-res') androidTestImplementation project(':core:function-impl:mogo-core-function-notice') @@ -353,7 +353,7 @@ def getWorkingBranchHash() { } static def getBuildTime() { - def buildTimeFormat = "yyyy-MM-dd HH:mm:ss" + def buildTimeFormat = "yyyy-MM-dd HH:mm:ss" //设置时间格式 SimpleDateFormat formatter = new SimpleDateFormat(buildTimeFormat, Locale.getDefault()) //获取当前时间 diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index ee39bc7a34..1964720b5e 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -7,8 +7,6 @@ import androidx.annotation.NonNull; import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.launcher.crash.CrashSystem; -import com.mogo.thread.ext.core.ThreadManager; -import com.mogo.thread.ext.core.config.ThreadConfig; import java.util.concurrent.ThreadPoolExecutor; @@ -23,40 +21,40 @@ public class MogoApplication extends MainMoGoApplication { @Override protected void attachBaseContext(Context base) { super.attachBaseContext(base); - ThreadConfig.Builder builder = new ThreadConfig.Builder().listener(new ThreadConfig.TaskExecuteListener() { - @Override - public boolean isEnabled() { - return true; // 如果返回true，会有后续的回调；如果返回false, 不会有后续的回调 - } - - @Override - public void onExecutorBefore(@NonNull Runnable runnable, @NonNull ThreadConfig.TaskType type) { - //每个任务执行前回调 -// if (type == ThreadConfig.TaskType.HandlerThread) { +// ThreadConfig.Builder builder = new ThreadConfig.Builder().listener(new ThreadConfig.TaskExecuteListener() { +// @Override +// public boolean isEnabled() { +// return true; // 如果返回true，会有后续的回调；如果返回false, 不会有后续的回调 +// } // +// @Override +// public void onExecutorBefore(@NonNull Runnable runnable, @NonNull ThreadConfig.TaskType type) { +// //每个任务执行前回调 +//// if (type == ThreadConfig.TaskType.HandlerThread) { +//// +//// +//// } +// } // -// } - } - - @Override - public void onExecutorAfter(@NonNull Runnable runnable, @NonNull ThreadConfig.TaskType type) { - //每个任务执行后回调 - } - - /** - * @param core 线程池的核心数 - * @param max 线程池的最大线程数 - * @param active 线程池正在活跃的任务数 - * @param completed 线程池已完成的任务数 - */ - @Override - public void onExecutorStateChanged(@NonNull ThreadPoolExecutor pool, int core, int max, int active, long completed) { - //线程池在执行过程，状态变化回调 - //Log.d("POOL", "core:" + core + ";max:" + max + ";active:" + active + ";completed:" + completed); - } - }); - builder.loggable(false); - ThreadManager.INSTANCE.init(builder); +// @Override +// public void onExecutorAfter(@NonNull Runnable runnable, @NonNull ThreadConfig.TaskType type) { +// //每个任务执行后回调 +// } +// +// /** +// * @param core 线程池的核心数 +// * @param max 线程池的最大线程数 +// * @param active 线程池正在活跃的任务数 +// * @param completed 线程池已完成的任务数 +// */ +// @Override +// public void onExecutorStateChanged(@NonNull ThreadPoolExecutor pool, int core, int max, int active, long completed) { +// //线程池在执行过程，状态变化回调 +// //Log.d("POOL", "core:" + core + ";max:" + max + ";active:" + active + ";completed:" + completed); +// } +// }); +// builder.loggable(false); +// ThreadManager.INSTANCE.init(builder); } @Override diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt index 10540e4e12..b9d28263ce 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt @@ -34,9 +34,13 @@ class FuncConfigNetWorkModel { if (error == null) { error = onError } + //todo test map["sn"] = MoGoAiCloudClientConfig.getInstance().sn +// map["sn"] = "20220118J1V4G9W" map["mac"] = DeviceUtils.getMacAddress() +// map["mac"] = "48:b0:2d:3a:9d:34" map["channelVersion"] = FuncConfigConst.getChannelCode() +// map["channelVersion"] = 2 } loader { apiCall { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt index 95c72f7406..4bb2a24d01 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt @@ -12,10 +12,12 @@ import android.view.LayoutInflater import android.view.View import android.widget.ImageView import android.widget.LinearLayout +import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener +import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.function.hmi.R import java.lang.ref.WeakReference -class BatteryGroupView : LinearLayout { +class BatteryGroupView : LinearLayout, IMoGoSkinModeChangeListener { constructor( context: Context, @@ -29,6 +31,7 @@ class BatteryGroupView : LinearLayout { LayoutInflater.from(context).inflate(R.layout.view_battery_group, this, true) private var batteryView: BatteryView = (view as BatteryGroupView).findViewById(R.id.viewBattery) private var ivBatteryCharge: ImageView = (view as BatteryGroupView).findViewById(R.id.ivBatteryCharge) + private var mSkinMode = 0 private val batteryStateReceiver: BroadcastReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { @@ -49,6 +52,9 @@ class BatteryGroupView : LinearLayout { } companion object { + + const val TAG = "BatteryGroupView" + class BatteryHandler(batteryGroupView: BatteryGroupView) : Handler() { //虚引用 @@ -69,6 +75,10 @@ class BatteryGroupView : LinearLayout { it.batteryView.setCharging(isCharging) if (isCharging) { it.ivBatteryCharge.visibility = View.VISIBLE + when(it.mSkinMode){ + 0 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_light) + 1 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_dark) + } } else { it.ivBatteryCharge.visibility = View.GONE } @@ -83,10 +93,17 @@ class BatteryGroupView : LinearLayout { val intentFilter = IntentFilter() intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED) context.registerReceiver(batteryStateReceiver, intentFilter) + // 添加换肤监听 + CallerSkinModeListenerManager.addListener(TAG, this) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() context.unregisterReceiver(batteryStateReceiver) + CallerSkinModeListenerManager.removeListener(TAG) + } + + override fun onSkinModeChange(skinMode: Int) { + mSkinMode = skinMode } } \ 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/widget/WifiStateView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt index 5e45d6c065..c5c11e034a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt @@ -9,6 +9,8 @@ import android.os.Handler import android.os.Message import android.util.AttributeSet import androidx.appcompat.widget.AppCompatImageView +import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener +import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.function.hmi.R import java.lang.ref.WeakReference @@ -17,7 +19,7 @@ class WifiStateView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : AppCompatImageView(context, attrs, defStyleAttr) { +) : AppCompatImageView(context, attrs, defStyleAttr), IMoGoSkinModeChangeListener { companion object { const val TAG = "WifiStateView" @@ -34,15 +36,8 @@ class WifiStateView @JvmOverloads constructor( override fun handleMessage(msg: Message) { super.handleMessage(msg) val wifiStateView = stateViewWeakReference?.get() - wifiStateView?.let { - when (msg.what) { - -1 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_close) - 0 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_one) - 1 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_two) - 2 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_three) - 3 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_four) - 4 -> wifiStateView.setImageResource(R.drawable.wifi_light_state_five) - } + wifiStateView?.updateView(msg.what) { + wifiStateView.setImageResource(it) } } } @@ -51,6 +46,12 @@ class WifiStateView @JvmOverloads constructor( private var wifiManager: WifiManager? = null private var wifiHandler: WifiHandler? = null + @Volatile + private var mSkinMode: Int = 0 + + @Volatile + private var level: Int = 0 + init { wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager? @@ -62,12 +63,13 @@ class WifiStateView @JvmOverloads constructor( when (intent.action) { WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.RSSI_CHANGED_ACTION -> { if (wifiManager!!.wifiState == WifiManager.WIFI_STATE_DISABLED - || wifiManager!!.wifiState ==WifiManager.WIFI_STATE_DISABLING) { + || wifiManager!!.wifiState == WifiManager.WIFI_STATE_DISABLING + ) { wifiHandler?.sendEmptyMessage(-1) return } val wifiInfo = wifiManager!!.connectionInfo - val level = WifiManager.calculateSignalLevel(wifiInfo.rssi, 5) + level = WifiManager.calculateSignalLevel(wifiInfo.rssi, 5) wifiHandler?.sendEmptyMessage(level) } } @@ -82,11 +84,44 @@ class WifiStateView @JvmOverloads constructor( //Wifi信号强度变化 intentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION) context.registerReceiver(wifiStateReceiver, intentFilter) + // 添加换肤监听 + CallerSkinModeListenerManager.addListener(TAG, this) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() wifiHandler?.removeCallbacksAndMessages(null) context.unregisterReceiver(wifiStateReceiver) + CallerSkinModeListenerManager.removeListener(TAG) + } + + override fun onSkinModeChange(skinMode: Int) { + mSkinMode = skinMode + wifiHandler?.sendEmptyMessage(level) + } + + fun updateView(wifiState: Int, resId: ((Int) -> Unit)) { + when (mSkinMode) { + 0 -> { + when (wifiState) { + -1 -> resId.invoke(R.drawable.wifi_light_state_close) + 0 -> resId.invoke(R.drawable.wifi_light_state_one) + 1 -> resId.invoke(R.drawable.wifi_light_state_two) + 2 -> resId.invoke(R.drawable.wifi_light_state_three) + 3 -> resId.invoke(R.drawable.wifi_light_state_four) + 4 -> resId.invoke(R.drawable.wifi_light_state_five) + } + } + 1 -> { + when (wifiState) { + -1 -> resId.invoke(R.drawable.wifi_light_state_close) + 0 -> resId.invoke(R.drawable.wifi_dark_state_one) + 1 -> resId.invoke(R.drawable.wifi_dark_state_two) + 2 -> resId.invoke(R.drawable.wifi_dark_state_three) + 3 -> resId.invoke(R.drawable.wifi_dark_state_four) + 4 -> resId.invoke(R.drawable.wifi_dark_state_five) + } + } + } } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge_dark.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..02cea388b5cf2d22891563cb1a84c3a69a0eba3f GIT binary patch literal 640 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPE3kkW&K3hH+%4Jyw2kqVr;B5V zh2Yd+L;u?jB6aU`1Va?NW=uHc^!(P1loJkZJS&ufy;k=rh_R_nVO*JfMKF|yXKI9i zhX;>A$;wSm+qZPw;Pd#yAYj14%DH6Ok$w9%zbcrsUa8{4?(ciw|Gszkr{sd;>eEm2 zMy<16dTA!ti%&UbzaPCT|7~4hw&2=)6AiKMnf7yENEe()K4ufb8^HQxPk_dZv#)2{ z^6hasvfAxI?}^fl|K9UyP32PlI8ETVQcFmAqjX{5=d8Hx*DMdz1SR#njfstWqh2Yr z)q2CRxuHV(Dk_2#UzblX+Hmad`8m#!V%??j^B3A4TI{`LZs${tuCNe8r8(v``5{ML z@0o7MEjMKP7wWEb%|C6!(vY=>^OBi`&QGieHuITynSni}xaWwx#i3)yN0+3|@B6zr zSNNh0tMZx0hch3=1xnN|d^y|4eAz?C816lbf2{Ml|G#vRa^$w#{?1dh0vGT7ZoIVU z!S%;c--SY-N#D*CGShji^3U*B)|1?=QMu|nt~LDIH~sDJ4O1t$Eb*^QdJu5$^Edg2 zD;lC=JY`w-{F^O@S^t|n>xvEa-9{+hmc%nx=W7*o?2McZ; QXaU8(r>mdKI;Vst0M*n6kN^Mx literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge_light.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/battery_charge_light.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_dark_state_five.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/wifi_dark_state_five.png new file mode 100644 index 0000000000000000000000000000000000000000..35355cfe861297e302baec6f7d9d3a97c0cc7afd GIT binary patch literal 1819 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 O0000 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index efc745d957..3f24b715e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,8 +59,8 @@ bytex.ASM_API=ASM7 HOOK_LOG_VERSION=1.6.1 SERVICE_CHAIN_VERSION=1.1.0 -BIZCONFIG_VERSION=1.3.1 -SERVICE_BIZ_VERSION=1.2.3 +BIZCONFIG_VERSION=1.3.2 +SERVICE_BIZ_VERSION=1.2.4 ################ 外部依赖引用 ################ # loglib LOGLIB_VERSION=1.3.38