调整HTTP封装

app/src/main/AndroidManifest.xml

@@ -21,6 +21,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ISCS"
         tools:targetApi="31">
+        <activity
+            android:name=".activity.HttpActivity"
+            android:exported="false" />
         <activity
             android:name=".activity.WebSocketActivity"
             android:exported="false" />

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

@@ -0,0 +1,18 @@
+package com.grkj.iscs.activity
+
+import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.databinding.ActivityHttpBinding
+import com.grkj.iscs.util.NetApi
+import com.grkj.iscs.util.log.LogUtil
+
+class HttpActivity : BaseActivity<ActivityHttpBinding>() {
+
+    override val viewBinding: ActivityHttpBinding
+        get() = ActivityHttpBinding.inflate(layoutInflater)
+
+    override fun initView() {
+        NetApi.getArea {
+            LogUtil.i("获取地区树 ： $it")
+        }
+    }
+}

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

@@ -10,23 +10,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         get() = ActivityMainBinding.inflate(layoutInflater)
 
     override fun initView() {
-//        NetHttpManager.getInstance()
-//            .doRequestNet("/app-api/system/area/tree", false, emptyMap<String, Objects>(),
-//                { res, errMsg, codeInt ->
-//                    res?.let {
-//                        val rsp = res.toBean(RealResponse::class.java)
-//                        Log.i("haha1", "${rsp.code}")
-//                        Log.i("haha2", rsp.msg)
-//                        Log.i("haha3", "${rsp.data}")
-//                    }
-//                    Log.i("xixi", "$errMsg : $codeInt")
-//                }, isGet = true, isAuth = false
-//            )
-
-//        startActivity(Intent(this, ScreenAdaptActivity::class.java))
-//        startActivity(Intent(this, WebActivity::class.java))
-
-
         mBinding?.ble?.setOnClickListener {
             startActivity(Intent(this, BleActivity::class.java))
         }
@@ -38,5 +21,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         mBinding?.websocket?.setOnClickListener {
             startActivity(Intent(this, WebSocketActivity::class.java))
         }
+
+        mBinding?.http?.setOnClickListener {
+            startActivity(Intent(this, HttpActivity::class.java))
+        }
     }
 }

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

@@ -0,0 +1,3 @@
+package com.grkj.iscs.model
+
+data class AreaTree(val data: Any?)

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

@@ -1,3 +0,0 @@
-package com.grkj.iscs.model
-
-data class RealResponse(val code: Int, val msg: String, val data: Any?)

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

@@ -0,0 +1,8 @@
+package com.grkj.iscs.model
+
+object UrlConsts {
+    /**
+     * 获取地区树
+     */
+    const val SYSTEM_AREA = "/app-api/system/area/tree"
+}

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

@@ -0,0 +1,25 @@
+package com.grkj.iscs.util
+
+import android.util.Log
+import com.grkj.iscs.model.AreaTree
+import com.grkj.iscs.model.UrlConsts
+import java.util.Objects
+
+/**
+ * 网络请求
+ */
+object NetApi {
+
+    fun getArea(callBack: (AreaTree?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.SYSTEM_AREA,
+            false,
+            emptyMap<String, Objects>(),
+            { res, errMsg, codeInt ->
+                res?.let {
+                    callBack(it.toBean(AreaTree::class.java))
+                }
+            }, isGet = true, isAuth = false
+        )
+    }
+}

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

@@ -33,8 +33,6 @@ class NetHttpManager {
         context = ctx
         myHttp = HTTP.builder()
             .addMsgConvertor(GsonMsgConvertor())
-//            .baseUrl("${UrlConsts.BASE_URL_PROD}$DEFAULT_DOMAIN")
-//            .baseUrl(Environment.baseUrl(ctx))
             .baseUrl(Constants.BASE_URL)
             .responseListener { task: HttpTask<*>?, result: HttpResult? ->
                 if (result?.status != 200) {

app/src/main/res/layout/activity_http.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.HttpActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_main.xml

@@ -11,31 +11,41 @@
 
     <Button
         android:id="@+id/ble"
-        android:layout_width="200dp"
-        android:layout_height="80dp"
+        android:layout_width="120dp"
+        android:layout_height="40dp"
         android:minWidth="0dp"
         android:minHeight="0dp"
         android:text="BLE"
-        android:textSize="30sp"
+        android:textSize="10sp"
         android:layout_margin="5dp"/>
 
     <Button
         android:id="@+id/modbus"
-        android:layout_width="200dp"
-        android:layout_height="80dp"
+        android:layout_width="120dp"
+        android:layout_height="40dp"
         android:minWidth="0dp"
         android:minHeight="0dp"
         android:text="ModBus"
-        android:textSize="30sp"
+        android:textSize="10sp"
         android:layout_margin="5dp"/>
 
     <Button
         android:id="@+id/websocket"
-        android:layout_width="200dp"
-        android:layout_height="80dp"
+        android:layout_width="120dp"
+        android:layout_height="40dp"
         android:minWidth="0dp"
         android:minHeight="0dp"
         android:text="WebSocket"
-        android:textSize="30sp"
+        android:textSize="10sp"
+        android:layout_margin="5dp"/>
+
+    <Button
+        android:id="@+id/http"
+        android:layout_width="120dp"
+        android:layout_height="40dp"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="HTTP"
+        android:textSize="10sp"
         android:layout_margin="5dp"/>
 </LinearLayout>