From d2f27524997b73e716b35d73ff5c960e1183a732 Mon Sep 17 00:00:00 2001
From: songzhiling <17630035658@163.com>
Date: Fri, 11 Apr 2025 17:42:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(common):=20=E6=B7=BB=E5=8A=A0=E4=B8=BB?=
 =?UTF-8?q?=E4=BB=8E=E5=BA=94=E7=94=A8=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 GlobalData 中添加 isMaster 属性，用于判断是否为主应用
- 修改 ServiceLauncherActivity 启动逻辑，主应用直接跳转到订单状态页
- 更新 ZDManager 初始化方法，支持发布版本和 CRM 版本切换
---
 .../src/main/java/com/za/common/GlobalData.kt |  2 ++
 .../src/main/java/com/za/common/ZDManager.kt  | 19 ++++++-------
 .../com/za/ui/main/ServiceLauncherActivity.kt | 27 ++++---------------
 .../java/com/za/ui/main/ServicingMainVm.kt    |  1 +
 4 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/servicing/src/main/java/com/za/common/GlobalData.kt b/servicing/src/main/java/com/za/common/GlobalData.kt
index 2879bd9..6fe1e0c 100644
--- a/servicing/src/main/java/com/za/common/GlobalData.kt
+++ b/servicing/src/main/java/com/za/common/GlobalData.kt
@@ -2,6 +2,7 @@ package com.za.common
 
 import android.app.Application
 import com.amap.api.location.AMapLocation
+import com.blankj.utilcode.util.AppUtils
 import com.tencent.mmkv.MMKV
 import com.za.bean.DriverInfo
 import com.za.bean.VehicleInfo
@@ -11,6 +12,7 @@ import com.za.room.RoomHelper
 object GlobalData {
 	lateinit var application : Application
 	var activityCount : Int = 0
+	var isMaster = AppUtils.getAppPackageName() == "com.za.rescue.dealer"
 
 	var token : String? = null
 		get() {
diff --git a/servicing/src/main/java/com/za/common/ZDManager.kt b/servicing/src/main/java/com/za/common/ZDManager.kt
index ace3b2f..26d911f 100644
--- a/servicing/src/main/java/com/za/common/ZDManager.kt
+++ b/servicing/src/main/java/com/za/common/ZDManager.kt
@@ -11,25 +11,22 @@ import com.za.service.location.ZdLocationManager
 
 object ZDManager {
 	lateinit var application : Application
-	fun init(application : Application) {
+	fun init(application : Application, isRelease : Boolean = false) {
 		this.application = application
-		thirdSdkInit()
+		thirdSdkInit(isRelease)
 	}
 
-	private fun thirdSdkInit() {
+	private fun thirdSdkInit(isRelease : Boolean = false) {
+		if (isRelease) {
+			AppConfig.release()
+		} else {
+			AppConfig.crm1()
+		}
 		GlobalData.application = application
 		MMKV.initialize(application, MMKVLogLevel.LevelInfo)
 		Bugly.init(application, "6972a6b56d", true)
-		AppConfig.crm1()
 		LogUtil.init(application)
 		RoomHelper.init(application)
 		ZdLocationManager.init(application)
-
-
-		// 初始化讯飞SDK
-		//科大讯飞初始化
-		//		SpeechUtility.createUtility(application,
-		//			SpeechConstant.APPID + "=6fd4aabe," + SpeechConstant.FORCE_LOGIN + "=true")
-		//		SpeechManager.init(application)
 	}
 }
\ No newline at end of file
diff --git a/servicing/src/main/java/com/za/ui/main/ServiceLauncherActivity.kt b/servicing/src/main/java/com/za/ui/main/ServiceLauncherActivity.kt
index de50dda..0d6f962 100644
--- a/servicing/src/main/java/com/za/ui/main/ServiceLauncherActivity.kt
+++ b/servicing/src/main/java/com/za/ui/main/ServiceLauncherActivity.kt
@@ -23,8 +23,6 @@ import com.za.base.BaseActivity
 import com.za.common.GlobalData
 import com.za.common.log.LogUtil
 import com.za.ext.goStatusPage
-import com.za.service.ServiceManager
-import com.za.service.location.ZdLocationManager
 import com.za.servicing.R
 
 class ServiceLauncherActivity : BaseActivity() {
@@ -170,6 +168,11 @@ class ServiceLauncherActivity : BaseActivity() {
 	}
 
 	private fun navigateToNextScreen() {
+		if (GlobalData.isMaster) {
+			GlobalData.currentOrder?.goStatusPage(this)
+			finish()
+			return
+		}
 		val driverName = intent.getStringExtra("driverName")
 		val driverPhone = intent.getStringExtra("driverPhone")
 		val taskCode = intent.getStringExtra("taskCode")
@@ -183,26 +186,6 @@ class ServiceLauncherActivity : BaseActivity() {
 			finish()
 			return
 		}
-
-		if (GlobalData.token.isNullOrBlank()) {
-			ServicingMainActivity.goToMain(
-				this,
-				driverName = driverName,
-				driverPhone = driverPhone,
-				taskCode = taskCode,
-				rescueVehicle = rescueVehicle,
-			)
-			return
-		}
-
-		if (GlobalData.currentOrder != null) {
-			GlobalData.currentOrder?.goStatusPage(this)
-			ServiceManager.initialize(GlobalData.application)
-			ZdLocationManager.startContinuousLocation(GlobalData.application)
-			finish()
-			return
-		}
-
 		ServicingMainActivity.goToMain(
 			this,
 			driverName = driverName,
diff --git a/servicing/src/main/java/com/za/ui/main/ServicingMainVm.kt b/servicing/src/main/java/com/za/ui/main/ServicingMainVm.kt
index a25eec7..585b418 100644
--- a/servicing/src/main/java/com/za/ui/main/ServicingMainVm.kt
+++ b/servicing/src/main/java/com/za/ui/main/ServicingMainVm.kt
@@ -41,6 +41,7 @@ class ServicingMainVm : BaseVm<ServicingMainVm.Action, ServicingMainVm.UiState>(
 		deviceId : String? = null,
 		rescueVehicle : String? = null) {
 		LoadingManager.showLoading()
+
 		login(jobCode, phone, taskCode, vehicleId, deviceId, rescueVehicle, success = {
 			CommonMethod.queryOrderList(context = ActivityUtils.getTopActivity(),
 				success = { orderInfo : OrderInfo?, orderInfos : List<OrderInfo>? ->