注释掉登录页硬件监听，方便虚拟机调试；工作票列表页补充通用tab页和ViewPager联动；网络请求返回响应处理兼容非标准响应

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

@@ -27,11 +27,12 @@ class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginB
             passwordStyle(mBinding?.etPassword, mBinding?.ivEyes!!)
         }
 
-        handleLoading(true, resources.getString(R.string.device_is_initializing))
-        BusinessManager.connectDock(1, true)
-        Executor.delayOnMain(2000) {
-            handleLoading(false)
-        }
+        // TODO 只适配armeabi-v7a
+//        handleLoading(true, resources.getString(R.string.device_is_initializing))
+//        BusinessManager.connectDock(1, true)
+//        Executor.delayOnMain(2000) {
+//            handleLoading(false)
+//        }
     }
 
     override fun onResume() {

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

@@ -2,6 +2,7 @@ package com.grkj.iscs.activity
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityTicketListBinding
 import com.grkj.iscs.fragment.TicketListFragment
@@ -12,9 +13,15 @@ class TicketListActivity : BaseActivity<ActivityTicketListBinding>() {
         get() = ActivityTicketListBinding.inflate(layoutInflater)
 
     override fun initView() {
+        mBinding?.tvExit?.setOnClickListener { finish() }
+
         mBinding?.rvTab?.setData(mutableListOf("待办工单", "已办工单"))
 
-        mBinding?.vpList?.adapter = object : FragmentStateAdapter(this) {
+        mBinding?.rvTab?.onItemClick = {
+            mBinding?.vp?.currentItem = it
+        }
+
+        mBinding?.vp?.adapter = object : FragmentStateAdapter(this) {
             override fun createFragment(position: Int): Fragment {
                 return TicketListFragment(position)
             }
@@ -23,5 +30,11 @@ class TicketListActivity : BaseActivity<ActivityTicketListBinding>() {
                 return 2
             }
         }
+
+        mBinding?.vp?.registerOnPageChangeCallback(object : OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                mBinding?.rvTab?.setSelected(position)
+            }
+        })
     }
 }

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

@@ -138,20 +138,26 @@ class NetHttpManager {
                     MyApplication.instance?.applicationContext?.let { itCtx ->
                         Token.refresh(itCtx)
                     }
-                    it.body.cache()
-                    val baseVO = getBaseVO<Any>(it.body)
-                    if (baseVO?.code in 200 until 300) {
+                    // TODO 待观察
+                    try {
+                        it.body.cache()
+                        val baseVO = getBaseVO<Any>(it.body)
+                        if (baseVO?.code in 200 until 300) {
+                            callback(it.body, null, it.status)
+                        } else {
+                            ToastUtils.tip(baseVO?.msg)
+                            var bobyStr = it.body.toString()
+                            callback(
+                                null, if (bobyStr.isNullOrEmpty()) {
+                                    it.toString()
+                                } else {
+                                    bobyStr
+                                }, it.status
+                            )
+                        }
+                    } catch (e: Exception) {
+                        println("非标准返回数据，特殊处理：${e.message}")
                         callback(it.body, null, it.status)
-                    } else {
-                        ToastUtils.tip(baseVO?.msg)
-                        var bobyStr = it.body.toString()
-                        callback(
-                            null, if (bobyStr.isNullOrEmpty()) {
-                                it.toString()
-                            } else {
-                                bobyStr
-                            }, it.status
-                        )
                     }
                 } else {
                     var bobyStr = it.body.toString()

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

@@ -7,13 +7,20 @@
     android:orientation="vertical"
     tools:context=".activity.TicketListActivity">
 
+    <TextView
+        android:id="@+id/tv_exit"
+        style="@style/CommonTextView"
+        android:layout_margin="@dimen/home_module_margin"
+        android:text="@string/exit"
+        android:textColor="@color/main_color" />
+
     <com.grkj.iscs.widget.RvTab
         android:id="@+id/rv_tab"
         android:layout_width="wrap_content"
         android:layout_height="40dp" />
 
     <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/vp_list"
+        android:id="@+id/vp"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 </LinearLayout>