1、脱机优化

2、接口地址优化

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

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

lib_base/src/main/java/com/quyunshuo/sbm10/base/addressenum/PlcParamAddressEnum.kt

@@ -2,7 +2,7 @@ package com.quyunshuo.sbm10.base.addressenum
 
 import com.quyunshuo.sbm10.base.R
 
-
+//参数上下限
 enum class PlcParamAddressEnum(val address: String, val aName: String,val aNameId:Int,val lowerLimit:String,val upperLimit:String) {
     Param01("01", "气泵低速", R.string.base_plc_param_1,"15","100"),
     Param02("02", "气泵中速",R.string.base_plc_param_2,"15","100"),

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

@@ -70,6 +70,10 @@ object MqName {
      * 订单上传成功
      */
     var UPLOADORDER= "uploadOrder"
+
+    /**
+     * 脱机
+     */
     val DIVORCE_SYSTEM = "divorce_system"
 
 }

module_pay/src/main/java/com/module/pay/base/DIHomeNetServiceModule.kt

@@ -1,5 +1,8 @@
 package com.module.pay.base
 
+import com.module.pay.base.annotation.FirstApi
+import com.module.pay.base.annotation.SecondApi
+import com.module.pay.service.DevService
 import com.module.pay.service.HomeApiService
 import dagger.Module
 import dagger.Provides
@@ -26,7 +29,13 @@ class DIHomeNetServiceModule {
      */
     @Singleton//@Singleton 注解也用于 provideDatabase 方法上，以确保返回的 AppDatabase 实例是单例的。
     @Provides//表示provideHomeApiService方法是一个提供依赖项的方法
-    fun provideHomeApiService(retrofit: Retrofit): HomeApiService {
+    fun provideHomeApiService(@FirstApi retrofit: Retrofit): HomeApiService {
         return retrofit.create(HomeApiService::class.java)
     }
+
+    @Singleton//@Singleton 注解也用于 provideDatabase 方法上，以确保返回的 AppDatabase 实例是单例的。
+    @Provides//表示provideHomeApiService方法是一个提供依赖项的方法
+    fun provideDevApiService(@SecondApi retrofit: Retrofit): DevService {
+        return retrofit.create(DevService::class.java)
+    }
 }

module_pay/src/main/java/com/module/pay/base/DINetworkModule.kt

@@ -1,7 +1,7 @@
-package com.quyunshuo.sbm10.common.di
+package com.quyunshuo.androidbaseframemvvm.common.di
 
-import com.quyunshuo.sbm10.base.BuildConfig
-import com.quyunshuo.sbm10.base.constant.VersionStatus
+import com.module.pay.base.annotation.FirstApi
+import com.module.pay.base.annotation.SecondApi
 import com.quyunshuo.sbm10.common.constant.NetBaseUrlConstant
 import dagger.Module
 import dagger.Provides
@@ -10,7 +10,6 @@ import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import okhttp3.logging.HttpLoggingInterceptor.Level.BODY
-import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
 import retrofit2.Retrofit
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.util.concurrent.TimeUnit
@@ -19,7 +18,7 @@ import javax.inject.Singleton
 /**
  * 全局作用域的网络层的依赖注入模块
  *
- * @author Qu Yunshuo
+ * @author Qu Yunshuo hilt
  * @since 6/4/21 8:58 AM
  */
 @Module
@@ -51,6 +50,7 @@ class DINetworkModule {
      * @param okHttpClient OkHttpClient OkHttp客户端
      * @return Retrofit
      */
+    @FirstApi
     @Singleton
     @Provides
     fun provideMainRetrofit(okHttpClient: OkHttpClient): Retrofit {
@@ -61,4 +61,15 @@ class DINetworkModule {
             .client(okHttpClient)
             .build()
     }
+    @SecondApi
+    @Singleton
+    @Provides
+    fun provideDevRetrofit(okHttpClient: OkHttpClient): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(NetBaseUrlConstant.SIM_URL)
+//            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(ScalarsConverterFactory.create())
+            .client(okHttpClient)
+            .build()
+    }
 }

module_pay/src/main/java/com/module/pay/base/NetBaseUrlConstant.kt

@@ -9,10 +9,13 @@ package com.quyunshuo.sbm10.common.constant
 internal object NetBaseUrlConstant {
 
     val MAIN_URL = "http://sz.sunzee.com.cn"
+
     get() {
         if (field.isEmpty()){
             throw NotImplementedError("请求改你的 MAIN_URL 的值为自己的请求地址")
         }
        return  field
     }
+    var SIM_URL = "https://api.simboss.com/"
+
 }

module_pay/src/main/java/com/module/pay/base/annotation/FirstApi.kt

@@ -0,0 +1,7 @@
+package com.module.pay.base.annotation
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class FirstApi

module_pay/src/main/java/com/module/pay/base/annotation/SecondApi.kt

@@ -0,0 +1,7 @@
+package com.module.pay.base.annotation
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class SecondApi

module_pay/src/main/java/com/module/pay/service/DevService.kt

@@ -0,0 +1,22 @@
+package com.module.pay.service
+
+import retrofit2.http.Headers
+import retrofit2.http.POST
+import retrofit2.http.QueryMap
+import java.util.TreeMap
+
+/**
+ * 版权：Zhujiang 个人版权
+ * @author zhujiang
+ * 版本：1.5
+ * 创建日期：2020/5/19
+ * 描述：PlayAndroid
+ *
+ */
+interface DevService {
+
+    @POST("/2.0/device/detail")
+    @Headers("Content-Type:application/x-www-form-urlencoded;charset=utf-8")
+    suspend fun getData(@QueryMap paramTreeMap: TreeMap<String, String>): String
+
+}

serialport-api/src/main/java/com/hboxs/serialport/sbc/SBCHeartbeat.kt

@@ -15,7 +15,7 @@ object SBCHeartbeat {
     var devDogtag: String = ""//设备铭牌号
     var softwareVersion: String = ""//软件版本号
 
-    var cabinetTm:String = "40"//发生器温度
+    var cabinetTm:String = "0"//发生器温度
 
     var steamTemp:String = "40"//蒸汽温度
     var outsideTemp:String = "40"//柜外温度