Преглед на файлове

添加网络请求头参数,方便区分设备

Frankensteinly преди 10 месеца
родител
ревизия
ac5f97e9fb

+ 6 - 0
app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -1,6 +1,12 @@
 package com.grkj.iscs.model
 
 object Constants {
+    const val DEVICE_TYPE = 1 // 1.机柜 2.物料柜 3.手提柜 4.混合柜
+    const val DEVICE_TYPE_NORMAL = "Android_Normal"     // 机柜
+    const val DEVICE_TYPE_MATERIAL = "Android_Material" // 物资柜
+    const val DEVICE_TYPE_PORTABLE = "Android_Portable" // 手提柜
+    const val DEVICE_TYPE_HYBRID = "Android_Hybrid"     // 混合柜
+
     const val PERMISSION_REQUEST_CODE = 1
     const val BLE_LOCAL_NAME = "keyLock"
 

+ 2 - 2
app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -1,8 +1,8 @@
 package com.grkj.iscs.model
 
 object UrlConsts {
-        const val BASE_URL = "http://192.168.28.82:9190"
-//    const val BASE_URL = "http://192.168.1.11:9090"
+    const val BASE_URL = "http://192.168.28.82:9190"
+//    const val BASE_URL = "http://192.168.28.97:9190"
     const val WEB_SOCKET = "ws://192.168.1.127:9090/websocket/iot/127"
 
     const val AUTOCODE_TICKET_NUMBER = "JOB_TICKET_CODE"

+ 11 - 0
app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt

@@ -10,6 +10,11 @@ import cn.zhxu.okhttps.gson.GsonMsgConvertor
 import cn.zhxu.okhttps.okhttp.OkHttpClientWrapper
 import com.grkj.iscs.MyApplication
 import com.grkj.iscs.R
+import com.grkj.iscs.model.Constants.DEVICE_TYPE
+import com.grkj.iscs.model.Constants.DEVICE_TYPE_HYBRID
+import com.grkj.iscs.model.Constants.DEVICE_TYPE_MATERIAL
+import com.grkj.iscs.model.Constants.DEVICE_TYPE_NORMAL
+import com.grkj.iscs.model.Constants.DEVICE_TYPE_PORTABLE
 import com.grkj.iscs.model.Token
 import com.grkj.iscs.model.UrlConsts
 import com.grkj.iscs.model.UrlConsts.LOGIN_CARD
@@ -57,6 +62,12 @@ class NetHttpManager {
                 it.addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
             }
             .addSerialPreprocessor { itPreChain ->
+                itPreChain.task.addHeader("Module", when (DEVICE_TYPE) {
+                    2 -> DEVICE_TYPE_MATERIAL
+                    3 -> DEVICE_TYPE_PORTABLE
+                    4 -> DEVICE_TYPE_HYBRID
+                    else -> DEVICE_TYPE_NORMAL
+                })
                 if (!itPreChain.task.isTagged(tagAuth)) {
                     itPreChain.proceed()
                     return@addSerialPreprocessor