后台接口url调整

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -255,8 +255,7 @@ object BusinessManager {
                     loadingCallBack.invoke(false, promptStr)
                 }
 
-                override fun onStartConnect() {
-                }
+                override fun onStartConnect() {}
 
                 override fun onConnectFail(bleDevice: BleDevice?, exception: BleException?) {
                     loadingCallBack.invoke(false, CommonUtils.getStr(R.string.ble_connect_fail))

app/src/main/java/com/grkj/iscs/activity/HttpActivity.kt

@@ -2,6 +2,7 @@ package com.grkj.iscs.activity
 
 import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityHttpBinding
+import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
 import com.grkj.iscs.util.log.LogUtil
 
@@ -11,8 +12,6 @@ class HttpActivity : BaseActivity<ActivityHttpBinding>() {
         get() = ActivityHttpBinding.inflate(layoutInflater)
 
     override fun initView() {
-        NetApi.getArea {
-            LogUtil.i("获取地区树 ： $it")
-        }
+        NetApi.getSopPage(1, 10)
     }
 }

app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -4,7 +4,4 @@ object Constants {
     const val PERMISSION_REQUEST_CODE = 1
     const val BLE_LOCAL_NAME = "keyLock"
 
-//    const val BASE_URL = "http://192.168.1.127:9090"
-    const val BASE_URL = "http://192.168.1.246:48080"
-    const val WEB_SOCKET = "ws://192.168.1.127:9090/websocket/iot/127"
 }

app/src/main/java/com/grkj/iscs/model/IscsToken.kt

@@ -0,0 +1,24 @@
+package com.grkj.iscs.model
+
+import android.content.Context
+import android.content.SharedPreferences
+
+class IscsToken(val token: String) {
+
+    fun saveToSp(context: Context): Boolean {
+        return tokenSp(context).edit().putString("token", token).commit()
+    }
+
+    companion object {
+
+        fun fromSp(context:Context): IscsToken? {
+            val sp = tokenSp(context)
+            val token = sp.getString("token", null) ?: return null
+            return IscsToken(token)
+        }
+
+        private fun tokenSp(context: Context): SharedPreferences {
+            return context.getSharedPreferences("token", Context.MODE_PRIVATE)
+        }
+    }
+}

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

@@ -1,6 +1,22 @@
 package com.grkj.iscs.model
 
 object UrlConsts {
+    //    const val BASE_URL = "http://192.168.1.127:9090"
+    const val BASE_URL = "http://192.168.1.246:9090"
+    const val WEB_SOCKET = "ws://192.168.1.127:9090/websocket/iot/127"
+
+    /**
+     * 登录
+     */
+    const val SIGN_IN = "/login"
+
+    /**
+     * 查询SOP信息-分页
+     */
+    const val SOP_PAGE = "/iscs/sop/getIsSopPage"
+
+
+
     /**
      * 获取地区树
      */

app/src/main/java/com/grkj/iscs/model/vo/SopPageVO.kt

@@ -0,0 +1,4 @@
+package com.grkj.iscs.model.vo
+
+class SopPageVO {
+}

app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -2,23 +2,38 @@ package com.grkj.iscs.util
 
 import com.grkj.iscs.model.AreaTree
 import com.grkj.iscs.model.UrlConsts
-import java.util.Objects
 
 /**
  * 网络请求
  */
 object NetApi {
+    fun login(callBack: (AreaTree?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.SIGN_IN,
+            false,
+            mapOf(
+                "username" to "admin",
+                "password" to "grkj8888"
+            ),
+            { res, errMsg, codeInt ->
+                // TODO 待完善
+            }, isGet = false, isAuth = false
+        )
+    }
 
-    fun getArea(callBack: (AreaTree?) -> Unit) {
+    fun getSopPage(current: Int, size: Int) {
         NetHttpManager.getInstance().doRequestNet(
-            UrlConsts.SYSTEM_AREA,
+            UrlConsts.SOP_PAGE,
             false,
-            emptyMap<String, Objects>(),
+            mapOf(
+                "current" to current,
+                "size" to size
+            ),
             { res, errMsg, codeInt ->
                 res?.let {
-                    callBack(it.toBean(AreaTree::class.java))
+
                 }
-            }, isGet = true, isAuth = false
+            }, isGet = true, isAuth = true
         )
     }
 }

app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt

@@ -11,7 +11,10 @@ import cn.zhxu.okhttps.gson.GsonMsgConvertor
 import cn.zhxu.okhttps.okhttp.OkHttpClientWrapper
 import com.grkj.iscs.R
 import com.grkj.iscs.model.Constants
+import com.grkj.iscs.model.IscsToken
 import com.grkj.iscs.model.Token
+import com.grkj.iscs.model.UrlConsts
+import com.grkj.iscs.model.UrlConsts.SIGN_IN
 import com.grkj.iscs.util.log.LogUtil
 import okhttp3.logging.HttpLoggingInterceptor
 import java.io.IOException
@@ -35,7 +38,8 @@ class NetHttpManager {
         context = ctx
         myHttp = HTTP.builder()
             .addMsgConvertor(GsonMsgConvertor())
-            .baseUrl(Constants.BASE_URL)
+            .bodyType("application/json")
+            .baseUrl(UrlConsts.BASE_URL)
             .responseListener { task: HttpTask<*>?, result: HttpResult? ->
                 if (result?.status != 200) {
                     LogUtil.d(
@@ -54,8 +58,12 @@ class NetHttpManager {
                     itPreChain.proceed()
                     return@addSerialPreprocessor
                 }
-                requestTokenAndRefreshIfExpired {
-                    itPreChain.task.addHeader("Access-Token", it)
+//                requestTokenAndRefreshIfExpired {
+//                    itPreChain.task.addHeader("Access-Token", it)
+//                    itPreChain.proceed()
+//                }
+                doLogin {
+                    itPreChain.task.addHeader("Authorization", it)
                     itPreChain.proceed()
                 }
             }
@@ -103,33 +111,34 @@ class NetHttpManager {
             .post()
     }
 
-//    private fun doLogin(callback: (String?) -> Unit) {
-//        myHttp.async(SIGN_IN)
-//            .skipPreproc()
-//            .addBodyPara("username", "IPC")
-//            .addBodyPara("password", "123456")
-//            .nextOnIO()
-//            .setOnResponse {
-//                exceptionCount = 0
-//                if (!it.isSuccessful) {
-//                    callback(null)
-//                    return@setOnResponse
-//                }
-//                try {
+    private fun doLogin(callback: (String?) -> Unit) {
+        myHttp.async(SIGN_IN)
+            .skipPreproc()
+            .addBodyPara("username", "admin")
+            .addBodyPara("password", "grkj8888")
+            .nextOnIO()
+            .setOnResponse {
+                exceptionCount = 0
+                if (!it.isSuccessful) {
+                    callback(null)
+                    return@setOnResponse
+                }
+                try {
 //                    val newToken = it.body.toBean(Token::class.java)
-//                    newToken.saveToSp(context!!)
-//                    callback(newToken.accessToken)
-//                } catch (e: Exception) {
-//                    callback(null)
-//                    return@setOnResponse
-//                }
-//            }
-//            .setOnException {
-//                evictHttpConnectPool(it)
-//                callback(null)
-//            }
-//            .post()
-//    }
+                    val newToken = it.body.toBean(IscsToken::class.java)
+                    newToken.saveToSp(context!!)
+                    callback(newToken.token)
+                } catch (e: Exception) {
+                    callback(null)
+                    return@setOnResponse
+                }
+            }
+            .setOnException {
+                evictHttpConnectPool(it)
+                callback(null)
+            }
+            .post()
+    }
 
     fun doRequestNet(
         urlStr: String, isSkipPreproc: Boolean,

app/src/main/java/com/grkj/iscs/util/StompApi.kt

@@ -7,6 +7,7 @@ import cn.zhxu.stomp.Stomp
 import com.grkj.iscs.extentions.addNetObserver
 import com.grkj.iscs.extentions.removeNetObserver
 import com.grkj.iscs.model.Constants
+import com.grkj.iscs.model.UrlConsts
 import com.grkj.iscs.util.log.LogUtil
 
 object StompApi {
@@ -45,7 +46,7 @@ object StompApi {
     private fun connectStompServer(ctx: Context, destinationInfix: String, callback: (stomp: Stomp, baseDestination: String) -> Unit) {
         LogUtil.i("开始连接 STOMP 服务")
 //        Stomp.over(OkHttps.webSocket(Constants.WEB_SOCKET).heatbeat(20, 20))
-        Stomp.over(OkHttps.webSocket(Constants.WEB_SOCKET))
+        Stomp.over(OkHttps.webSocket(UrlConsts.WEB_SOCKET))
             .setOnConnected {
                 callback(it, "/p--a.${destinationInfix}")
             }

app/src/main/java/com/grkj/iscs/util/StompManager.kt

@@ -5,6 +5,7 @@ import cn.zhxu.okhttps.OkHttps
 import cn.zhxu.stomp.Header
 import cn.zhxu.stomp.Stomp
 import com.grkj.iscs.model.Constants
+import com.grkj.iscs.model.UrlConsts
 import com.grkj.iscs.util.log.LogUtil
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -31,7 +32,7 @@ class StompManager {
         LogUtil.d("stomp连接开始!")
         NetHttpManager.getInstance().requestTokenAndRefreshIfExpired {
             if (!it.isNullOrBlank()){
-                myStomp=Stomp.over(OkHttps.webSocket(Constants.WEB_SOCKET).heatbeat(10,10))
+                myStomp=Stomp.over(OkHttps.webSocket(UrlConsts.WEB_SOCKET).heatbeat(10,10))
                     .setOnConnected {
                         scheduledExecutorService?.shutdownNow()
                         scheduledExecutorService=null

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ material = "1.10.0"
 activity = "1.8.0"
 constraintlayout = "2.1.4"
 mvvmhabit = "4.0.0"
-okhttps = "4.0.2"
+okhttps = "4.0.3"
 log-interceptor = "3.14.9"
 autosize = "v1.2.1"
 fastble = "2.4.0"