Эх сурвалжийг харах

1. 适配高版本通知图标

bjb 1 сар өмнө
parent
commit
116f411c19
23 өөрчлөгдсөн 13 нэмэгдсэн , 5 устгасан
  1. 2 2
      .idea/deploymentTargetSelector.xml
  2. BIN
      app/src/main/ic_launcher-playstore.png
  3. 2 0
      app/src/main/java/com/iscs/bozzys/ui/pages/PageSplash.kt
  4. 1 1
      app/src/main/java/com/iscs/bozzys/utils/ble/BleManager.kt
  5. 2 1
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  6. 2 1
      app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  7. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.webp
  8. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
  9. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
  10. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.webp
  11. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
  12. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
  13. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.webp
  14. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
  15. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
  16. BIN
      app/src/main/res/mipmap-xhdpi/notification_logo.png
  17. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
  18. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
  19. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
  20. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
  21. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
  22. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
  23. 4 0
      app/src/main/res/values/ic_launcher_background.xml

+ 2 - 2
.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-04-03T02:52:14.703411900Z">
+        <DropdownSelection timestamp="2026-04-15T08:13:53.576384800Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=UKCYRG8TY9UGVS4D" />
+              <DeviceId pluginId="Default" identifier="serial=192.168.43.108:5555;connection=538d4b26" />
             </handle>
           </Target>
         </DropdownSelection>

BIN
app/src/main/ic_launcher-playstore.png


+ 2 - 0
app/src/main/java/com/iscs/bozzys/ui/pages/PageSplash.kt

@@ -82,6 +82,8 @@ class PageSplash : PageBase() {
         pushService.setLogLevel(CloudPushService.LOG_OFF)
         // 设置消息服务
         pushService.setPushIntentService(AliPushService::class.java)
+        // 设置消息推送的图标
+        pushService.setNotificationSmallIcon(R.mipmap.notification_logo)
         // 初始化消息推送
         pushService.register(this, object : CommonCallback {
 

+ 1 - 1
app/src/main/java/com/iscs/bozzys/utils/ble/BleManager.kt

@@ -224,7 +224,7 @@ class BleManager(
 
                 override fun onCharacteristicChanged(gatt: BluetoothGatt?, characteristic: BluetoothGattCharacteristic?) {
                     super.onCharacteristicChanged(gatt, characteristic)
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) return
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) return
                     LogUtil.w(TAG, "gattCallback <--- ${characteristic?.value?.byteArrayToHexString(" ")}")
                     val data = characteristic?.value ?: byteArrayOf()
                     var key = ""

+ 2 - 1
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

+ 2 - 1
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp


BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp


BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp


BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp


BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp


BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp


BIN
app/src/main/res/mipmap-xhdpi/notification_logo.png


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp


+ 4 - 0
app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>