1、远程推送logo

2、远程修改休眠文字

buildSrc/src/main/kotlin/com/quyunshuo/sbm10/buildsrc/ProjectBuildConfig.kt

@@ -14,7 +14,7 @@ object ProjectBuildConfig {
     const val versionCode = 17
     const val versionName = "1.0.17"
     const val isAppMode = false
-    const val appVersion = 2
+    const val appVersion = 1  //国内外版本修改
 
     /**
      * 项目当前的版本状态

lib_base/src/main/res/values-aa/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">გთხოვთ, გადატვირთოთ სისტემა ფონზე</string>
     <string name="cannot_exceed_size">ხელმისაწვდომი დამატებების მიმდინარე რაოდენობა არ შეიძლება აღემატებოდეს</string>
     <string name="value_too_large_small">მოდიფიკაცია ვერ მოხერხდა. გთხოვთ, შეცვალოთ მიმდინარე დიაპაზონში.</string>
+    <string name="set_fail">მოდიფიკაცია ვერ მოხერხდა</string>
 
 </resources>
 <!--格鲁吉亚-->

lib_base/src/main/res/values-ab/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">請在後台重新開啟</string>
     <string name="cannot_exceed_size">目前可加數不能超過</string>
     <string name="value_too_large_small">修改失敗，請在目前區間內進行調整</string>
+    <string name="set_fail">修改失敗</string>
 
 </resources>
 <!--繁体-->

lib_base/src/main/res/values-am/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">لطفاً سیستم را در پس‌زمینه مجدداً راه‌اندازی کنید</string>
     <string name="cannot_exceed_size">تعداد فعلی موارد اضافه شده نمی‌تواند بیشتر از</string> باشد.
     <string name="value_too_large_small">اصلاح ناموفق بود. لطفاً در محدوده فعلی تنظیم کنید.</string>
+    <string name="set_fail">اصلاح ناموفق بود</string>
 
 </resources>
 <!--波斯语-->

lib_base/src/main/res/values-ar/strings.xml

@@ -315,6 +315,7 @@
     <string name="please_open_dev">يرجى إعادة تشغيل النظام في الخلفية</string>
     <string name="cannot_exceed_size">لا يمكن أن يتجاوز العدد الحالي للإضافات المتاحة</string>
     <string name="value_too_large_small">فشل التعديل. يُرجى التعديل ضمن النطاق الحالي.</string>
+    <string name="set_fail">فشل التعديل</string>
 
 </resources>
 <!--阿拉伯语-->

lib_base/src/main/res/values-bg/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Моля, рестартирайте системата във фонов режим.</string>
     <string name="cannot_exceed_size">Текущият брой налични допълнения не може да надвишава</string>
     <string name="value_too_large_small">Модификацията е неуспешна. Моля, коригирайте в рамките на текущия диапазон.</string>
+    <string name="set_fail">Модификацията е неуспешна</string>
 
 </resources>
 <!--保加利亚-->

lib_base/src/main/res/values-cs/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Prosím, restartujte systém na pozadí</string>
     <string name="cannot_exceed_size">Aktuální počet dostupných doplňků nemůže překročit</string>
     <string name="value_too_large_small">Úprava se nezdařila. Upravte prosím v rámci aktuálního rozsahu.</string>
+    <string name="set_fail">Úprava selhala</string>
 
 </resources>
 <!--捷克语-->

lib_base/src/main/res/values-da/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Genstart venligst systemet i baggrunden</string>
     <string name="cannot_exceed_size">Det nuværende antal tilgængelige tilføjelser må ikke overstige</string>
     <string name="value_too_large_small">Ændringen mislykkedes. Juster venligst inden for det aktuelle interval.</string>
+    <string name="set_fail">Ændring mislykkedes</string>
 
 </resources>
 <!--丹麦-->

lib_base/src/main/res/values-de/strings.xml

@@ -314,5 +314,6 @@
     <string name="please_open_dev">Bitte starten Sie das System im Hintergrund neu</string>
     <string name="cannot_exceed_size">Die aktuelle Anzahl verfügbarer Ergänzungen darf nicht überschreiten</string>
     <string name="value_too_large_small">Änderung fehlgeschlagen. Bitte innerhalb des aktuellen Bereichs anpassen</string>
+    <string name="set_fail">Änderung fehlgeschlagen</string>
 
 </resources><!--德语-->

lib_base/src/main/res/values-en/strings.xml

@@ -314,6 +314,7 @@
     <string name="please_open_dev">Please restart the system in the background</string>
     <string name="cannot_exceed_size">The current number of available additions cannot exceed</string>
     <string name="value_too_large_small">Modification failed. Please adjust within the current range.</string>
+    <string name="set_fail">Modification failed</string>
 
 </resources>
     <!--英语-->

lib_base/src/main/res/values-es/strings.xml

@@ -314,5 +314,6 @@
     <string name="please_open_dev">Reinicie el sistema en segundo plano</string>
     <string name="cannot_exceed_size">El número actual de adiciones disponibles no puede exceder</string>
     <string name="value_too_large_small">Error en la modificación. Por favor, ajuste dentro del rango actual.</string>
+    <string name="set_fail">Error en la modificación</string>
 
 </resources><!--西班牙语-->

lib_base/src/main/res/values-et/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Palun taaskäivitage süsteem taustal</string>
     <string name="cannot_exceed_size">Praegune saadaolevate lisanduste arv ei saa ületada</string>
     <string name="value_too_large_small">Muutmine ebaõnnestus. Palun kohandage praeguses vahemikus.</string>
+    <string name="set_fail">Muutmine ebaõnnestus</string>
 
 </resources>
 <!--爱沙尼亚语-->

lib_base/src/main/res/values-fi/strings.xml

@@ -314,5 +314,6 @@
     <string name="please_open_dev">Käynnistä taustajärjestelmä uudelleen</string>
     <string name="cannot_exceed_size">Käytettävissä olevien lisäysten nykyinen määrä ei voi ylittää</string>
     <string name="value_too_large_small">Muokkaus epäonnistui. Säädä nykyisen alueen sisällä.</string>
+    <string name="set_fail">Muokkaus epäonnistui</string>
 
 </resources><!--芬兰语-->

lib_base/src/main/res/values-fr/strings.xml

@@ -313,5 +313,6 @@
     <string name="please_open_dev">Veuillez redémarrer le système en arrière-plan</string>
     <string name="cannot_exceed_size">Le nombre actuel d`ajouts disponibles ne peut pas dépasser</string>
     <string name="value_too_large_small">Échec de la modification. Veuillez ajuster dans la plage actuelle.</string>
+    <string name="set_fail">Échec de la modification</string>
 
 </resources><!--法语-->

lib_base/src/main/res/values-hr/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Molimo vas da ponovno pokrenite sustav u pozadini</string>
     <string name="cannot_exceed_size">Trenutni broj dostupnih dodataka ne može premašiti</string>
     <string name="value_too_large_small">Izmjena nije uspjela. Molimo prilagodite unutar trenutnog raspona.</string>
+    <string name="set_fail">Izmjena nije uspjela</string>
 
 </resources>
 <!--克罗地亚语-->

lib_base/src/main/res/values-hu/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Indítsa újra a rendszert a háttérben</string>
     <string name="cannot_exceed_size">A jelenleg elérhető hozzáadások száma nem haladhatja meg a</string>
     <string name="value_too_large_small">A módosítás sikertelen. Kérjük, a jelenlegi tartományon belül módosítsa.</string>
+    <string name="set_fail">Módosítás sikertelen</string>
 
 </resources>
 <!--匈牙利语-->

lib_base/src/main/res/values-hy/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Խնդրում ենք վերագործարկել համակարգը ֆոնային ռեժիմում</string>
     <string name="cannot_exceed_size">Հասանելի լրացումների ներկայիս քանակը չի կարող գերազանցել</string>
     <string name="value_too_large_small">Փոփոխությունը ձախողվեց։ Խնդրում ենք կարգավորել ընթացիկ միջակայքում։</string>
+    <string name="set_fail">Փոփոխությունը ձախողվեց</string>
 
 </resources>
 <!--亚美尼亚语-->

lib_base/src/main/res/values-it/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Riavviare il sistema in background</string>
     <string name="cannot_exceed_size">Il numero attuale di aggiunte disponibili non può superare</string>
     <string name="value_too_large_small">Modifica non riuscita. Si prega di adattare il valore entro l`intervallo corrente.</string>
+    <string name="set_fail">Modifica non riuscita</string>
 
 </resources>
 <!--意大利-->

lib_base/src/main/res/values-ja/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">システムをバックグラウンドで再起動してください</string>
     <string name="cannot_exceed_size">現在追加可能な数はを超えることはできません</string>
     <string name="value_too_large_small">変更に失敗しました。現在の範囲内で調整してください。</string>
+    <string name="set_fail">変更に失敗しました</string>
 
 </resources>
 <!--日语-->

lib_base/src/main/res/values-ko/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">백그라운드에서 시스템을 다시 시작하세요.</string>
     <string name="cannot_exceed_size">현재 사용 가능한 추가 항목 수는 이 값을 초과할 수 없습니다.</string>
     <string name="value_too_large_small">수정에 실패했습니다. 현재 범위 내에서 조정해 주세요.</string>
+    <string name="set_fail">수정에 실패했습니다.</string>
 
 </resources>
 <!--韩语-->

lib_base/src/main/res/values-lv/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Lūdzu, restartējiet sistēmu fonā</string>
     <string name="cannot_exceed_size">Pašreiz pieejamo papildinājumu skaits nedrīkst pārsniegt</string>
     <string name="value_too_large_small">Modifikācija neizdevās. Lūdzu, pielāgojiet pašreizējā diapazonā.</string>
+    <string name="set_fail">Modifikācija neizdevās</string>
 
 </resources>
 <!--拉脱维亚语-->

lib_base/src/main/res/values-mn/strings.xml

@@ -313,5 +313,6 @@
     <string name="please_open_dev">Системийг арын дэвсгэр дээр дахин эхлүүлнэ үү</string>
     <string name = "cannot_exceed_size" >Одоо байгаа нэмэлтүүдийн тоо хэтэрч болохгүй</string>
     <string name="value_too_large_small">Өөрчлөлт амжилтгүй боллоо. Одоогийн мужид тохируулна уу.</string>
+    <string name="set_fail">Өөрчлөлт амжилтгүй болсон</string>
 
 </resources><!--蒙古语-->

lib_base/src/main/res/values-nl/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Start het systeem opnieuw op op de achtergrond</string>
     <string name="cannot_exceed_size">Het huidige aantal beschikbare toevoegingen mag niet groter zijn dan</string>
     <string name="value_too_large_small">Wijziging mislukt. Pas aan binnen het huidige bereik.</string>
+    <string name="set_fail">Wijziging mislukt</string>
 
 </resources>
 <!--荷兰语-->

lib_base/src/main/res/values-no/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Vennligst start systemet på nytt i bakgrunnen</string>
     <string name="cannot_exceed_size">Det nåværende antallet tilgjengelige tillegg kan ikke overstige</string>
     <string name="value_too_large_small">Endringen mislyktes. Vennligst juster innenfor gjeldende område.</string>
+    <string name="set_fail">Endringen mislyktes</string>
 
 </resources>
 <!--挪威语-->

lib_base/src/main/res/values-pl/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Uruchom ponownie system w tle</string>
     <string name="cannot_exceed_size">Aktualna liczba dostępnych dodatków nie może przekraczać</string>
     <string name="value_too_large_small">Modyfikacja nie powiodła się. Dostosuj w ramach bieżącego zakresu.</string>
+    <string name="set_fail">Modyfikacja nie powiodła się</string>
 
 </resources>
 <!--波兰语-->

lib_base/src/main/res/values-pt/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Reinicie o sistema em segundo plano</string>
     <string name="cannot_exceed_size">O número atual de adições disponíveis não pode exceder</string>
     <string name="value_too_large_small">Falha na modificação. Ajuste dentro do intervalo atual.</string>
+    <string name="set_fail">Falha na modificação</string>
 
 </resources>
 <!--葡萄牙语-->

lib_base/src/main/res/values-ro/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Vă rugăm să reporniți sistemul în fundal</string>
     <string name="cannot_exceed_size">Numărul curent de adăugări disponibile nu poate depăși</string>
     <string name="value_too_large_small">Modificarea a eșuat. Vă rugăm să ajustați în intervalul curent.</string>
+    <string name="set_fail">Modificarea a eșuat</string>
 
 </resources>
 <!--罗马尼亚语-->

lib_base/src/main/res/values-ru/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Пожалуйста, перезапустите систему в фоновом режиме</string>
     <string name="cannot_exceed_size">Текущее количество доступных добавлений не может превышать</string>
     <string name="value_too_large_small">Ошибка изменения. Пожалуйста, внесите изменения в пределах текущего диапазона.</string>
+    <string name="set_fail">Ошибка модификации</string>
 
 </resources>
 <!--俄语-->

lib_base/src/main/res/values-sk/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Prosím, reštartujte systém na pozadí</string>
     <string name="cannot_exceed_size">Aktuálny počet dostupných doplnkov nemôže prekročiť</string>
     <string name="value_too_large_small">Úprava zlyhala. Upravte v rámci aktuálneho rozsahu.</string>
+    <string name="set_fail">Úprava zlyhala</string>
 
 </resources>
 <!--斯洛伐克语-->

lib_base/src/main/res/values-sl/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Prosimo, ponovno zaženite sistem v ozadju</string>
     <string name="cannot_exceed_size">Trenutno število razpoložljivih dodatkov ne sme presegati</string>
     <string name="value_too_large_small">Sprememba ni uspela. Prilagodite znotraj trenutnega obsega.</string>
+    <string name="set_fail">Sprememba ni uspela</string>
 
 </resources>
 <!--斯洛文尼亚语-->

lib_base/src/main/res/values-sq/strings.xml

@@ -313,5 +313,6 @@
     <string name="please_open_dev">אנא הפעל מחדש את המערכת ברקע</string>
     <string name="cannot_exceed_size">מספר התוספות הזמינות הנוכחי אינו יכול לעלות על</string>
     <string name="value_too_large_small">השינוי נכשל. אנא התאם את הטווח הנוכחי.</string>
+    <string name="set_fail">השינוי נכשל</string>
 
-    </resources><!--希伯来语 以色列-->
+</resources><!--希伯来语 以色列-->

lib_base/src/main/res/values-sv/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Starta om systemet i bakgrunden</string>
     <string name="cannot_exceed_size">Det nuvarande antalet tillgängliga tillägg får inte överstiga</string>
     <string name="value_too_large_small">Ändringen misslyckades. Vänligen justera inom det aktuella intervallet.</string>
+    <string name="set_fail">Ändringen misslyckades</string>
 
 </resources>
 <!--瑞典语-->

lib_base/src/main/res/values-th/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">กรุณารีสตาร์ทระบบในพื้นหลัง</string>
     <string name="cannot_exceed_size">จำนวนการเพิ่มที่มีอยู่ในปัจจุบันต้องไม่เกิน</string>
     <string name="value_too_large_small">การแก้ไขล้มเหลว โปรดปรับภายในช่วงปัจจุบัน</string>
+    <string name="set_fail">การแก้ไขล้มเหลว</string>
 
 </resources>
 <!--泰语-->

lib_base/src/main/res/values-tn/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Molimo vas da ponovo pokrenite sistem u pozadini</string>
     <string name="cannot_exceed_size">Trenutni broj dostupnih dodataka ne može premašiti</string>
     <string name="value_too_large_small">Izmjena nije uspjela. Molimo vas da prilagodite unutar trenutnog raspona.</string>
+    <string name="set_fail">Modifikacija nije uspjela</string>
 
 </resources>
 <!--波斯尼亚语-->

lib_base/src/main/res/values-tr/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Lütfen sistemi arka planda yeniden başlatın</string>
     <string name="cannot_exceed_size">Mevcut ekleme sayısı aşılamaz</string>
     <string name="value_too_large_small">Değişiklik başarısız oldu. Lütfen mevcut aralıkta ayarlayın.</string>
+    <string name="set_fail">Değişiklik başarısız oldu</string>
 
 </resources>
 <!--土耳其语-->

lib_base/src/main/res/values-uk/strings.xml

@@ -313,6 +313,7 @@
     <string name="please_open_dev">Будь ласка, перезавантажте систему у фоновому режимі</string>
     <string name="cannot_exceed_size">Поточна кількість доступних доповнень не може перевищувати</string>
     <string name="value_too_large_small">Модифікація не вдалася. Будь ласка, внесіть зміни в межах поточного діапазону.</string>
+    <string name="set_fail">Модифікація не вдалася</string>
 
 </resources>
 <!--乌克兰语-->

lib_base/src/main/res/values/strings.xml

@@ -246,7 +246,7 @@
     <string name="close">关闭</string>
     <string name="turn_on_sleep">开启休眠</string>
     <string name="turn_off_sleep">关闭休眠</string>
-    <string name="device_sleep">设备休眠中</string>
+    <string name="device_sleep">暂停营业</string>
     <string name="contact_details">联系\n方式</string>
     <string name="custom_name">可自定义名字</string>
     <string name="no_sales_data">这个时间段没有销售数据</string>
@@ -313,6 +313,7 @@
     <string name="please_open_dev">请在后台重新开机</string>
     <string name="cannot_exceed_size">当前可添加数量不能超过</string>
     <string name="value_too_large_small">修改失败，请在当前区间内进行调整</string>
+    <string name="set_fail">修改失败</string>
 
 </resources>
 <!--中文-->

lib_common/src/main/java/com/quyunshuo/sbm10/common/constant/MMKVName.kt

@@ -4,13 +4,14 @@ import android.graphics.Typeface
 import android.os.Build
 import com.google.gson.Gson
 import com.quyunshuo.sbm10.base.BaseApplication
+import com.quyunshuo.sbm10.base.BuildConfig
 import com.quyunshuo.sbm10.base.utils.SpUtils
 
 abstract class MMKVName {
 
     companion object {
 
-//        var APP_VERSION: Int = 2 //区分国内外版本   国内1，国外2
+        var APP_VERSION: Int = BuildConfig.APP_VERSION //区分国内外版本   国内1，国外2
 
         val PAY_TYPE: String
             get() = "PAY_TYPE"//支付方式
@@ -117,7 +118,7 @@ abstract class MMKVName {
             //休眠中文本
             get() = "SLEEP_TEXT"
         val LOGO_TEXT: String
-            //休眠中文本
+            //logo编号
             get() = "LOGO_TEXT"
         val BILL_COUNTRY: String
             //国家纸币选择
@@ -250,6 +251,10 @@ abstract class MMKVName {
             //上传 密码
             get() = "PASSWORD"
 
+        val WAY: String
+            //上传 联系方式
+            get() = "way"
+
     }
     // 这里可以继续添加其他常量
 

lib_common/src/main/java/com/quyunshuo/sbm10/common/constant/MqName.kt

@@ -6,7 +6,7 @@ package com.quyunshuo.sbm10.common.constant
 object MqName {
     val TUO_JI = "tuoji"
     val RESTART_ANDROID="restartAndroid"//重启android
-    val UPDATE_LOGO="updateLogo"//修改logo
+    val UPDATELOGO="updateLogo"//修改logo
     val VOLUME ="volume"//音量调节
     var UPDATE_PRODUCTS_SHOW = "updateProductsShow"//显示花型
     var PAY_SUCCESS = "pay_success"//收到支付成功
@@ -53,4 +53,9 @@ object MqName {
      */
     var OPENDOOR= "openDoor"
 
+    /**
+     * 修改休眠显示文本
+     */
+    var SLEEPDESC= "sleepDesc"
+
 }

module_backstage/src/main/java/com/module/backstage/activity/setting/SettingRepository.kt

@@ -64,7 +64,7 @@ class SettingRepository @Inject constructor() : BaseRepository() {
      */
     suspend fun apkinfo() = request<String> {
         var params = HashMap<String, String>()
-        if (BuildConfig.APP_VERSION==1){
+        if (MMKVName.APP_VERSION==1){
             params["model"] = "SBM10ch"
         }else{
             params["model"] = "SBM10en"

module_backstage/src/main/java/com/module/backstage/adapter/PayAdapter.kt

@@ -33,7 +33,7 @@ class PayAdapter(var productList: MutableList<PayEnum>) :
                 object : TypeToken<HashMap<String, PayTypeBean>?>() {}.type
             )
         }else{
-            if (BuildConfig.APP_VERSION==1) {
+            if (MMKVName.APP_VERSION==1) {
                 arrayListState[PayEnum.TWO_CODE.code] = PayTypeBean(PayEnum.TWO_CODE.code,true)
             }else{
                 arrayListState[PayEnum.BILL_COIN.code] = PayTypeBean(PayEnum.BILL_COIN.code,true)

module_backstage/src/main/java/com/module/backstage/adapter/TestAdapter.kt

@@ -33,9 +33,12 @@ import com.module.pay.common.OtherEnum
 import com.quyunshuo.sbm10.base.utils.SpUtils
 import com.quyunshuo.sbm10.base.utils.XLogUtil
 import com.quyunshuo.sbm10.common.constant.MMKVName
+import com.quyunshuo.sbm10.common.constant.MqName
+import com.quyunshuo.sbm10.common.constant.event.ApiMessageEvent
 import com.quyunshuo.sbm10.common.listener.AdapterClickListener
 import com.quyunshuo.sbm10.common.util.ToastUtil
 import com.quyunshuo.sbm10.common.util.UiUtil
+import org.greenrobot.eventbus.EventBus
 
 
 class TestAdapter(var productList: MutableList<OtherEnum>) :
@@ -258,70 +261,82 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                 }
 
                 override fun onBind(holder: SliderVH, position: Int, item: OtherEnum?) {
-                        // 绑定 item 数据
-                        val audioManager =
-                            context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-                        itemListener?.onClickListener(holder.itemView, position, null)
-                        holder.viewBinding.run {
-                            tvName.text = UiUtil.getStringRes(item!!.nameId)
-                            when (item.mmkvName) {
-                                MMKVName.VOLUME -> {
-                                    XLogUtil.d(
-                                        "音量:" + audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) + ":" + audioManager.getStreamVolume(
-                                            AudioManager.STREAM_MUSIC
-                                        )
+                    // 绑定 item 数据
+                    val audioManager =
+                        context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+                    itemListener?.onClickListener(holder.itemView, position, null)
+                    holder.viewBinding.run {
+                        tvName.text = UiUtil.getStringRes(item!!.nameId)
+                        when (item.mmkvName) {
+                            MMKVName.VOLUME -> {
+                                XLogUtil.d(
+                                    "音量:" + audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) + ":" + audioManager.getStreamVolume(
+                                        AudioManager.STREAM_MUSIC
                                     )
-                                    sbLight.max =
-                                        audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-                                    sbLight.progress =
-                                        audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-                                }
-                                MMKVName.LUMINANCE -> {
-                                    sbLight.max =
-                                        ZtlManager.GetInstance().systemMaxBrightness //maxBrightness 为 Android 系统最大亮度
+                                )
+                                sbLight.max =
+                                    audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+                                sbLight.progress =
+                                    audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                            }
+
+                            MMKVName.LUMINANCE -> {
+                                sbLight.max =
+                                    ZtlManager.GetInstance().systemMaxBrightness //maxBrightness 为 Android 系统最大亮度
 //                                    if (Build.MODEL.equals("rk3566_r")) {
 //                                        val mManager =
 //                                            context.getSystemService("xzjh_server") as XzjhSystemManager
 //                                        sbLight.progress = mManager.xzjhGetBacklight()
 //                                    }else{
-                                        sbLight.progress =
-                                            Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)
+                                sbLight.progress =
+                                    Settings.System.getInt(
+                                        context.contentResolver,
+                                        Settings.System.SCREEN_BRIGHTNESS
+                                    )
 //                                    }
-                                    XLogUtil.d("亮度:" + ZtlManager.GetInstance().systemMaxBrightness + ":" + sbLight.progress)
-                                }
+                                XLogUtil.d("亮度:" + ZtlManager.GetInstance().systemMaxBrightness + ":" + sbLight.progress)
                             }
-                            sbLight.setOnSeekBarChangeListener(object :
-                                SeekBar.OnSeekBarChangeListener {
-                                override fun onProgressChanged(
-                                    seekBar: SeekBar?,
-                                    progress: Int,
-                                    fromUser: Boolean,
-                                ) {
-                                    //设置进度
-                                    setPro(seekBar, progress);
-                                }
-                                private fun setPro(seekBar: SeekBar?, progress: Int) {
-                                    when (item.mmkvName) {
-                                        MMKVName.VOLUME -> {
-                                            //设置 Android 系统媒体音量值为 10
-                                            audioManager.setStreamVolume(
-                                                AudioManager.STREAM_MUSIC,
-                                                progress,
-                                                AudioManager.FLAG_SHOW_UI
-                                            )
-                                        }
-                                        MMKVName.LUMINANCE -> {
-                                            //设置 Android 系统亮度为 200
-                                                Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, progress);
-                                        }
+                        }
+                        sbLight.setOnSeekBarChangeListener(object :
+                            SeekBar.OnSeekBarChangeListener {
+                            override fun onProgressChanged(
+                                seekBar: SeekBar?,
+                                progress: Int,
+                                fromUser: Boolean,
+                            ) {
+                                //设置进度
+                                setPro(seekBar, progress);
+                            }
+
+                            private fun setPro(seekBar: SeekBar?, progress: Int) {
+                                when (item.mmkvName) {
+                                    MMKVName.VOLUME -> {
+                                        //设置 Android 系统媒体音量值为 10
+                                        audioManager.setStreamVolume(
+                                            AudioManager.STREAM_MUSIC,
+                                            progress,
+                                            AudioManager.FLAG_SHOW_UI
+                                        )
+                                    }
+
+                                    MMKVName.LUMINANCE -> {
+                                        //设置 Android 系统亮度为 200
+                                        Settings.System.putInt(
+                                            context.contentResolver,
+                                            Settings.System.SCREEN_BRIGHTNESS,
+                                            progress
+                                        );
                                     }
                                 }
-                                override fun onStartTrackingTouch(seekBar: SeekBar?) {
-                                }
-                                override fun onStopTrackingTouch(seekBar: SeekBar?) {
-                                }
-                            });
-                        }
+                            }
+
+                            override fun onStartTrackingTouch(seekBar: SeekBar?) {
+                            }
+
+                            override fun onStopTrackingTouch(seekBar: SeekBar?) {
+                            }
+                        });
+                    }
                 }
 
                 override fun isFullSpanItem(itemType: Int): Boolean {
@@ -453,6 +468,17 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                                 return@setOnClickListener
                             }
                             SpUtils.putString(item.mmkvName, value)
+                            when (item.mmkvName) {
+                                MMKVName.CONTACT, MMKVName.CONTACT_WAY -> {
+                                    EventBus.getDefault()
+                                        .post(ApiMessageEvent(MMKVName.WAY, ""))
+                                }
+                                MMKVName.SLEEP_TEXT->{
+                                    EventBus.getDefault()
+                                        .post(ApiMessageEvent(MMKVName.SLEEP_TEXT, ""))
+                                }
+                                else -> {}
+                            }
                             ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.modific_success) + item.mmkvName)
                         }
                     }

module_backstage/src/main/java/com/module/backstage/fragment/PayFragment.kt

@@ -61,7 +61,7 @@ class PayFragment : BaseFragment<BackstageFragmentPayBinding, PayFragmentVM>() {
                 Gson().toJson(priceAdapter?.arrayListState),
                 object : TypeToken<MutableMap<String, Map<String, Any>>>() {}.type
             )
-            if (BuildConfig.APP_VERSION == 2) {
+            if (MMKVName.APP_VERSION == 2) {
                 // 将 arrayListState 从 JSON 字符串转换为 Map
                 payTypeMap.remove("TwoCode")
                 // 保存修改后的数据

module_backstage/src/main/java/com/module/backstage/fragment/ResetPwdFragment.kt

@@ -53,24 +53,23 @@ class ResetPwdFragment : BaseFragment<BackstageFragmentResetPwdBinding, ResetPwd
                 val passWord = SpUtils.getString(MqName.ADMIN_PWD, "123456").toString()
                 if (mBinding.backstageEdittext3.text.toString().trim()==passWord) {
                     if (mBinding.backstageEdittext.text.toString().trim() == mBinding.backstageEdittext2.text.toString().trim()) {
-                        val responseContent = hashMapOf(
-                            "type" to 0,
-                             "password" to mBinding.backstageEdittext.text.toString().trim()
-                        )
-                        EventBus.getDefault().post(ApiMessageEvent(MMKVName.PASSWORD,responseContent))
                         SpUtils.putString(MqName.ADMIN_PWD,mBinding.backstageEdittext.text.toString().trim())
+                        EventBus.getDefault().post(ApiMessageEvent(MMKVName.PASSWORD,""))
+                        mBinding.backstageEdittext.setText("")
+                        mBinding.backstageEdittext2.setText("")
+                        mBinding.backstageEdittext3.setText("")
                         ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.modific_success))
                     } else {
                         mBinding.backstageEdittext.setText("")
                         mBinding.backstageEdittext2.setText("")
                         mBinding.backstageEdittext3.setText("")
-                        ToastUtil.switchToastStyleToError(UiUtil.getStringRes(R.string.init_fail))
+                        ToastUtil.switchToastStyleToError(UiUtil.getStringRes(R.string.set_fail))
                     }
                 } else {
                     mBinding.backstageEdittext.setText("")
                     mBinding.backstageEdittext2.setText("")
                     mBinding.backstageEdittext3.setText("")
-                    ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.init_fail))
+                    ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.set_fail))
                 }
             }
             mBinding.homeReturnToUpperLevel.id -> {
@@ -78,7 +77,6 @@ class ResetPwdFragment : BaseFragment<BackstageFragmentResetPwdBinding, ResetPwd
                 mBinding.backstageEdittext2.setText("")
                 mBinding.backstageEdittext3.setText("")
             }
-
         }
     }
 

module_backstage/src/main/java/com/module/backstage/vm/PayFragmentVM.kt

@@ -53,7 +53,7 @@ class PayFragmentVM @Inject constructor(private val mRepo: PayFragmentRepo) : Ba
     }
 
     fun getPayData(): MutableList<PayEnum> {
-        if (BuildConfig.APP_VERSION==1){
+        if (MMKVName.APP_VERSION==1){
             return mRepo.arrayList1
         }else{
             return mRepo.arrayList

module_home/src/main/java/com/quyunshuo/module/home/dialog/PayChooseDialogFragment.kt

@@ -93,7 +93,7 @@ class PayChooseDialogFragment :
                     object : TypeToken<HashMap<String, PayTypeBean>?>() {}.type
                 )
             } else {
-                if (BuildConfig.APP_VERSION==1) {
+                if (MMKVName.APP_VERSION==1) {
                     arrayListState[PayEnum.TWO_CODE.code] = PayTypeBean(PayEnum.TWO_CODE.code, true)
                 } else {
                     arrayListState[PayEnum.BILL_COIN.code] = PayTypeBean(PayEnum.BILL_COIN.code, true)

module_home/src/main/java/com/quyunshuo/module/home/enums/LogoEnum.kt

@@ -15,13 +15,13 @@ enum class LogoEnum(val code:String, val navId:Int,val width:Int,val height:Int)
     NO_LOGO("0000", R.drawable.logo_sevencloud,0,0);
 
     companion object {
-        fun getEnumByValue(code: String): LogoEnum? {
+        fun getEnumByValue(code: String): LogoEnum {
             for (anEnum in LogoEnum.values()) {
                 if (anEnum.code == code) {
                     return anEnum
                 }
             }
-            return null
+            return SEVEN_CLOUD_LOGO
         }
     }
 }

module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/HomeFragment.kt

@@ -338,7 +338,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
 //            showTipsDialog("价格低于0元,不能购买")
 //            return true
 //        }
-            if (product?.price!! <= 0 && BuildConfig.APP_VERSION==1) {
+            if (product?.price!! <= 0 && MMKVName.APP_VERSION==1) {
             showTipsDialog("价格低于0元,不能购买")
             return true
         }

module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/SleepFragment.kt

@@ -8,6 +8,8 @@ import android.widget.ArrayAdapter
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.alibaba.android.arouter.launcher.ARouter
+import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.quyunshuo.sbm10.base.ktx.observeLiveData
 import com.quyunshuo.sbm10.base.utils.SpUtils
 import com.quyunshuo.sbm10.common.constant.MMKVName
@@ -23,7 +25,12 @@ import com.quyunshuo.module.home.enums.LogoEnum
 import com.quyunshuo.module.home.fragment.vm.SleepFragmentVM
 import com.quyunshuo.module.home.fragment.vm.UserLoginFragmentVM
 import com.quyunshuo.module.home.model.livedata.LiveDataBean
+import com.quyunshuo.sbm10.base.utils.RegisterEventBus
+import com.quyunshuo.sbm10.common.constant.MqName
+import com.quyunshuo.sbm10.common.constant.event.ApiMessageEvent
 import dagger.hilt.android.AndroidEntryPoint
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 
 
 /**
@@ -32,12 +39,15 @@ import dagger.hilt.android.AndroidEntryPoint
  * @author Qu Yunshuo
  * @since 2021/8/1 11:46 下午
  */
+
+@RegisterEventBus
 @AndroidEntryPoint
 class SleepFragment : BaseFragment<HomeFragmentSleepBlockBinding, SleepFragmentVM>(){
     private val TAG = "SleepFragment"
 
     override val mViewModel: SleepFragmentVM by viewModels()
     override fun createVB() = HomeFragmentSleepBlockBinding.inflate(layoutInflater)
+    private val sleepText = SpUtils.getString(MMKVName.SLEEP_TEXT, UiUtil.getStringRes(R.string.device_sleep))
 
     override fun HomeFragmentSleepBlockBinding.initView() {
         //1. 设置屏幕显示的文本
@@ -45,7 +55,7 @@ class SleepFragment : BaseFragment<HomeFragmentSleepBlockBinding, SleepFragmentV
         SpUtils.putBoolean(MMKVName.SLEEP,true)
         //3. 上传状态到后台
 
-        LongClickUtils.setLongClick(Handler(),mBinding.ivLogo,5000,object :View.OnLongClickListener{
+        LongClickUtils.setLongClick(Handler(),mBinding.rlLogo,5000,object :View.OnLongClickListener{
             override fun onLongClick(v: View?): Boolean {
                 val findNavController = findNavController()
                 findNavController.navigate(R.id.home_action_home_sleepfragment_to_home_buyfragment)
@@ -59,6 +69,17 @@ class SleepFragment : BaseFragment<HomeFragmentSleepBlockBinding, SleepFragmentV
         enumByValue?.navId?.let { ivLogo.setImageResource(it) }
         enumByValue?.width?.let { layoutParams.width = it }
         enumByValue?.height?.let { layoutParams.height = it }
+        mBinding.tvTitle.text = sleepText
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun event(messageEvent: ApiMessageEvent) {
+        when (messageEvent.name) {
+            MMKVName.SLEEP_TEXT -> {
+                mBinding.tvTitle.text = messageEvent.data.toString()
+                Log.d(TAG, "eventSLEEP_TEXT: "+messageEvent.data.toString())
+            }
+        }
     }
 
     override fun initObserve() {

module_home/src/main/java/com/quyunshuo/module/home/service/GlobalService.kt

@@ -495,6 +495,26 @@ class GlobalService : LifecycleService() {
                     )
                 mqttHelper.sendData("response", Gson().toJson(messageEvent.data))
             }
+
+            MqName.PHONE->{
+                val map = Gson().fromJson(messageEvent.data.toString(), JsonObject::class.java)
+                val response= map.getAsJsonObject("responseContent")
+                val contactName = GsonUtil.getAsString(response,"contactName","")
+                val contactPhone = GsonUtil.getAsString(response,"contactPhone","")
+                SpUtils.putString(MMKVName.CONTACT,contactName)
+                SpUtils.putString(MMKVName.CONTACT_WAY,contactPhone)
+                mqttHelper.sendData("response", Gson().toJson(messageEvent.data))
+            }
+
+            MqName.SLEEPDESC->{
+                val map = Gson().fromJson(messageEvent.data.toString(), JsonObject::class.java)
+                val responseContent= map.getAsJsonObject("responseContent")
+                val sleepDesc = GsonUtil.getAsString(responseContent,"sleepDesc",UiUtil.getStringRes(R.string.device_sleep))
+                SpUtils.putString(MMKVName.SLEEP_TEXT,sleepDesc)
+                EventBus.getDefault().post(ApiMessageEvent(MMKVName.SLEEP_TEXT,sleepDesc))
+                Log.d(TAG, "eventqName.SLEEPDESC: "+messageEvent.data)
+                mqttHelper.sendData("response", Gson().toJson(messageEvent.data))
+            }
         }
     }
 

module_home/src/main/java/com/quyunshuo/module/home/service/MqService.kt

@@ -20,6 +20,7 @@ import com.quyunshuo.module.home.R
 import com.quyunshuo.module.home.receiver.MqttHelper
 import com.quyunshuo.sbm10.base.bean.HeartbeatBean
 import com.quyunshuo.sbm10.base.constant.SavaAddress
+import com.quyunshuo.sbm10.base.utils.GsonUtil
 import com.quyunshuo.sbm10.base.utils.SpUtils
 import com.quyunshuo.sbm10.base.utils.TimeUtil
 import com.quyunshuo.sbm10.base.utils.XLogUtil
@@ -36,6 +37,7 @@ import com.rabbitmq.client.Connection
 import com.rabbitmq.client.ConnectionFactory
 import com.rabbitmq.client.DefaultConsumer
 import com.rabbitmq.client.Envelope
+import com.tencent.mmkv.MMKV
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -229,7 +231,12 @@ class MqService : Service() {
             }
 
             MMKVName.PASSWORD -> {
-                val map = setMap(data.toString(), "password")
+                val password =  SpUtils.getString(MqName.ADMIN_PWD,"123456")
+                val responseContent = hashMapOf(
+                    "type" to 0,
+                    "password" to password
+                )
+                val map = setMap(responseContent, "password")
                 mqttHelper.sendData("response", Gson().toJson(map))
             }
 
@@ -251,6 +258,24 @@ class MqService : Service() {
                 val map = setMap(responseContent, "eqeStatus")
                 mqttHelper.sendData("response", Gson().toJson(map))
             }
+            MMKVName.WAY -> {
+                val contactName = SpUtils.getString(MMKVName.CONTACT, "name")
+                val contactPhone = SpUtils.getString(MMKVName.CONTACT_WAY, "123456")
+                val responseContent = hashMapOf(
+                    "contactName" to contactName,
+                    "contactPhone" to contactPhone
+                )
+                val map = setMap(responseContent, "phone")
+                mqttHelper.sendData("response", Gson().toJson(map))
+            }
+            MMKVName.SLEEP_TEXT ->{
+                val sleepDesc = SpUtils.getString(MMKVName.SLEEP_TEXT,UiUtil.getStringRes(R.string.device_sleep))
+                val responseContent = hashMapOf(
+                    "sleepDesc" to sleepDesc
+                )
+                val map = setMap(responseContent, "sleepDesc")
+                mqttHelper.sendData("response", Gson().toJson(map))
+            }
         }
     }
 
@@ -263,6 +288,7 @@ class MqService : Service() {
             "timestamp" to System.currentTimeMillis(),
             "direction" to 2
         )
+        Log.d(TAG, "setMap.map: "+map)
         return map
     }
 

module_home/src/main/java/com/quyunshuo/module/home/utils/RemotePushUtil.kt

@@ -10,7 +10,6 @@ import android.util.Log
 import com.google.gson.Gson
 import com.hboxs.serialport.plc.message.Message
 import com.hboxs.serialport.plc.thread.ThreadSettingParam
-import com.hboxs.serialport.sbc.VBoxMessage
 import com.hboxs.serialport.sbc.VboxSerialPortSendQueue
 import com.hboxs.serialport.sbc.frame.VboxCommand
 import com.hboxs.serialport.sbc.frame.VboxWriteCommand
@@ -26,7 +25,6 @@ import com.quyunshuo.module.home.getui.MqttBaseBean
 import com.quyunshuo.sbm10.base.BaseApplication
 import com.quyunshuo.sbm10.base.BaseApplication.Companion.context
 import com.quyunshuo.sbm10.base.addressenum.PlcSettingAddressEnum
-import com.quyunshuo.sbm10.base.utils.GsonUtil
 import com.quyunshuo.sbm10.base.utils.JsonUtils
 import com.quyunshuo.sbm10.base.utils.SpUtils
 import com.quyunshuo.sbm10.base.utils.XLogUtil
@@ -165,7 +163,7 @@ class RemotePushUtil @Inject constructor() {
                 setVolume(baseBean.kind_data)
             }
 
-            MqName.UPDATE_LOGO -> {
+            MqName.UPDATELOGO -> {
                 SpUtils.putString(kind, baseBean.kind_data)
             }
 
@@ -287,10 +285,32 @@ class RemotePushUtil @Inject constructor() {
                 val map =setMap(msgId,DataBean.kind_data)
                 EventBus.getDefault().post(ApiMessageEvent(MqName.OPENDOOR, map))
             }
+            MqName.PHONE->{
+                val map =setMap(msgId,DataBean.kind_data)
+                EventBus.getDefault().post(ApiMessageEvent(MqName.PHONE, map))
+            }
+            MqName.SLEEPDESC->{
+                val responseContent = hashMapOf(
+                    "sleepDesc" to DataBean.kind_data
+                )
+                val map =setMap(msgId,responseContent)
+                EventBus.getDefault().post(ApiMessageEvent(MqName.SLEEPDESC, map))
+            }
+
+            MqName.UPDATELOGO->{
+                val data = DataBean.kind_data
+                val logo: String
+                if (data=="0000"||data=="1"||data=="2"||data=="7777"){
+                    logo = data
+                }else{
+                    logo = SpUtils.getString(MMKVName.LOGO_TEXT,"7777").toString()
+                }
+                SpUtils.putString(MMKVName.LOGO_TEXT,logo)
+            }
         }
     }
 
-    private fun setMap(msgId:String,response:String): HashMap<String, *> {
+    private fun setMap(msgId:String,response:Any): HashMap<String, *> {
         val map = hashMapOf(
             "clientId" to Heartbeat.deviceId,
             "responseContent" to response,

module_home/src/main/res/layout/home_fragment_sleep_block.xml

@@ -26,14 +26,20 @@
 <!--        app:layout_constraintStart_toStartOf="parent"-->
 <!--        app:layout_constraintTop_toTopOf="parent" />-->
 
+    <RelativeLayout
+        android:id="@+id/rl_logo"
+        android:layout_width="450dp"
+        android:layout_height="250dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
     <ImageView
         android:id="@+id/iv_logo"
         android:layout_width="350dp"
         android:layout_height="150dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
-        android:src="@drawable/logo_sevencloud"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:src="@drawable/logo_sevencloud" />
+    </RelativeLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>