离线订单优化

buildSrc/src/main/kotlin/com/quyunshuo/sbm10/buildsrc/ProjectBuildConfig.kt

@@ -11,8 +11,8 @@ object ProjectBuildConfig {
     const val applicationId = "com.quyunshuo.sbm10"
     const val minSdkVersion = 21
     const val targetSdkVersion = 29
-    const val versionCode = 19//版本号
-    const val versionName = "1.0.19"//版本名
+    const val versionCode = 20//版本号
+    const val versionName = "1.0.20"//版本名
     const val isAppMode = false
     const val appVersion = 2  //国内外版本修改
 

module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/HomeFragment.kt

@@ -540,27 +540,31 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                     Log.d(TAG, "insert: sn:${sn}allPrice:${allPrice}payType:${payType}name:${orderName}")
                     val sysTime = System.currentTimeMillis() //获取系统时间
                     val sysTimeStr = DateFormat.format("yyyy-MM-dd HH:mm:ss", sysTime) //时间显示格式
-                    val responseContent = hashMapOf(
-                        "sn" to sn,
-                        "createDate" to  sysTimeStr.toString(),
-                        "name" to name,
-                        "no" to no,
-                        "clientId" to Heartbeat.deviceId,
-                        "price" to allPrice,
-                        "payType" to PayEnum.getEnumByValuePayType(payInfo.payType).toString(),
-                        "productNumber" to productCount
-                    )
-                    val map = hashMapOf(
-                        "responseContent" to responseContent,
-                        "statusCode" to 200,
-                        "timestamp" to sysTime,
-                        "clientId" to Heartbeat.deviceId,
-                        "operation" to "uploadOrder",
-                        "direction" to 2,
-                    )
-                    Log.d(TAG, "gotoMake:toJsonmap "+Gson().toJson(map))
-                    mViewModel.addOfflineOrder(Gson().toJson(map).toString())
-                    EventBus.getDefault().post(ApiMessageEvent(MMKVName.OFFLINE_ORDER,Gson().toJson(map)))
+                    if (MMKVName.APP_VERSION == 2) {
+
+                        val responseContent = hashMapOf(
+                            "sn" to sn,
+                            "createDate" to sysTimeStr.toString(),
+                            "name" to name,
+                            "no" to no,
+                            "clientId" to Heartbeat.deviceId,
+                            "price" to allPrice,
+                            "payType" to PayEnum.getEnumByValuePayType(payInfo.payType).toString(),
+                            "productNumber" to productCount
+                        )
+                        val map = hashMapOf(
+                            "responseContent" to responseContent,
+                            "statusCode" to 200,
+                            "timestamp" to sysTime,
+                            "clientId" to Heartbeat.deviceId,
+                            "operation" to "uploadOrder",
+                            "direction" to 2,
+                        )
+                        Log.d(TAG, "gotoMake:toJsonmap " + Gson().toJson(map))
+                        mViewModel.addOfflineOrder(Gson().toJson(map).toString())
+                        EventBus.getDefault()
+                            .post(ApiMessageEvent(MMKVName.OFFLINE_ORDER, Gson().toJson(map)))
+                    }
                     mViewModel.addLocalOrder(sn, allPrice, payType, orderName,sysTimeStr.toString())
                 }
             }

module_home/src/main/java/com/quyunshuo/module/home/service/GlobalService.kt

@@ -128,7 +128,9 @@ class GlobalService : LifecycleService() {
         globalServiceViewModel.sendBackData()//心跳上传
 //        globalServiceViewModel.forceBackToApp()
         initMaterial()
-        initUpLoadOrder()
+        if (MMKVName.APP_VERSION == 2) {
+            initUpLoadOrder()
+        }
 
     }