commit 3cb81b9d29e45a276947c431975ba7c027b395cc
author zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周五 6月 11 15:21:13 2021 +0800
committer zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周五 6月 11 15:21:13 2021 +0800
tree 96133cb9337df01387c214445a4330cb777dff18
parent 40cbfc06214226ae6a2b3c3373d5b9f0d5efb3b6

优化

app/src/main/java/com/supwisdom/activities/SPApplication.kt

diff --git a/app/src/main/java/com/supwisdom/activities/SPApplication.kt b/app/src/main/java/com/supwisdom/activities/SPApplication.kt
index c8cf58f..9d17572 100644
--- a/app/src/main/java/com/supwisdom/activities/SPApplication.kt
+++ b/app/src/main/java/com/supwisdom/activities/SPApplication.kt
@@ -5,9 +5,7 @@
 import android.support.multidex.MultiDex

 import android.support.multidex.MultiDexApplication

 import com.supwisdom.db.Pos

-import com.supwisdom.utils.CommonUtil

 import com.supwisdom.utils.DateUtil

-import com.supwisdom.utils.PublicDef

 

 /**

  ** create by zzq on 2019/7/23

@@ -75,9 +73,7 @@
     }

 

     private fun startService() {

-        if (!CommonUtil.isServiceWork(this, PublicDef.BG_SERVICE_NAME)) {

-            startService(Intent(this, ServiceDemo::class.java))

-        }

+        startService(Intent(this, ServiceDemo::class.java))

     }

 

     fun stopService() {

app/src/main/java/com/supwisdom/activities/ServiceDemo.kt

diff --git a/app/src/main/java/com/supwisdom/activities/ServiceDemo.kt b/app/src/main/java/com/supwisdom/activities/ServiceDemo.kt
index 90d1564..87af3f7 100644
--- a/app/src/main/java/com/supwisdom/activities/ServiceDemo.kt
+++ b/app/src/main/java/com/supwisdom/activities/ServiceDemo.kt
@@ -12,10 +12,14 @@
  ** @desc
  **/
 class ServiceDemo : Service() {
-    private var guardThread: Thread? = null
+    companion object {
+        private var guardThread: Thread? = null
+    }
+
     private var bind: ServiceBind? = null
     private var bgTask: BackgroundTaskService? = null
     private val pos = SPApplication.getInstance().getPos()
+
     @Volatile
     private var isExist = false
 
@@ -42,10 +46,8 @@
 
     private fun createThread() {
         isExist = false
-        if (bgTask == null) {
-            bgTask = BackgroundTaskService()
-        }
         if (guardThread == null) {
+            bgTask = BackgroundTaskService()
             guardThread = GuardThread()
             guardThread!!.start()
         }

app/src/main/java/com/supwisdom/activities/consume/mode/CodePayService.kt

diff --git a/app/src/main/java/com/supwisdom/activities/consume/mode/CodePayService.kt b/app/src/main/java/com/supwisdom/activities/consume/mode/CodePayService.kt
index 4485976..823280a 100644
--- a/app/src/main/java/com/supwisdom/activities/consume/mode/CodePayService.kt
+++ b/app/src/main/java/com/supwisdom/activities/consume/mode/CodePayService.kt
@@ -74,7 +74,7 @@
 

     private fun payResultQuery(): Boolean {

         sendMsg(PublicDef.MSG_PAYING_QUERY, "谨慎操作查询取消")

-        LogUtil.d(TAG, "扫码消费确认超时,进行查询操作:billno=${codeRecord.billno}")

+        LogUtil.i(TAG, "扫码消费确认超时,进行查询操作:billno=${codeRecord.billno}")

         sleepWithCancel(1500)

         var searchCnt = 1

         while (!interruptedPay) {

@@ -95,7 +95,7 @@
                 sleepWithCancel(3000)

             }

         }

-        LogUtil.d(TAG, "扫码消费确认超时,操作员手工取消查询:billno=${codeRecord.billno}")

+        LogUtil.i(TAG, "扫码消费确认超时,操作员手工取消查询:billno=${codeRecord.billno}")

         return false

     }

 

app/src/main/java/com/supwisdom/service/BackgroundTaskService.kt

diff --git a/app/src/main/java/com/supwisdom/service/BackgroundTaskService.kt b/app/src/main/java/com/supwisdom/service/BackgroundTaskService.kt
index a6f8610..5798f3e 100644
--- a/app/src/main/java/com/supwisdom/service/BackgroundTaskService.kt
+++ b/app/src/main/java/com/supwisdom/service/BackgroundTaskService.kt
@@ -38,13 +38,6 @@
         var heartgap: Int
         LogUtil.i(TAG, "BackgroundTaskService run !!")
         while (!isExist) {
-            try {
-                heartAndTransdtl()
-                clearTransdtl()
-            } catch (ex: Exception) {
-                ex.printStackTrace()
-                LogUtil.d(TAG, CommonUtil.getExceptionStack(ex))
-            }
             sysRecord = pos.getSysPara()
             heartgap =
                 if (sysRecord == null || sysRecord!!.heatBeat < 10 || sysRecord!!.heatBeat > 600) {
@@ -53,6 +46,19 @@
                     sysRecord!!.heatBeat
                 }
             CommonUtil.doSleep(heartgap * 1000)
+            try {
+                heartAndTransdtl()
+                clearTransdtl()
+            } catch (ex: HeartBeatError) {
+                LogUtil.d(TAG, ex.message ?: "HeartBeatError")
+            } catch (ex: TransdtlUploadError) {
+                LogUtil.d(TAG, ex.message ?: "TransdtlUploadError")
+            } catch (ex: AuthEpayError) {
+                LogUtil.d(TAG, ex.message ?: "AuthEpayError")
+            } catch (ex: Exception) {
+                ex.printStackTrace()
+                LogUtil.d(TAG, CommonUtil.getExceptionStack(ex))
+            }
         }
     }