refactor(sdk): 重构项目并添加 native 代码支持

- 移除了不必要的日志库 LogUtil
- 添加了高德地图服务并配置了相关权限
- 更新了 API 接口定义，统一添加了前缀
-重构了 AppConfig 类，使用 native代码获取配置信息
- 更新了项目构建配置，支持 native 代码编译
- 优化了部分代码结构，提高了代码的可维护性

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="corretto-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
-    id 'com.google.devtools.ksp'
 }
 
 android {
@@ -31,6 +30,11 @@ android {
                 VIVO_APPKEY   : "cfd443e2a1757cf537361588c988a12a",//vivo的APPKEY
                 VIVO_APPID    : "105470845",//vivo的APPID
         ]
+        externalNativeBuild {
+            cmake {
+                cppFlags ''
+            }
+        }
     }
 
     signingConfigs {
@@ -50,6 +54,7 @@ android {
         }
         debug {
             minifyEnabled false          // 开启混淆
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.config
         }
     }
@@ -75,6 +80,12 @@ android {
             jniLibs.srcDirs = ["libs"]
         }
     }
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            version '3.22.1'
+        }
+    }
 }
 
 dependencies {

app/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,38 @@
+
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html.
+# For more examples on how to use CMake, see https://github.com/android/ndk-samples.
+
+# Sets the minimum CMake version required for this project.
+cmake_minimum_required(VERSION 3.22.1)
+
+# Declares the project name. The project name can be accessed via ${ PROJECT_NAME},
+# Since this is the top level CMakeLists.txt, the project name is also accessible
+# with ${CMAKE_PROJECT_NAME} (both CMake variables are in-sync within the top level
+# build script scope).
+project("config")
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+#
+# In this top level CMakeLists.txt, ${CMAKE_PROJECT_NAME} is used to define
+# the target library name; in the sub-module's CMakeLists.txt, ${PROJECT_NAME}
+# is preferred for the same purpose.
+#
+# In order to load a library into your app from Java/Kotlin, you must call
+# System.loadLibrary() and pass the name of the library defined here;
+# for GameActivity/NativeActivity derived applications, the same library name must be
+# used in the AndroidManifest.xml file.
+add_library(${CMAKE_PROJECT_NAME} SHARED
+    # List C/C++ source files with relative paths to this CMakeLists.txt.
+        config.cpp)
+
+# Specifies libraries CMake should link to your target library. You
+# can link libraries from various origins, such as libraries defined in this
+# build script, prebuilt third-party libraries, or Android system libraries.
+target_link_libraries(${CMAKE_PROJECT_NAME}
+    # List libraries link to the target library
+    android
+    log)

app/src/main/cpp/config.cpp

@@ -0,0 +1,279 @@
+// Write C++ code here.
+//
+// Do not forget to dynamically load the C++ library into your application.
+//
+// For instance,
+//
+// In MainActivity.java:
+//    static {
+//       System.loadLibrary("demo");
+//    }
+//
+// Or, in MainActivity.kt:
+//    companion object {
+//      init {
+//         System.loadLibrary("demo")
+//      }
+//    }
+
+#include <jni.h>
+#include <string>
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_za_base_Config_getUrls(JNIEnv *env, jobject thiz) {
+    // 创建 HashMap 类引用
+    jclass hashMapClass = env->FindClass("java/util/HashMap");
+    jmethodID hashMapConstructor = env->GetMethodID(hashMapClass, "<init>", "()V");
+    jmethodID putMethod = env->GetMethodID(hashMapClass, "put",
+                                           "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+
+    // 创建 HashMap 实例
+    jobject hashMap = env->NewObject(hashMapClass, hashMapConstructor);
+
+    // 插入键值对
+    jstring key1 = env->NewStringUTF("release");
+    jstring value1 = env->NewStringUTF("https://api.sinoassist.com");
+    env->CallObjectMethod(hashMap, putMethod, key1, value1);
+
+    jstring key2 = env->NewStringUTF("review");
+    jstring value2 = env->NewStringUTF("25");
+    env->CallObjectMethod(hashMap, putMethod, key2, value2);
+
+    return hashMap;
+}
+
+//----------------------------------- 基础的地址配置-------------------------------------------------
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReleaseBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api.sinoassist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReleaseImgBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api.sinoassist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReleaseResourceUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://www.sinoassist.com/res";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReleaseTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://www.sinoassist.com/h5/supplier/dispatch/diverTrainDocment";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReleaseDocumentUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://www.sinoassist.com/h5/supplier/dispatch/docmentList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReleaseNewDriverTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://www.sinoassist.com/h5/supplier/dispatch/driverTrainingList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReviewBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "http://interface.review.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReviewImgBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "http://interface.review.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReviewResourceUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://www.sinoassist.com/res";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReviewTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "http://interface.review.sino-assist.com/h5/supplier/dispatch/diverTrainDocment";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReviewDocumentUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "http://interface.review.sino-assist.com/h5/supplier/dispatch/docmentList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getReviewNewDriverTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "http://interface.review.sino-assist.com/h5/supplier/dispatch/driverTrainingList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm1BaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api1.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm1ImgBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api1.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm1ResourceUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://crm1.sino-assist.com/res";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm1TrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://crm1.sino-assist.com/h5/supplier/dispatch/diverTrainDocment";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm1DocumentUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://crm1.sino-assist.com/h5/supplier/dispatch/docmentList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm1NewDriverTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://crm1.sino-assist.com/h5/supplier/dispatch/driverTrainingList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm2BaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api2.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm2ImgBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api2.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm2ResourceUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://crm2.sino-assist.com/res";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm2TrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api.sinoassist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm2DocumentUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getCrm2NewDriverTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getUatBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api-uat.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getUatImgBaseUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://api-uat.sino-assist.com";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getUatResourceUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://uat.sino-assist.com/res";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getUatTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/diverTrainDocment";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getUatDocumentUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/docmentList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_base_AppConfig_getUatNewDriverTrainUrl(JNIEnv *env, jobject thiz) {
+    std::string baseUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/driverTrainingList";
+    return env->NewStringUTF(baseUrl.c_str());
+}
+
+
+//-------------bugly appid---------------------
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_common_ZDManager_getBuglyAppId(JNIEnv *env, jobject thiz) {
+    std::string bugly = "6972a6b56d";
+    return env->NewStringUTF(bugly.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_net_RequestEncryptInterceptor_getPublicKey(JNIEnv *env, jobject thiz) {
+    std::string bugly = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7UM6zdWdBuO0DZZVkxVfJioawUe6qH1p5Uz/qR9zbawl2oWyxxcBfxQyPS+HxOej/ZnyS4bu7qhh99alDqkJzk6g9oGZWs+jEF5GRWt9nChlfUsjvHQwuF2TSQMTdPtDPCByF/QgMFCAfbCqTrNmOETrZ/2GFy1Re0BTlhh6X/XzpzqtK+enikEMlQ5fIM5ljdXgyCnvDou9ptWqzw8Zmsat6LeA0UKz+bgpJAbw6KfK+8lPMqUpNFfkmJuEd5+JQOG9McH7j9pBagohkC6k3Cn92dAf9iD6NSDKSNgt1vxXhaNnfAbYJ5pqeSGy6QMSVO0TXYj4asln5OutD/284QIDAQAB";
+    return env->NewStringUTF(bugly.c_str());
+}
+
+//-------------------------MQTT 配置---------------------
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_service_mqtt_MqttConfig_getMqttInstanceId(JNIEnv *env, jobject thiz) {
+    std::string bugly = "mqtt-cn-oew23jbkb1f";
+    return env->NewStringUTF(bugly.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_service_mqtt_MqttConfig_getMqttEndpoint(JNIEnv *env, jobject thiz) {
+    std::string bugly = "mqtt-cn-oew23jbkb1f.mqtt.aliyuncs.com";
+    return env->NewStringUTF(bugly.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_service_mqtt_MqttConfig_getMqttAccessKey(JNIEnv *env, jobject thiz) {
+    std::string bugly = "LTAI5tKgZ9ACKorXzzWLxgg7";
+    return env->NewStringUTF(bugly.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_service_mqtt_MqttConfig_getMqttSecretKey(JNIEnv *env, jobject thiz) {
+    std::string bugly = "D04F0UH2GzrDsYaJ9GTfULGPjcsvvz";
+    return env->NewStringUTF(bugly.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_service_mqtt_MqttConfig_getMqttGroupId(JNIEnv *env, jobject thiz) {
+    std::string bugly = "GID_ZDJY";
+    return env->NewStringUTF(bugly.c_str());
+}
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_za_service_mqtt_MqttConfig_getMqttTopicPrefix(JNIEnv *env, jobject thiz) {
+    std::string bugly = "pushBaseTopic/p2p";
+    return env->NewStringUTF(bugly.c_str());
+}

app/src/main/java/com/za/sdk/demo/ActionActivity.kt

@@ -13,7 +13,6 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import com.za.base.view.CommonButton
-import com.za.common.log.LogUtil
 import com.za.sdk.demo.ui.theme.Zd_sdk_demoTheme
 import com.za.ui.main.ServiceLauncherActivity
 
@@ -33,8 +32,7 @@ class ActionActivity : ComponentActivity() {
 							val phone = intent.data?.getQueryParameter("driverPhone")
 							val taskCode = intent.data?.getQueryParameter("taskCode")
 							val vehicleName = intent.data?.getQueryParameter("rescueVehicle")
-							LogUtil.print("参数",
+						
-								"name:$name,phone:$phone,taskCode:$taskCode,vehicleName:$vehicleName")
 
 							Log.e("ActionActivity",
 								"name:$name,phone:$phone,taskCode:$taskCode,vehicleName:$vehicleName")

app/src/main/java/com/za/sdk/demo/MainActivity.kt

@@ -27,7 +27,7 @@ class MainActivity : ComponentActivity() {
 						.fillMaxSize()
 						.clickable {
 							val uri =
-								"zd.assist://app?taskCode=ZD250521100686&driverName=宋志领&driverPhone=17630035658&rescueVehicle=沪88888".toUri()
+								"zd.assist://app?taskCode=ZD250708100532&driverName=宋志领&driverPhone=17630035658&rescueVehicle=沪88888".toUri()
 							val intent = Intent(Intent.ACTION_VIEW, uri)
 							startActivity(intent)
 						}

build.gradle

@@ -1,7 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+//plugins {
+//    id(libs.plugins.android.application) apply false
+//    id(libs.plugins.jetbrains.kotlin.android) apply false
+//    id(libs.plugins.android.library) apply false
+//    id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
+//}
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    alias(libs.plugins.android.application) apply false
+    id 'com.android.application' version '8.2.2' apply false
-    alias(libs.plugins.jetbrains.kotlin.android) apply false
+    id 'com.android.library' version '8.2.2' apply false
-    alias(libs.plugins.android.library) apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.25' apply false
-    id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
+    id 'com.google.devtools.ksp' version "1.9.0-1.0.13" apply false
 }

gradle/libs.versions.toml

@@ -48,6 +48,7 @@ activity = "1.10.0"
 xz = "1.9"
 exifinterface = "1.3.7"
 uiToolingVersion = "1.4.0"
+roomCompiler = "2.7.2"
 [libraries]
 accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanistPager" }
 accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanistPager" }
@@ -106,6 +107,7 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re
 xz = { module = "org.tukaani:xz", version.ref = "xz" }
 androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" }
 ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiToolingVersion" }
+androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "roomCompiler" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

servicing/build.gradle

@@ -1,7 +1,9 @@
+import com.android.build.gradle.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.jetbrains.kotlin.android)
     id 'com.google.devtools.ksp'
+    alias(libs.plugins.jetbrains.kotlin.android)
     id 'maven-publish'
 //    kotlin 序列化注解
     id 'kotlin-parcelize'
@@ -19,6 +21,12 @@ android {
         vectorDrawables {
             useSupportLibrary true
         }
+
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }
+
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -31,7 +39,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
-//        publishNonDefault true
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -48,9 +55,17 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion '1.5.15'
     }
-    packaging {
+    if (project.extensions.getByName("android") is LibraryExtension) {
-        resources {
+        // AGP 7.0+
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        packaging {
+            resources {
+                excludes += "META-INF/LICENSE"
+            }
+        }
+    } else {
+        // AGP 6.x
+        packagingOptions {
+            exclude("META-INF/LICENSE")
         }
     }
     publishing {
@@ -64,7 +79,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'io.github.szl9'
             artifactId = 'zd_servicing'
-            version = "1.0.1.9.9.138"
+            version = "1.0.3"
 
             pom {
                 packaging = "aar"
@@ -135,81 +150,87 @@ tasks.register('generateRepo', Zip) {
     into 'zd_servicing'
     archiveFileName.set('zd_servicing.zip')
 }
+
+
 dependencies {
-    api libs.androidx.core.ktx
+    api "androidx.core:core-ktx:1.15.0" // coreKtx = "1.15.0"
-    api libs.androidx.appcompat
+    api "androidx.appcompat:appcompat:1.7.0" // appcompat = "1.7.0"
-    api libs.material
+    api "com.google.android.material:material:1.12.0" // material = "1.12.0"
-    api libs.androidx.lifecycle.viewmodel.compose
+    api "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7" // lifecycleRuntimeKtx = "2.8.7"
-    api libs.androidx.lifecycle.runtime.ktx
+    api "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7" // lifecycleRuntimeKtx = "2.8.7"
-    api libs.androidx.activity.compose
+    api "androidx.activity:activity-compose:1.10.0" // activityCompose = "1.10.0"
-    api platform(libs.androidx.compose.bom)
+    api platform("androidx.compose:compose-bom:2025.01.01") // composeBom = "2025.01.01"
-    api libs.androidx.ui
+    api "androidx.compose.ui:ui:1.7.7" // uiVersion = "1.7.7"
-    api libs.androidx.ui.graphics
+    api "androidx.compose.ui:ui-graphics:1.7.7" // uiGraphics = "1.7.7"
-    api libs.androidx.ui.tooling.preview
+    api "androidx.compose.ui:ui-tooling-preview:1.7.7" // uiToolingPreview = "1.7.7"
-    api libs.androidx.material3
+    api "androidx.compose.material3:material3:1.3.1" // material3="1.3.1"
-    api libs.androidx.work.runtime.ktx
+    api "androidx.work:work-runtime-ktx:2.10.0" // workRuntimeKtx = "2.10.0"
-    api libs.androidx.exifinterface
+    api "androidx.exifinterface:exifinterface:1.3.7" // exifinterface = "1.3.7"
 
-    testApi libs.junit
+    testApi "junit:junit:4.13.2" // junit = "4.13.2"
-    androidTestApi libs.androidx.junit
+    androidTestApi "androidx.test.ext:junit:1.2.1" // junitVersion = "1.2.1"
-    androidTestApi libs.androidx.espresso.core
+    androidTestApi "androidx.test.espresso:espresso-core:3.6.1" // espressoCore = "3.6.1"
-    androidTestApi platform(libs.androidx.compose.bom)
+    androidTestApi platform("androidx.compose:compose-bom:2025.01.01") // composeBom = "2025.01.01"
-    androidTestApi libs.androidx.ui.test.junit4
+    androidTestApi "androidx.compose.ui:ui-test-junit4:1.7.7" // uiGraphics = "1.7.7"
-    debugApi libs.androidx.ui.test.manifest
+    debugApi "androidx.compose.ui:ui-test-manifest:1.7.7" // uiGraphics = "1.7.7"
-    debugApi libs.ui.tooling
+    debugApi "androidx.compose.ui:ui-tooling:1.4.0"
+    // From [libraries] ui-tooling, version.ref = "uiToolingVersion", and [versions] uiToolingVersion = "1.4.0"
 
-    api libs.coil.compose
+    api "io.coil-kt:coil-compose:2.6.0" // coilCompose = "2.6.0"
-    api libs.coil.gif
+    api "io.coil-kt:coil-gif:2.6.0" // coilCompose = "2.6.0"
 
-    api libs.permissionx
+    api "com.guolindev.permissionx:permissionx:1.8.0" // permissionx = "1.8.0"
-    api libs.utilcodex
+    api "com.blankj:utilcodex:1.31.1" // utilcodex = "1.31.1"
 
-    api libs.crashreport
+    api "com.tencent.bugly:crashreport:4.0.4" // crashreport = "4.0.4"
 
     // 高德地图
-    api libs.xdmap
+    api "com.amap.api:3dmap:8.1.0" // xdmap = "8.1.0"
-    api libs.location
+    api "com.amap.api:location:5.6.1" // location = "5.6.1"
-    api libs.search
+    api "com.amap.api:search:7.3.0" // search = "7.3.0"
 
-//    // JPush
+    // JPush
-    api libs.jpush
+    api "cn.jiguang.sdk:jpush:5.6.0" // jpush = "5.6.0"
-    api libs.gson
+    api "com.google.code.gson:gson:2.11.0" // gson = "2.11.0"
 
     // 网络
-    api libs.retrofit
+    api "com.squareup.retrofit2:retrofit:2.9.0" // retrofit = "2.9.0"
-    api libs.converter.gson
+    api "com.squareup.retrofit2:converter-gson:2.9.0" // converterGson = "2.9.0"
-    api libs.adapter.rxjava3
+    api "com.squareup.retrofit2:adapter-rxjava3:2.9.0"
-    api libs.rxjava
+    // From [libraries] adapter-rxjava3, version.ref = "converterGson"
-    api libs.rxandroid
+    api "io.reactivex.rxjava3:rxjava:3.1.7" // rxjava = "3.1.7"
-    api libs.logging.interceptor
+    api "io.reactivex.rxjava3:rxandroid:3.0.2" // rxandroid = "3.0.2"
-    api libs.fastjson
+    api "com.squareup.okhttp3:logging-interceptor:4.11.0" // loggingInterceptor = "4.11.0"
+    api "com.alibaba:fastjson:1.2.69" // fastjson = "1.2.69"
 
     // 本地数据
-    api libs.room.runtime
+    api "androidx.room:room-runtime:2.6.1" // roomRuntimeVersion = "2.6.1"
-    annotationProcessor libs.room.compiler
+    annotationProcessor "androidx.room:room-compiler:2.6.1" // roomCompilerVersion = "2.6.1"
-    ksp libs.room.compiler
+    ksp "androidx.room:room-compiler:2.6.1" // roomCompilerVersion = "2.6.1"
-    api libs.mmkv
+    api "com.tencent:mmkv:1.3.11" // mmkv = "1.3.11"
 
     // 7z
-    api libs.xz
+    api "org.tukaani:xz:1.9" // xz = "1.9"
-    api libs.commons.compress
+    api "org.apache.commons:commons-compress:1.23.0" // commonsCompress = "1.23.0"
 
-    api libs.core
+    api "com.google.zxing:core:3.5.3" // core = "3.5.3"
-    api libs.tbssdk
+    api "com.tencent.tbs:tbssdk:44286" // tbssdk = "44286"
 
-    // CameraX
+    // CameraX - Assuming all camera dependencies use 'cameraCore' version
-    api libs.androidx.camera.core
+    api "androidx.camera:camera-core:1.4.1" // cameraCore = "1.4.1"
-    api libs.androidx.camera.camera2
+    api "androidx.camera:camera-camera2:1.4.1" // cameraCore = "1.4.1"
-    api libs.androidx.camera.lifecycle
+    api "androidx.camera:camera-lifecycle:1.4.1" // cameraCore = "1.4.1"
-    api libs.androidx.camera.view
+    api "androidx.camera:camera-view:1.4.1" // cameraCore = "1.4.1"
-    api libs.androidx.camera.extensions
+    api "androidx.camera:camera-extensions:1.4.1" // cameraCore = "1.4.1"
 
-    api libs.glide
+    api "com.github.bumptech.glide:glide:4.16.0" // glide = "4.16.0"
-    annotationProcessor libs.compiler
+    annotationProcessor "com.github.bumptech.glide:compiler:4.14.2" // compiler = "4.14.2"
 
-    api libs.org.eclipse.paho.client.mqttv3
+    api "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5"
-    api libs.org.eclipse.paho.android.service
+    // orgEclipsePahoClientMqttv3 = "1.2.5"
+    api "org.eclipse.paho:org.eclipse.paho.android.service:1.1.1"
+    // orgEclipsePahoAndroidService = "1.1.1"
 
-    api libs.face.detection
+    api "com.google.mlkit:face-detection:16.1.7" // faceDetection = "16.1.7"
 }
 

servicing/proguard-rules.pro

@@ -1,5 +1,11 @@
 -dontwarn java.lang.invoke.StringConcatFactory
 
+# 设置混淆的压缩比率 0 ~ 7
+-optimizationpasses 5
+
+# 混淆采用的算法
+-optimizations !code/simplification/cast,!field/*,!class/merging/*
+
 # 保留行号用于调试
 -keepattributes SourceFile,LineNumberTable
 -renamesourcefileattribute SourceFile

servicing/src/main/AndroidManifest.xml

@@ -226,6 +226,12 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Dealer" />
 
+        <service
+            android:name="com.amap.api.location.APSService"
+            android:exported="false"
+            android:foregroundServiceType="location"
+            android:process=":aps" />
+
         <receiver
             android:name="com.za.service.ZdPushServiceReceive"
             android:exported="false">

servicing/src/main/java/com/za/base/AppConfig.kt

@@ -3,7 +3,7 @@ package com.za.base
 import com.za.common.GlobalData
 import com.za.net.RetrofitHelper
 
-object AppConfig {
+internal object AppConfig {
 	var isRelease = false
 
 	// API 相关地址
@@ -52,14 +52,14 @@ object AppConfig {
 	fun release() {
 		isRelease = true        // API 配置
 		GlobalData.networkEnv = Const.NetEnv.Main
-		BASE_URL = "https://api.sinoassist.com"
+		BASE_URL = getReleaseBaseUrl()
-		IMG_BASE_URL = "https://api.sinoassist.com"
+		IMG_BASE_URL = getReleaseImgBaseUrl()
-		Resource_URL = "https://www.sinoassist.com/res"
+		Resource_URL = getReleaseResourceUrl()
 
 		// H5 配置
-		trainUrl = "https://www.sinoassist.com/h5/supplier/dispatch/diverTrainDocment"
+		trainUrl = getReleaseTrainUrl()
-		documentUrl = "https://www.sinoassist.com/h5/supplier/dispatch/docmentList"
+		documentUrl = getReleaseDocumentUrl()
-		newDriverTrainUrl = "https://www.sinoassist.com/h5/supplier/dispatch/driverTrainingList";
+		newDriverTrainUrl = getReleaseNewDriverTrainUrl()
 	}
 
 
@@ -71,13 +71,12 @@ object AppConfig {
 		GlobalData.networkEnv = Const.NetEnv.Review
 
 		// API 配置
-		BASE_URL = "http://interface.review.sino-assist.com"
+		BASE_URL = getReviewBaseUrl()
-		IMG_BASE_URL = "http://interface.review.sino-assist.com"
+		IMG_BASE_URL = getReviewImgBaseUrl()
-		Resource_URL = "https://www.sinoassist.com/res"
+		Resource_URL = getReviewResourceUrl()
-		documentUrl = "http://interface.review.sino-assist.com/h5/supplier/dispatch/docmentList"
+		documentUrl = getReviewDocumentUrl()
-		trainUrl = "http://interface.review.sino-assist.com/h5/supplier/dispatch/diverTrainDocment"
+		trainUrl = getReviewTrainUrl()
-		newDriverTrainUrl =
+		newDriverTrainUrl = getReviewNewDriverTrainUrl()
-			"http://interface.review.sino-assist.com/h5/supplier/dispatch/driverTrainingList"
 	}
 
 	/**
@@ -88,13 +87,13 @@ object AppConfig {
 		GlobalData.networkEnv = Const.NetEnv.CRM1
 
 		// API 配置
-		BASE_URL = "https://api1.sino-assist.com"
+		BASE_URL = getCrm1BaseUrl()
-		IMG_BASE_URL = "https://api1.sino-assist.com"
+		IMG_BASE_URL = getCrm1ImgBaseUrl()
-		Resource_URL = "https://crm1.sino-assist.com/res"
+		Resource_URL = getCrm1ResourceUrl()
 
-		documentUrl = "https://crm1.sino-assist.com/h5/supplier/dispatch/docmentList";
+		documentUrl = getCrm1DocumentUrl()
-		trainUrl = "https://crm1.sino-assist.com/h5/supplier/dispatch/diverTrainDocment";
+		trainUrl = getCrm1TrainUrl()
-		newDriverTrainUrl = "https://crm1.sino-assist.com/h5/supplier/dispatch/driverTrainingList";
+		newDriverTrainUrl = getCrm1NewDriverTrainUrl()
 	}
 
 	/**
@@ -105,9 +104,9 @@ object AppConfig {
 		GlobalData.networkEnv = Const.NetEnv.CRM2
 
 		// API 配置
-		BASE_URL = "https://api2.sino-assist.com"
+		BASE_URL = getCrm2BaseUrl()
-		IMG_BASE_URL = "https://api2.sino-assist.com"
+		IMG_BASE_URL = getCrm2ImgBaseUrl()
-		Resource_URL = "https://crm2.sino-assist.com/res"
+		Resource_URL = getCrm2ResourceUrl()
 	}
 
 
@@ -115,15 +114,12 @@ object AppConfig {
 		isRelease = false
 		GlobalData.networkEnv = Const.NetEnv.UAT
 
-		BASE_URL = "https://api-uat.sino-assist.com" //crm2
+		BASE_URL = getUatBaseUrl()
-		IMG_BASE_URL = "https://api-uat.sino-assist.com"
+		IMG_BASE_URL = getUatImgBaseUrl()
-		Resource_URL = "https://uat.sino-assist.com/res"
+		Resource_URL = getUatResourceUrl()
-		documentUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/docmentList"
+		documentUrl = getUatDocumentUrl()
-		trainUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/diverTrainDocment"
+		trainUrl = getUatTrainUrl()
-		newDriverTrainUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/driverTrainingList"
+		newDriverTrainUrl = getUatNewDriverTrainUrl()
-		documentUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/docmentList";
-		trainUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/diverTrainDocment";
-		newDriverTrainUrl = "https://uat.sino-assist.com/h5/supplier/dispatch/driverTrainingList";
 	}
 
 	/**
@@ -151,4 +147,42 @@ object AppConfig {
 		}
 		return documentUrl + "?token=${GlobalData.token}&driverId=${GlobalData.driverInfoBean?.userId}&keyword=$keyWord"
 	}
+
+	private external fun getReleaseBaseUrl() : String
+	private external fun getReleaseImgBaseUrl() : String
+	private external fun getReleaseResourceUrl() : String
+	private external fun getReleaseTrainUrl() : String
+	private external fun getReleaseDocumentUrl() : String
+	private external fun getReleaseNewDriverTrainUrl() : String
+
+	private external fun getReviewBaseUrl() : String
+	private external fun getReviewImgBaseUrl() : String
+	private external fun getReviewResourceUrl() : String
+	private external fun getReviewTrainUrl() : String
+	private external fun getReviewDocumentUrl() : String
+	private external fun getReviewNewDriverTrainUrl() : String
+
+
+	private external fun getCrm1BaseUrl() : String
+	private external fun getCrm1ImgBaseUrl() : String
+	private external fun getCrm1ResourceUrl() : String
+	private external fun getCrm1TrainUrl() : String
+	private external fun getCrm1DocumentUrl() : String
+	private external fun getCrm1NewDriverTrainUrl() : String
+
+	private external fun getCrm2BaseUrl() : String
+	private external fun getCrm2ImgBaseUrl() : String
+	private external fun getCrm2ResourceUrl() : String
+	private external fun getCrm2TrainUrl() : String
+	private external fun getCrm2DocumentUrl() : String
+	private external fun getCrm2NewDriverTrainUrl() : String
+
+	private external fun getUatBaseUrl() : String
+	private external fun getUatImgBaseUrl() : String
+	private external fun getUatResourceUrl() : String
+	private external fun getUatTrainUrl() : String
+	private external fun getUatDocumentUrl() : String
+	private external fun getUatNewDriverTrainUrl() : String
+
+
 }

servicing/src/main/java/com/za/base/AppForegroundListener.kt

@@ -1,6 +1,6 @@
 package com.za.base
 
-interface AppForegroundListener {
+internal interface AppForegroundListener {
 
     /**
      * APP处于 前台

servicing/src/main/java/com/za/base/BaseActivityLifecycleCallbacks.kt

@@ -9,7 +9,7 @@ import com.za.common.GlobalData
 import com.za.common.log.LogUtil
 import java.util.concurrent.atomic.AtomicBoolean
 
-open class BaseActivityLifecycleCallbacks : ActivityLifecycleCallbacks {
+internal class BaseActivityLifecycleCallbacks : ActivityLifecycleCallbacks {
 
 
 	override fun onActivityCreated(activity : Activity, savedInstanceState : Bundle?) {

servicing/src/main/java/com/za/base/BaseVm.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 
 val showTipDialog = mutableStateOf<String?>(null) //提示框
 
-abstract class BaseVm<T, U> : ViewModel() {
+internal abstract class BaseVm<T, U> : ViewModel() {
 	val tag : String = javaClass.simpleName
 	abstract fun updateState(uiState : U)
 	abstract fun dispatch(action : T)

servicing/src/main/java/com/za/base/Const.kt

@@ -1,6 +1,6 @@
 package com.za.base
 
-object Const {
+internal object Const {
 	const val Image_Max_length = 1024 * 400L
 	const val faceFileName = "zd_com.dear"
 	const val NetWorkException = 999

servicing/src/main/java/com/za/base/IServicingVm.kt

@@ -12,7 +12,7 @@ import com.za.offline.OfflineManager
 import com.za.offline.OfflineUpdateTaskBean
 import com.za.room.RoomHelper
 
-abstract class IServicingVm<T, U> : BaseVm<T, U>() {
+internal abstract class IServicingVm<T, U> : BaseVm<T, U>() {
 
 	fun getCurrentOrder() : OrderInfo? =
 		GlobalData.currentOrder ?: RoomHelper.db?.orderDao()?.getCurrentOrder()

servicing/src/main/java/com/za/base/NetworkRouteSelectionActivity.kt

@@ -106,7 +106,7 @@ enum class DetectionStatus {
 	ABNORMAL // 异常
 }
 
-class NetworkRouteSelectionActivity : BaseActivity() {
+internal class NetworkRouteSelectionActivity : BaseActivity() {
 	@Composable
 	override fun ContentView() {
 		NetworkRouteScreen(telephonyManager = getSystemService(TELEPHONY_SERVICE) as TelephonyManager,

servicing/src/main/java/com/za/base/PushMessageActivity.kt

@@ -7,7 +7,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.google.gson.Gson
 import com.za.bean.JpushBean
-import com.za.common.GlobalData
 import com.za.common.log.LogUtil
 import com.za.service.PushListener
 import com.za.service.ServiceManager
@@ -82,7 +81,7 @@ open class PushMessageActivity : AppCompatActivity() {
 			currentDialog?.dismiss()
 			currentDialog = null
 		} catch (e : Exception) {
-			LogUtil.print("PushActivityLifecycleCallbacks", "关闭对话框失败: ${e.message}")
+			LogUtil.print("PushMessageActivity", "关闭对话框失败: ${e.message}")
 		}
 	}
 
@@ -91,10 +90,11 @@ open class PushMessageActivity : AppCompatActivity() {
 		internal const val DIALOG_TAG_GIVE_UP = "giveUp"
 
 		private fun sendMessageToMainProcess(context : Context, type : String, message : String) {
-
+			val intent = if (context.packageName == "com.za.rescue.dealer") {
-			// 使用广播将消息发送到主进程
+				Intent(Const.PushMessageType.ACTION_MAIN)
-			val intent = Intent(Const.PushMessageType.ACTION_MAIN.takeIf { GlobalData.isMaster }
+			} else {
-				?: Const.PushMessageType.ACTION_SDK)
+				Intent(Const.PushMessageType.ACTION_SDK)
+			}
 			intent.setPackage(context.packageName)
 			intent.putExtra("type", type)
 			intent.putExtra("message", message)

servicing/src/main/java/com/za/base/view/emptyView.kt

@@ -19,72 +19,48 @@ import coil.compose.AsyncImage
 import com.za.servicing.R
 
 @Composable
-fun EmptyView(
+fun EmptyView(modifier : Modifier = Modifier,
-    modifier: Modifier = Modifier,
+	message : String = "暂无数据",
-    message: String = "暂无数据",
+	imageSize : Pair<Int, Int> = Pair(118, 143),
-    imageSize: Pair<Int, Int> = Pair(118, 143),
+	imageRes : Int = R.drawable.sv_emty_data) {
-    imageRes: Int = R.drawable.sv_emty_data
+	Column(modifier = modifier.fillMaxSize(),
-) {
+		verticalArrangement = Arrangement.Center,
-    Column(
+		horizontalAlignment = Alignment.CenterHorizontally) {
-        modifier = modifier.fillMaxSize(),
+		AsyncImage(model = imageRes,
-        verticalArrangement = Arrangement.Center,
+			contentDescription = message,
-        horizontalAlignment = Alignment.CenterHorizontally
+			modifier = Modifier.size(imageSize.first.dp, imageSize.second.dp))
-    ) {
-        AsyncImage(
-            model = imageRes,
-            contentDescription = message,
-            modifier = Modifier.size(imageSize.first.dp, imageSize.second.dp)
-        )
 
-        Spacer(modifier = Modifier.height(12.dp))
+		Spacer(modifier = Modifier.height(12.dp))
 
-        Text(
+		Text(text = message, color = Color.Gray, fontSize = 14.sp, textAlign = TextAlign.Center)
-            text = message,
+	}
-            color = Color.Gray,
-            fontSize = 14.sp,
-            textAlign = TextAlign.Center
-        )
-    }
 }
 
 @Composable
-fun LoadError(
+fun LoadError(modifier : Modifier = Modifier,
-    modifier: Modifier = Modifier,
+	message : String = "加载出错",
-    message: String = "加载出错",
+	imageSize : Pair<Int, Int> = Pair(118, 143),
-    imageSize: Pair<Int, Int> = Pair(118, 143),
+	onRetry : (() -> Unit)? = null) {
-    onRetry: (() -> Unit)? = null
+	Column(modifier = modifier.fillMaxSize(),
-) {
+		verticalArrangement = Arrangement.Center,
-    Column(
+		horizontalAlignment = Alignment.CenterHorizontally) {
-        modifier = modifier.fillMaxSize(),
+		AsyncImage(model = R.drawable.sv_load_error,
-        verticalArrangement = Arrangement.Center,
+			contentDescription = message,
-        horizontalAlignment = Alignment.CenterHorizontally
+			modifier = Modifier.size(imageSize.first.dp, imageSize.second.dp))
-    ) {
-        AsyncImage(
-            model = R.drawable.sv_load_error,
-            contentDescription = message,
-            modifier = Modifier.size(imageSize.first.dp, imageSize.second.dp)
-        )
 
-        Spacer(modifier = Modifier.height(12.dp))
+		Spacer(modifier = Modifier.height(12.dp))
 
-        Text(
+		Text(text = message, color = Color.Gray, fontSize = 14.sp, textAlign = TextAlign.Center)
-            text = message,
-            color = Color.Gray,
-            fontSize = 14.sp,
-            textAlign = TextAlign.Center
-        )
 
-        if (onRetry != null) {
+		if (onRetry != null) {
-            Spacer(modifier = Modifier.height(16.dp))
+			Spacer(modifier = Modifier.height(16.dp))
 
-            Text(
+			Text(text = "点击重试",
-                text = "点击重试",
+				color = Color(0xFF1BA8F7),
-                color = Color(0xFF1BA8F7),
+				fontSize = 14.sp,
-                fontSize = 14.sp,
+				modifier = Modifier
-                modifier = Modifier
                     .align(Alignment.CenterHorizontally)
-                    .clickable { onRetry() }
+                    .clickable { onRetry() })
-            )
+		}
-        }
+	}
-    }
 }

servicing/src/main/java/com/za/call/CallLogManager.kt

@@ -15,7 +15,7 @@ import com.za.net.RetrofitHelper
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
 
-object CallLogManager {
+internal object CallLogManager {
 	private const val TAG = "CallLogManager"
 	private var lastUploadTime : Long? = null
 		set(value) {

servicing/src/main/java/com/za/common/GlobalData.kt

@@ -12,7 +12,7 @@ import com.za.room.RoomHelper
 import com.za.room.db.user.DriverInfoBean
 import com.za.service.location.ZdLocationManager
 
-object GlobalData : GlobalLocalData() {
+internal object GlobalData : GlobalLocalData() {
 	lateinit var application : Application
 	private val mmkv : MMKV by lazy { MMKV.defaultMMKV() }
 	var activityCount : Int = 0

servicing/src/main/java/com/za/common/ZDManager.kt

@@ -11,6 +11,7 @@ import com.za.service.location.ZdLocationManager
 
 object ZDManager {
 	lateinit var application : Application
+
 	fun init(application : Application, isRelease : Boolean = false) {
 		this.application = application
 		thirdSdkInit(isRelease)
@@ -20,10 +21,17 @@ object ZDManager {
 		GlobalData.application = application
 		MMKV.initialize(application)
 		AppConfig.init(isRelease)
-		Bugly.init(application, "6972a6b56d", true)
+		Bugly.init(application, getBuglyAppId(), true)
 		LogUtil.init(application)
 		RoomHelper.init(application)
 		ZdLocationManager.init(application)
 		SpeechManager.init(application)
 	}
+
+
+	init {
+		System.loadLibrary("config")
+	}
+
+	private external fun getBuglyAppId() : String
 }

servicing/src/main/java/com/za/common/log/LogRetrofitHelper.kt

@@ -10,7 +10,7 @@ import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
 import java.util.concurrent.TimeUnit
 
-object LogRetrofitHelper {
+internal object LogRetrofitHelper {
     private var retrofit: Retrofit? = null
     private var apiService: LogService? = null
     private val loggerInterceptor = HttpLoggingInterceptor {

servicing/src/main/java/com/za/common/log/LogService.kt

@@ -7,7 +7,7 @@ import retrofit2.http.POST
 import retrofit2.http.Part
 import retrofit2.http.Query
 
-interface LogService {
+internal interface LogService {
     //日志上传
     @Multipart
     @POST("/oss/minio/upload")

servicing/src/main/java/com/za/common/log/LogUtil.kt

@@ -32,7 +32,7 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
-object LogUtil {
+internal object LogUtil {
 	private var context : Application? = null
 	private var executors : ExecutorService? = null
 	private var normalLogDirPath : String? = null
@@ -113,6 +113,7 @@ object LogUtil {
 			}
 			LogUtils.getConfig().setFilePrefix(this.vehicleName)
 			LogUtils.e("$tag---$content")
+
 		} catch (e : Exception) {
 			e.printStackTrace()
 		}

servicing/src/main/java/com/za/common/speech/CustomerSpeechManager.kt

@@ -1,122 +0,0 @@
-package com.za.common.speech
-
-import android.media.MediaPlayer
-import com.google.gson.Gson
-import com.google.gson.JsonObject
-import com.za.common.log.LogUtil
-import okhttp3.OkHttpClient
-import okhttp3.ResponseBody
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Call
-import retrofit2.Retrofit
-import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
-import retrofit2.converter.gson.GsonConverterFactory
-import retrofit2.http.Body
-import retrofit2.http.POST
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-
-interface SpeechApiService {
-    @POST("v1/audio/speech")
-    fun textToSpeech(@Body request: JsonObject): Call<ResponseBody>
-}
-
-object CustomerSpeechManager {
-
-    private const val BASE_URL = "http://192.168.3.129:8880/"
-
-    private val gson: Gson by lazy {
-        Gson().newBuilder()
-            .setLenient()
-            .create()
-    }
-
-    private val retrofit: Retrofit by lazy {
-        val loggingInterceptor = HttpLoggingInterceptor().apply {
-            level = HttpLoggingInterceptor.Level.BODY
-        }
-
-        val client = OkHttpClient.Builder()
-            .addInterceptor(loggingInterceptor)
-            .build()
-
-        Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .client(client)
-            .addConverterFactory(GsonConverterFactory.create(gson))
-            .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
-            .build()
-    }
-
-    private val speechApiService: SpeechApiService by lazy {
-        retrofit.create(SpeechApiService::class.java)
-    }
-
-    fun textToSpeech(input: String, destinationFile: File): Boolean {
-        val requestBody = JsonObject().apply {
-            addProperty("input", input)
-            addProperty("voice", "zf_xiaoxiao")
-            addProperty("response_format", "mp3")
-            addProperty("stream", true)
-            addProperty("speed", 1)
-            addProperty("return_download_link", false) // Set to false to get the stream directly
-            addProperty("lang_code", "z")
-        }
-
-        val call = speechApiService.textToSpeech(requestBody)
-        try {
-            val response = call.execute()
-            LogUtil.print("CustomerSpeechManager", "response: $response")
-            if (response.isSuccessful) {
-                val responseBody = response.body()
-                if (responseBody != null) {
-                    saveToFile(responseBody, destinationFile)
-                    playAudio(destinationFile)
-                    return true
-                }
-            } else {
-                LogUtil.print("CustomerSpeechManager", "Request failed: ${response.code()}")
-            }
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-        return false
-    }
-
-    private fun saveToFile(body: ResponseBody, destinationFile: File) {
-        body.byteStream().use {
-            FileOutputStream(destinationFile).buffered().use { outputStream ->
-                val buffer = ByteArray(4096)
-                var bytesRead: Int
-                while (it.read(buffer).also { bytesRead = it } != -1) {
-                    outputStream.write(buffer, 0, bytesRead)
-                }
-            }
-        }
-    }
-
-    private fun playAudio(file: File) {
-        val mediaPlayer = MediaPlayer().apply {
-            try {
-                setDataSource(file.absolutePath)
-                prepare()
-                start()
-            } catch (e: IOException) {
-                e.printStackTrace()
-                release()
-            }
-        }
-
-        mediaPlayer.setOnCompletionListener {
-            it.release()
-        }
-
-        mediaPlayer.setOnErrorListener { mp, what, extra ->
-            mp.release()
-            false
-        }
-    }
-}
-
-

servicing/src/main/java/com/za/common/speech/SpeechManager.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-object SpeechManager {
+internal object SpeechManager {
 	private var mContext : Application? = null
 
 

servicing/src/main/java/com/za/common/speech/TTSManager.kt

@@ -12,7 +12,7 @@ import java.util.Locale
 
 
 @SuppressLint("StaticFieldLeak")
-object TTSManager {
+internal object TTSManager {
 	private var tts : TextToSpeech? = null
 	private var context : Context? = null
 	private var listener : OnTTSListener? = null

servicing/src/main/java/com/za/net/ApiService.kt

@@ -95,7 +95,7 @@ import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.Part
 
-interface ApiService {
+internal interface ApiService {
 
 	//获取车辆列表
 	@POST("/driverApp/supplier/listVehicleNew")
@@ -236,35 +236,35 @@ interface ApiService {
 	@POST("/driverApp/task/getTaskSettlementAndTrace")
 	fun getTaskSettlementAndTrace(@Body info : HistoryDetailRequest) : Observable<BaseResponse<TaskSettlementAndTraceBean>>
 
-	@POST("driverApp/task/updateSettleInfo")
+	@POST("/driverApp/task/updateSettleInfo")
 	fun updateSettleInfo(@Body settleInfoRequest : SettleInfoRequest) : Observable<BaseResponse<String>>
 
 
 	//人脸比对
-	@POST("driverApp/supplier/driverFaceCompare")
+	@POST("/driverApp/supplier/driverFaceCompare")
 	fun driverFaceCompare(@Body driverFaceCompareRequest : DriverFaceCompareRequest) : Observable<BaseResponse<DriverFaceCompareBean>>
 
-	@POST("driverApp/supplier/driverIdentityAuthWeb")
+	@POST("/driverApp/supplier/driverIdentityAuthWeb")
 	fun driverIdentityAuthWeb(@Body request : DriverIdentityAuthWebRequest) : Observable<BaseResponse<DriverIdentityAuthWebBean>>
 
 	//今日保养
-	@POST("driverApp/supplier/getTodayMaintain")
+	@POST("/driverApp/supplier/getTodayMaintain")
 	fun getTodayMaintain(@Body info : TodayMaintainRequest) : Observable<BaseResponse<List<TodayMaintainbean>>>
 
 	//今日保养
-	@POST("driverApp/supplier/uploadTodayMaintain")
+	@POST("/driverApp/supplier/uploadTodayMaintain")
 	fun uploadTodayMaintain(@Body params : TodayMaintainUploadRequest) : Observable<BaseResponse<String>>
 
 	//加油小票识别
-	@POST("driverApp/supplier/recognizeRefuelTicket")
+	@POST("/driverApp/supplier/recognizeRefuelTicket")
 	fun recognizeRefuelTicket(@Body bean : RecognizeRefuelOcrRequestBean?) : Observable<BaseResponse<RecognizeRefuelTicketBean>>
 
 	//提交加油记录
-	@POST("driverApp/supplier/vehicleRefuelSubmit")
+	@POST("/driverApp/supplier/vehicleRefuelSubmit")
 	fun vehicleRefuelSubmit(@Body info : RecognizeRefuelTicketRequestBean?) : Observable<BaseResponse<String>>
 
 	//获取车辆维保记录
-	@POST("driverApp/supplier/v2/getVehicleMaintenanceSubmit")
+	@POST("/driverApp/supplier/v2/getVehicleMaintenanceSubmit")
 	fun getVehicleMaintenanceSubmit(@Body info : FetchVehicleMaintenanceSubmitHistoryRequestBean) : Observable<BaseResponse<VehicleRepairBean>>
 
 	//获取车辆维保详细信息
@@ -272,31 +272,29 @@ interface ApiService {
 	fun getVehicleRepairDetail(@Body info : FetchVehicleMaintenanceSubmitHistoryRequestBean) : Observable<BaseResponse<VehicleRepairBean>>
 
 	//维修地点匹配
-	@POST("driverApp/supplier/v2/vehicleRepairPointMatcherList")
+	@POST("/driverApp/supplier/v2/vehicleRepairPointMatcherList")
 	fun vehicleRepairPointMatcherList(@Body info : VehicleRepairPointMatcherListRequest) : Observable<BaseResponse<List<VehicleRepairPointMatcherItem>>>
 
 	//提交维保记录
-	@POST("driverApp/supplier/v2/vehicleMaintenanceSubmit")
+	@POST("/driverApp/supplier/v2/vehicleMaintenanceSubmit")
 	fun vehicleMaintenanceSubmit(@Body info : VehicleMaintenanceSubmitRequest) : Observable<BaseResponse<String>>
 
 	//获取车辆维修历史
 	@POST("/driverApp/supplier/v2/vehicleMaintenanceList")
 	fun vehicleMaintenanceList(@Body info : FetchVehicleMaintenanceSubmitHistoryRequestBean) : Observable<BaseResponse<List<VehicleMaintenanceHistoryBean>>>
 
-	@POST("driverApp/base/getVoiceUrl")
+	@POST("/driverApp/base/getVoiceUrl")
 	fun getVoiceUrl(@Body info : AppNewOrderVoiceRequest) : Observable<BaseResponse<String>>
 
-	@POST("driverApp/supplier/iaiCompareFace")
+	@POST("/driverApp/supplier/iaiCompareFace")
 	fun iaiCompareFace(@Body info : DriverFaceCompareRequest) : Observable<BaseResponse<IaiCompareFaceBean>>
 
-	@POST("driverApp/task/getTaskNotes")
+	@POST("/driverApp/task/getTaskNotes")
 	fun getTaskNotes(@Body request : TaskNotesRequest) : Observable<BaseResponse<TaskNotesBean>>
 
-	@POST("driverApp/supplier/unifiedOCRWithCompress")
+	@POST("/driverApp/supplier/unifiedOCRWithCompress")
 	fun unifiedOCRWithCompress(@Body request : UnifiedOCRWithCompressRequest) : Observable<BaseResponse<String>>
 
-	@POST("driverApp/v2/user/saveSignature")
+	@POST("/driverApp/v2/user/saveSignature")
 	fun saveSignature(@Body request : SaveSignatureRequest) : Observable<BaseResponse<String>>
-
-
 }

servicing/src/main/java/com/za/net/BaseObserver.kt

@@ -25,7 +25,7 @@ import javax.net.ssl.SSLHandshakeException
 /**
  * Created by DoggieX on 2017/7/26.
  */
-abstract class BaseObserver<T> : Observer<BaseResponse<T>> {
+internal abstract class BaseObserver<T> : Observer<BaseResponse<T>> {
 	override fun onSubscribe(d : Disposable) { //        if (!NetworkUtils.isAvailable()) {
 		//            doFailure(999, "网络无法使用")
 		//            d.dispose()

servicing/src/main/java/com/za/net/CommonMethod.kt

@@ -39,7 +39,7 @@ import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.asRequestBody
 import java.io.File
 
-object CommonMethod {
+internal object CommonMethod {
 	fun uploadGps(uploadGpsRequest : UploadGpsRequest,
 		success : () -> Unit = {},
 		failed : (String?) -> Unit = {}) {

servicing/src/main/java/com/za/net/LocalPhotoTemplateControl.kt

@@ -6,7 +6,7 @@ import com.za.bean.db.order.PhotoTemplateInfo
 import com.za.common.log.LogUtil
 import com.za.servicing.R
 
-object LocalPhotoTemplateControl {
+internal object LocalPhotoTemplateControl {
 
 	fun buildPhotoTemplate(orderInfo : OrderInfo?) : List<PhotoTemplateInfo> {
 		if (orderInfo == null) {

servicing/src/main/java/com/za/net/RequestEncryptInterceptor.java

@@ -26,12 +26,14 @@ import okio.Buffer;
  */
 public class RequestEncryptInterceptor implements Interceptor {
 
-    static final String PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7UM6zdWdBuO0DZZVkxVfJioawUe6qH1p5Uz/qR9zbawl2oWyxxcBfxQyPS+HxOej/ZnyS4bu7qhh99alDqkJzk6g9oGZWs+jEF5GRWt9nChlfUsjvHQwuF2TSQMTdPtDPCByF/QgMFCAfbCqTrNmOETrZ/2GFy1Re0BTlhh6X/XzpzqtK+enikEMlQ5fIM5ljdXgyCnvDou9ptWqzw8Zmsat6LeA0UKz+bgpJAbw6KfK+8lPMqUpNFfkmJuEd5+JQOG9McH7j9pBagohkC6k3Cn92dAf9iD6NSDKSNgt1vxXhaNnfAbYJ5pqeSGy6QMSVO0TXYj4asln5OutD/284QIDAQAB";
-
     @NonNull
     @Override
     public Response intercept(@NonNull Chain chain) throws IOException {
-        Request request = chain.request();
+        return chain.proceed(invoke(chain.request()));
+    }
+
+    private Request invoke(Request req) throws IOException {
+        Request request = req;
         String method = request.method().toLowerCase().trim();
         HttpUrl url = request.url();
         boolean skipEncrypt = url.encodedPath().endsWith("appVersion")
@@ -87,7 +89,7 @@ public class RequestEncryptInterceptor implements Interceptor {
                             || url.encodedPath().endsWith("fastLogin")
                             || url.encodedPath().endsWith("loginWithTask")) {
 
-                        byte[] bytes = RSAUtils.encryptByPublicKey(aesKey.getBytes(StandardCharsets.UTF_8), PUBLIC_KEY);
+                        byte[] bytes = RSAUtils.encryptByPublicKey(aesKey.getBytes(StandardCharsets.UTF_8), getPublicKey());
                         String tokenSecret = Base64.encodeToString(bytes, Base64.NO_WRAP);
                         requestBuilder.addHeader("secret", tokenSecret);
                     } else {
@@ -104,6 +106,10 @@ public class RequestEncryptInterceptor implements Interceptor {
                 }
             }
         }
-        return chain.proceed(request);
+
+        return request;
     }
+
+    private native String getPublicKey();
+
 }

servicing/src/main/java/com/za/net/RetrofitHelper.kt

@@ -1,6 +1,7 @@
 package com.za.net
 
 import com.za.base.AppConfig
+import com.za.common.GlobalData
 import com.za.common.log.LogUtil
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -11,7 +12,7 @@ import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
 import java.util.concurrent.TimeUnit
 
-object RetrofitHelper {
+internal object RetrofitHelper {
 	private var retrofit : Retrofit? = null
 	private var apiService : ApiService? = null
 	private val loggerInterceptor = HttpLoggingInterceptor {
@@ -29,8 +30,9 @@ object RetrofitHelper {
 			if (it.contains("name=\"file\"; filename")) {
 				return@HttpLoggingInterceptor
 			}
-			LogUtil.print("--network--",
+
-				URLDecoder.decode(it.replace(Regex("%(?![0-9a-fA-F]{2})"), ""), "utf-8"))
+//			LogUtil.print("--network--",
+//				URLDecoder.decode(it.replace(Regex("%(?![0-9a-fA-F]{2})"), ""), "utf-8"))
 		} catch (e : UnsupportedEncodingException) {
 			e.printStackTrace()
 		}

servicing/src/main/java/com/za/room/RoomHelper.kt

@@ -10,7 +10,7 @@ import com.za.base.Const
 import com.za.room.db.GlobalRoom
 
 @SuppressLint("StaticFieldLeak")
-object RoomHelper {
+internal object RoomHelper {
     const val VERSION: Int = 43
     private lateinit var mContext: Context
     var db: GlobalRoom? = null

servicing/src/main/java/com/za/room/db/GlobalRoom.kt

@@ -26,7 +26,7 @@ import com.za.room.db.water_marker.WaterMarkerDao
 @Database(entities = [EleWorkOrderBean::class, EleCarDamagePhotoBean::class, LocalResourceBean::class, WaterMarkerTemplateBean::class, WaterMarkerItemBean::class, ChangeBatteryPhoto::class, NewPhotoTemplateBean::class, OrderInfo::class, OfflineUpdateTaskBean::class, PhotoTemplateInfo::class],
 	version = RoomHelper.VERSION,
 	exportSchema = false)
-abstract class GlobalRoom : RoomDatabase() {
+internal abstract class GlobalRoom : RoomDatabase() {
 	abstract fun eleWorkOrderDao() : EleWorkOrderDao
 
 	abstract fun eleCarDamagePhotoDao() : EleCarDamagePhotoDao

servicing/src/main/java/com/za/room/db/ele_work/EleCarDamagePhotoDao.kt

@@ -9,7 +9,7 @@ import androidx.room.Update
 import com.za.bean.db.ele.EleCarDamagePhotoBean
 
 @Dao
-interface EleCarDamagePhotoDao {
+internal interface EleCarDamagePhotoDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE, entity = EleCarDamagePhotoBean::class)
     fun insert(eleCarDamagePhotoBean: EleCarDamagePhotoBean)
 

servicing/src/main/java/com/za/room/db/ele_work/EleWorkOrderDao.kt

@@ -8,7 +8,7 @@ import androidx.room.Update
 import com.za.bean.db.ele.EleWorkOrderBean
 
 @Dao
-interface EleWorkOrderDao {
+internal interface EleWorkOrderDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE, entity = EleWorkOrderBean::class)
     fun insertEleWorkOrder(eleWorkOrderBean: EleWorkOrderBean)
 

servicing/src/main/java/com/za/room/db/order/ChangeBatteryDao.kt

@@ -9,7 +9,7 @@ import com.za.base.Const
 import com.za.bean.db.order.PhotoTemplateInfo
 
 @Dao
-interface ChangeBatteryDao {
+internal interface ChangeBatteryDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE, entity = PhotoTemplateInfo::class)
     fun insert(photoTemplateInfo: PhotoTemplateInfo)

servicing/src/main/java/com/za/room/db/order/OrderDao.kt

@@ -8,7 +8,7 @@ import androidx.room.Update
 import com.za.bean.db.order.OrderInfo
 
 @Dao
-interface OrderDao {
+internal interface OrderDao {
     //更换电瓶照片
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertOrder(orderInfo: OrderInfo)

servicing/src/main/java/com/za/room/db/order/PhotoTemplateDao.kt

@@ -9,7 +9,7 @@ import com.za.base.Const
 import com.za.bean.db.order.PhotoTemplateInfo
 
 @Dao
-interface PhotoTemplateDao {
+internal interface PhotoTemplateDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE, entity = PhotoTemplateInfo::class)
     fun insert(photoTemplateInfo: PhotoTemplateInfo)

servicing/src/main/java/com/za/service/ServiceManager.kt

@@ -35,7 +35,7 @@ interface PushListener {
 
 data class LastJPushBean(val msg : String, val time : Long = System.currentTimeMillis())
 
-object ServiceManager {
+internal object ServiceManager {
 	@Volatile
 	private var pushListener : PushListener? = null
 	private var lastJPushBean : LastJPushBean? = null

servicing/src/main/java/com/za/service/ZdPushServiceReceive.kt

@@ -43,7 +43,7 @@ class ZdPushServiceReceive : BroadcastReceiver() {
 			if (ActivityUtils.getTopActivity() == null) {
 				AppUtils.launchApp(GlobalData.application.packageName)
 			}
-			LogUtil.print("PushActivityLifecycleCallbacks", "收到来自远程进程的消息: $type")
+			LogUtil.print("ZdPushServiceReceive", "收到来自远程进程的消息: $type")
 			when (type) {
 				Const.PushMessageType.BROADCAST -> handleBroadcast("broadcast:$message")
 
@@ -56,7 +56,7 @@ class ZdPushServiceReceive : BroadcastReceiver() {
 							handleGiveUpOrder(activity, jpushBean)
 						}
 					} catch (e : Exception) {
-						LogUtil.print("PushActivityLifecycleCallbacks",
+						LogUtil.print("ZdPushServiceReceive",
 							"处理订单放弃消息失败: ${e.message}")
 					}
 				}
@@ -70,7 +70,7 @@ class ZdPushServiceReceive : BroadcastReceiver() {
 							handleImportantTip(activity, jpushBean)
 						}
 					} catch (e : Exception) {
-						LogUtil.print("PushActivityLifecycleCallbacks",
+						LogUtil.print("ZdPushServiceReceive",
 							"处理重要提示消息失败: ${e.message}")
 					}
 				}
@@ -84,7 +84,7 @@ class ZdPushServiceReceive : BroadcastReceiver() {
 							handleReDispatchOrder(activity, jpushBean)
 						}
 					} catch (e : Exception) {
-						LogUtil.print("PushActivityLifecycleCallbacks",
+						LogUtil.print("ZdPushServiceReceive",
 							"处理订单重新派发消息失败: ${e.message}")
 					}
 				}
@@ -97,7 +97,7 @@ class ZdPushServiceReceive : BroadcastReceiver() {
 							handlerModifyOrder()
 						}
 					} catch (e : Exception) {
-						LogUtil.print("PushActivityLifecycleCallbacks",
+						LogUtil.print("ZdPushServiceReceive",
 							"处理重要提示消息失败: ${e.message}")
 					}
 				}
@@ -110,7 +110,7 @@ class ZdPushServiceReceive : BroadcastReceiver() {
 							handleRevokeOrder(activity)
 						}
 					} catch (e : Exception) {
-						LogUtil.print("PushActivityLifecycleCallbacks",
+						LogUtil.print("ZdPushServiceReceive",
 							"处理订单撤回消息失败: ${e.message}")
 					}
 				}
@@ -124,7 +124,7 @@ class ZdPushServiceReceive : BroadcastReceiver() {
 							handeReportMessage(jpushBean = jpushBean)
 						}
 					} catch (e : Exception) {
-						LogUtil.print("PushActivityLifecycleCallbacks",
+						LogUtil.print("ZdPushServiceReceive",
 							"处理重要提示消息失败: ${e.message}")
 					}
 				}

servicing/src/main/java/com/za/service/location/ZdLocationManager.kt

@@ -32,7 +32,7 @@ import kotlin.math.sin
 import kotlin.math.sqrt
 
 @SuppressLint("StaticFieldLeak")
-object ZdLocationManager : AMapLocationListener {
+internal object ZdLocationManager : AMapLocationListener {
 	private const val TAG = "ZdLocationManager"
 	private var aMapLocationClient : AMapLocationClient? = null
 	private var context : Context? = null

servicing/src/main/java/com/za/service/mqtt/MqttConfig.kt

@@ -1,11 +1,18 @@
 package com.za.service.mqtt
 
 object MqttConfig {
-    const val INSTANCE_ID = "mqtt-cn-oew23jbkb1f"
+	val INSTANCE_ID = getMqttInstanceId()
-    const val END_POINT = "mqtt-cn-oew23jbkb1f.mqtt.aliyuncs.com"
+	val END_POINT = getMqttEndpoint()
-    const val ACCESS_KEY = "LTAI5tKgZ9ACKorXzzWLxgg7"
+	val ACCESS_KEY = getMqttAccessKey()
-    const val SECRET_KEY = "D04F0UH2GzrDsYaJ9GTfULGPjcsvvz"
+	val SECRET_KEY = getMqttSecretKey()
-    const val GROUP_ID = "GID_ZDJY"
+	val GROUP_ID = getMqttGroupId()
-    const val TOPIC_PREFIX = "pushBaseTopic/p2p"
+	val TOPIC_PREFIX = getMqttTopicPrefix()
-    const val QOS_LEVEL = 0
+	const val QOS_LEVEL = 0
+
+	external fun getMqttInstanceId() : String
+	external fun getMqttEndpoint() : String
+	external fun getMqttAccessKey() : String
+	external fun getMqttSecretKey() : String
+	external fun getMqttGroupId() : String
+	external fun getMqttTopicPrefix() : String
 }

servicing/src/main/java/com/za/service/mqtt/MyMqttClient.kt

@@ -1,16 +1,16 @@
 package com.za.service.mqtt
 
 import android.annotation.SuppressLint
+import android.os.Handler
+import android.os.Looper
 import com.za.common.GlobalData
 import com.za.common.log.LogUtil
 import com.za.common.util.DeviceUtil
 import com.za.common.util.Tools.macSignature
 import com.za.service.ServiceManager
-import org.eclipse.paho.android.service.MqttAndroidClient
-import org.eclipse.paho.client.mqttv3.IMqttActionListener
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken
-import org.eclipse.paho.client.mqttv3.IMqttToken
+import org.eclipse.paho.client.mqttv3.MqttCallbackExtended
-import org.eclipse.paho.client.mqttv3.MqttCallback
+import org.eclipse.paho.client.mqttv3.MqttClient
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions
 import org.eclipse.paho.client.mqttv3.MqttException
 import org.eclipse.paho.client.mqttv3.MqttMessage
@@ -23,35 +23,45 @@ object MyMqttClient {
 	private lateinit var topic : String
 
 	@SuppressLint("StaticFieldLeak")
-	private var mqttClient : MqttAndroidClient? = null
+	private var mqttClient : MqttClient? = null
 
 	fun initialize(deviceId : String?) {
 		clientId = "${MqttConfig.GROUP_ID}@@@$deviceId"
 		topic = "${MqttConfig.TOPIC_PREFIX}/$clientId"
-		mqttClient = MqttAndroidClient(GlobalData.application,
+		mqttClient = MqttClient("tcp://${MqttConfig.END_POINT}:1883", clientId, MemoryPersistence())
-			"tcp://${MqttConfig.END_POINT}:1883",
-			clientId,
-			MemoryPersistence())
 		setupMqttCallbacks()
 		connect()
 		LogUtil.print("MyMqttClient ", "initialize success")
 	}
 
 	private fun setupMqttCallbacks() {
-		mqttClient?.setCallback(object : MqttCallback {
+		mqttClient?.setCallback(object : MqttCallbackExtended {
-
+			override fun connectComplete(reconnect : Boolean, serverURI : String?) {
-			override fun connectionLost(throwable : Throwable) {
+				Handler(Looper.getMainLooper()).post {
-				LogUtil.print("MyMqttClient ",
+					isConnecting = false
-					"Connection lost: ${throwable.message}") //				connect()
+					LogUtil.print("MyMqttClient ", "connect success==")
+					subscribeTopic()
+				}
 			}
 
-			override fun messageArrived(topic : String, mqttMessage : MqttMessage) {
+			override fun connectionLost(cause : Throwable?) {
-				val message = String(mqttMessage.payload)
+				isConnecting = false
-				LogUtil.print("MyMqttClient ", "Message arrived: $message")
+				LogUtil.print("MyMqttClient ", "Connection lost: ${cause?.message}")
-				ServiceManager.handlerPushMsg(message)
 			}
 
-			override fun deliveryComplete(token : IMqttDeliveryToken) {
+			override fun messageArrived(topic : String?, message : MqttMessage?) {
+				if (message == null) {
+					LogUtil.print("MyMqttClient ", "Message arrived: null")
+					return
+				}
+				Handler(Looper.getMainLooper()).post {
+					val message = String(message.payload)
+					LogUtil.print("MyMqttClient ", "Message arrived: $message")
+					ServiceManager.handlerPushMsg(message)
+				}
+			}
+
+			override fun deliveryComplete(token : IMqttDeliveryToken?) {
 				LogUtil.print("MyMqttClient ", "Message delivery complete")
 			}
 		})
@@ -78,19 +88,7 @@ object MyMqttClient {
 			mqttConnectOption.maxReconnectDelay = 30 * 1000
 			mqttConnectOption.mqttVersion = MqttConnectOptions.MQTT_VERSION_3_1_1
 			mqttConnectOption.connectionTimeout = 30
-
+			mqttClient?.connect(mqttConnectOption)
-			mqttClient?.connect(mqttConnectOption, null, object : IMqttActionListener {
-				override fun onSuccess(asyncActionToken : IMqttToken?) {
-					isConnecting = false
-					LogUtil.print("MyMqttClient ", "connect success==")
-					subscribeTopic()
-				}
-
-				override fun onFailure(asyncActionToken : IMqttToken?, exception : Throwable?) {
-					isConnecting = false
-					LogUtil.print("MyMqttClient ", "connect failed== ${exception?.message}")
-				}
-			})
 		} catch (e : MqttException) {
 			LogUtil.print("MyMqttClient ", "Connection failed2: ${e.message}")
 		}
@@ -99,7 +97,6 @@ object MyMqttClient {
 
 	//检测mqtt连接状态
 	fun publishMessage() {
-
 		if (mqttClient == null) {
 			initialize(deviceId = DeviceUtil.getAndroidId(GlobalData.application))
 			return
@@ -117,19 +114,8 @@ object MyMqttClient {
 	private fun subscribeTopic() {
 		try {
 			if (mqttClient?.isConnected == true) {
-				mqttClient?.subscribe(topic,
+				mqttClient?.subscribe(topic, MqttConfig.QOS_LEVEL)
-					MqttConfig.QOS_LEVEL,
+				LogUtil.print("MyMqttClient ", "mqtt subscribe $topic	")
-					null,
-					object : IMqttActionListener {
-						override fun onSuccess(asyncActionToken : IMqttToken?) {
-							LogUtil.print("MyMqttClient ", "Subscribed to topic: $topic")
-						}
-
-						override fun onFailure(asyncActionToken : IMqttToken?,
-							exception : Throwable) {
-							LogUtil.print("MyMqttClient ", "Subscribe failed: ${exception.message}")
-						}
-					})
 			} else {
 				LogUtil.print("MyMqttClient ", "Cannot subscribe: MQTT client is not connected")
 			}
@@ -141,15 +127,7 @@ object MyMqttClient {
 	fun disconnect() {
 		try {
 			if (mqttClient?.isConnected == true) {
-				mqttClient?.disconnect(null, object : IMqttActionListener {
+				mqttClient?.disconnect()
-					override fun onSuccess(asyncActionToken : IMqttToken?) {
-						LogUtil.print("MyMqttClient ", "Disconnected")
-					}
-
-					override fun onFailure(asyncActionToken : IMqttToken?, exception : Throwable) {
-						LogUtil.print("MyMqttClient ", "Disconnect failed")
-					}
-				})
 			}
 		} catch (e : MqttException) {
 			LogUtil.print("MyMqttClient ", "Disconnect failed: ${e.message}")

servicing/src/main/java/com/za/ui/h5/CommonH5Activity.kt

@@ -41,7 +41,7 @@ import com.za.common.log.LogUtil
 import com.za.ext.finish
 import com.za.servicing.R
 
-class CommonH5Activity : BaseActivity() {
+internal class CommonH5Activity : BaseActivity() {
 	private var webView : WebView? = null
 	private var isDestroyed = false
 

servicing/src/main/java/com/za/ui/main/ServicingMainActivity.kt

@@ -136,11 +136,12 @@ class ServicingMainActivity : BaseActivity() {
 		})
 	}
 
-	fun sendMessageToMainProcess(context : Context,
+	fun sendMessageToMainProcess(context : Context, type : String, message : String) {
-		type : String,
+		val intent = if (context.packageName == "com.za.rescue.dealer") {
-		message : String) {        // 使用广播将消息发送到主进程
+			Intent(Const.PushMessageType.ACTION_MAIN)
-		val intent = Intent(Const.PushMessageType.ACTION_MAIN.takeIf { GlobalData.isMaster }
+		} else {
-			?: Const.PushMessageType.ACTION_SDK)
+			Intent(Const.PushMessageType.ACTION_SDK)
+		}
 		intent.setPackage(context.packageName)
 		intent.putExtra("type", type)
 		intent.putExtra("message", message)

servicing/src/main/java/com/za/ui/main/ServicingMainVm.kt

@@ -15,7 +15,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class ServicingMainVm : BaseVm<ServicingMainVm.Action, ServicingMainVm.UiState>() {
+internal class ServicingMainVm : BaseVm<ServicingMainVm.Action, ServicingMainVm.UiState>() {
 
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
@@ -87,6 +87,9 @@ class ServicingMainVm : BaseVm<ServicingMainVm.Action, ServicingMainVm.UiState>(
 						return
 					}
 					GlobalData.token = it.token
+					GlobalData.driverId = it.userId
+					GlobalData.vehicleId = it.vehicleId
+					GlobalData.deviceId = deviceId
 					CommonMethod.getGenerateInfo(success = { success() },
 						failed = { failure(it ?: "") })
 				}

servicing/src/main/java/com/za/ui/map_search/MapSearchActivity.kt

@@ -68,277 +68,252 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class MapSearchActivity : BaseActivity() {
-    @SuppressLint("MissingPermission")
+	@SuppressLint("MissingPermission")
-    @Composable
+	@Composable
-    override fun ContentView() {
+	override fun ContentView() {
-        MapSearchScreen(onLocationSelected = ::onLocationSelected)
+		MapSearchScreen(onLocationSelected = ::onLocationSelected)
-    }
+	}
 
-    private fun onLocationSelected(poiData: PoiData) {
+	private fun onLocationSelected(poiData : PoiData) {
-        val intent = Intent()
+		val intent = Intent()
-        intent.putExtra("poiData", poiData)
+		intent.putExtra("poiData", poiData)
-        setResult(RESULT_OK, intent)
+		setResult(RESULT_OK, intent)
-        finish()
+		finish()
-    }
+	}
 }
 
 @SuppressLint("MissingPermission")
 @Composable
-fun MapSearchScreen(onLocationSelected: (PoiData) -> Unit) {
+fun MapSearchScreen(onLocationSelected : (PoiData) -> Unit) {
-    val context = LocalContext.current
+	val context = LocalContext.current
-    val scope = rememberCoroutineScope()
+	val scope = rememberCoroutineScope()
-    var searchText by remember { mutableStateOf("") }
+	var searchText by remember { mutableStateOf("") }
-    var selectLatLng by remember { mutableStateOf(LatLonPoint(0.0, 0.0)) }
+	var selectLatLng by remember { mutableStateOf(LatLonPoint(0.0, 0.0)) }
-    var mapInitialized by remember { mutableStateOf(false) }
+	var mapInitialized by remember { mutableStateOf(false) }
-    val mapView = remember { MapView(context) } // Remember the MapView instance
+	val mapView = remember { MapView(context) } // Remember the MapView instance
-    var locationClient: AMapLocationClient? by remember { mutableStateOf(null) }
+	var locationClient : AMapLocationClient? by remember { mutableStateOf(null) }
-    var isLoading by remember { mutableStateOf(false) }
+	var isLoading by remember { mutableStateOf(false) }
-    var errorMessage by remember { mutableStateOf<String?>(null) }
+	var errorMessage by remember { mutableStateOf<String?>(null) }
-    var searchResults by remember { mutableStateOf<List<PoiItem>>(emptyList()) }
+	var searchResults by remember { mutableStateOf<List<PoiItem>>(emptyList()) }
 
-    // Permission handling
+	// Permission handling
-    val locationPermissionGranted = remember { mutableStateOf(false) }
+	val locationPermissionGranted = remember { mutableStateOf(false) }
-    val locationPermissionLauncher = rememberLauncherForActivityResult(
+	val locationPermissionLauncher =
-        ActivityResultContracts.RequestPermission()
+		rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted : Boolean ->
-    ) { isGranted: Boolean ->
+			locationPermissionGranted.value = isGranted
-        locationPermissionGranted.value = isGranted
+		}
-    }
 
-    // Check if location permission is granted
+	// Check if location permission is granted
-    val checkPermission = {
+	val checkPermission = {
-        if (ContextCompat.checkSelfPermission(
+		if (ContextCompat.checkSelfPermission(context,
-                context,
+				Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-                Manifest.permission.ACCESS_FINE_LOCATION
+		) {
-            ) == PackageManager.PERMISSION_GRANTED
+			locationPermissionGranted.value = true
-        ) {
+		} else {
-            locationPermissionGranted.value = true
+			locationPermissionLauncher.launch(Manifest.permission.ACCESS_FINE_LOCATION)
-        } else {
+		}
-            locationPermissionLauncher.launch(Manifest.permission.ACCESS_FINE_LOCATION)
+	}
-        }
-    }
 
-    errorMessage?.let { message ->
+	errorMessage?.let { message ->
-        Snackbar(
+		Snackbar(action = {
-            action = {
+			Button(onClick = { errorMessage = null }) {
-                Button(onClick = { errorMessage = null }) {
+				Text("关闭")
-                    Text("关闭")
+			}
-                }
+		}, modifier = Modifier.padding(8.dp)) {
-            },
+			Text(message)
-            modifier = Modifier.padding(8.dp)
+		}
-        ) {
+	}
-            Text(message)
-        }
-    }
 
-    LaunchedEffect(key1 = Unit) {
+	LaunchedEffect(key1 = Unit) {
-        checkPermission()
+		checkPermission()
-    }
+	}
 
-    LaunchedEffect(key1 = locationPermissionGranted.value) {
+	LaunchedEffect(key1 = locationPermissionGranted.value) {
-        if (locationPermissionGranted.value) {
+		if (locationPermissionGranted.value) {
-            locationClient = AMapLocationClient(context).apply {
+			locationClient = AMapLocationClient(context).apply {
-                setLocationOption(AMapLocationClientOption().apply {
+				setLocationOption(AMapLocationClientOption().apply {
-                    isOnceLocation = true // Only need the location once
+					isOnceLocation = true // Only need the location once
-                    isNeedAddress = true
+					isNeedAddress = true
-                })
+				})
-                setLocationListener { location ->
+				setLocationListener { location ->
-                    if (location != null) {
+					if (location != null) {
-                        val latLng = LatLng(location.latitude, location.longitude)
+						val latLng = LatLng(location.latitude, location.longitude)
-                        selectLatLng = LatLonPoint(location.latitude, location.longitude)
+						selectLatLng = LatLonPoint(location.latitude, location.longitude)
-                        scope.launch {
+						scope.launch {
-                            val address = reverseGeocode(context, selectLatLng)
+							val address = reverseGeocode(context, selectLatLng)
-                            searchText = address
+							searchText = address
-                        }
+						}
-                        mapView.map.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 15f))
+						mapView.map.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 15f))
-                    } else {
+					} else {
-                        Log.e("MapSearchScreen", "Location failed")
+						Log.e("MapSearchScreen", "Location failed")
-                        errorMessage = "位置获取失败"
+						errorMessage = "位置获取失败"
-                    }
+					}
-                    locationClient?.apply {
+					locationClient?.apply {
-                        stopLocation() // 停止位置更新
+						stopLocation() // 停止位置更新
-                        onDestroy() // 销毁位置客户端
+						onDestroy() // 销毁位置客户端
-                    }
+					}
-                    locationClient = null
+					locationClient = null
-                }
+				}
-                startLocation()
+				startLocation()
-            }
+			}
-        } else {
+		} else {
-            Log.e("MapSearchScreen", "Location permission not granted")
+			Log.e("MapSearchScreen", "Location permission not granted")
-            errorMessage = "位置权限未授予"
+			errorMessage = "位置权限未授予"
-        }
+		}
-    }
+	}
 
-    DisposableEffect(key1 = mapView) {
+	DisposableEffect(key1 = mapView) {
-        onDispose {
+		onDispose {
-            locationClient?.onDestroy()
+			locationClient?.onDestroy()
-            mapView.onDestroy()
+			mapView.onDestroy()
-        }
+		}
-    }
+	}
 
-    Scaffold(
+	Scaffold(topBar = {
-        topBar = {
+		HeadView(title = "地图选点", onBack = { context.finish() })
-            HeadView(title = "地图选点", onBack = { context.finish() })
+	}) { paddingValues ->
-        }
+		Column(modifier = Modifier
-    ) { paddingValues ->
+			.fillMaxSize()
-        Column(
+			.padding(paddingValues)
-            modifier = Modifier
+			.padding(16.dp)
-                .fillMaxSize()
+			.verticalScroll(state = rememberScrollState())) {
-                .padding(paddingValues)
+			Card(modifier = Modifier
-                .padding(16.dp)
+				.fillMaxWidth()
-                .verticalScroll(state = rememberScrollState())
+				.padding(bottom = 16.dp)) {
-        ) {
+				Column(modifier = Modifier.padding(16.dp)) {
-            Card(
+					TextField(value = searchText,
-                modifier = Modifier
+						onValueChange = { searchText = it },
-                    .fillMaxWidth()
+						label = { Text("搜索地址") },
-                    .padding(bottom = 16.dp)
+						keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-            ) {
+						modifier = Modifier.fillMaxWidth())
-                Column(
+					Spacer(modifier = Modifier.height(8.dp))
-                    modifier = Modifier.padding(16.dp)
+					Button(onClick = {
-                ) {
+						if (searchText.isNotBlank()) {
-                    TextField(
+							isLoading = true
-                        value = searchText,
+							errorMessage = null
-                        onValueChange = { searchText = it },
+							searchResults = emptyList() // Clear previous results
-                        label = { Text("搜索地址") },
+							scope.launch {
-                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+								val results = searchPoi(context, searchText)
-                        modifier = Modifier.fillMaxWidth()
+								searchResults = results
-                    )
+								isLoading = false
-                    Spacer(modifier = Modifier.height(8.dp))
+							}
-                    Button(
+						} else {
-                        onClick = {
+							errorMessage = "请输入地址"
-                            if (searchText.isNotBlank()) {
+						}
-                                isLoading = true
+					}, modifier = Modifier.fillMaxWidth()) {
-                                errorMessage = null
+						Text("搜索")
-                                searchResults = emptyList() // Clear previous results
+					}
-                                scope.launch {
+				}
-                                    val results = searchPoi(context, searchText)
+			}
-                                    searchResults = results
+			if (isLoading) {
-                                    isLoading = false
+				CircularProgressIndicator(modifier = Modifier.align(Alignment.CenterHorizontally))
-                                }
+			}
-                            } else {
+			if (searchResults.isNotEmpty()) {
-                                errorMessage = "请输入地址"
+				LazyColumn(modifier = Modifier
-                            }
+					.fillMaxWidth()
-                        },
+					.height(180.dp)
-                        modifier = Modifier.fillMaxWidth()
+					.padding(bottom = 16.dp)) {
-                    ) {
+					items(items = searchResults) {
-                        Text("搜索")
+						Box(modifier = Modifier
-                    }
+							.fillMaxWidth()
-                }
+							.clickable {
-            }
+								selectLatLng = it.latLonPoint
-            if (isLoading) {
+								searchText = it.title
-                CircularProgressIndicator(
+							}
-                    modifier = Modifier.align(Alignment.CenterHorizontally)
+							.padding(5.dp)) {
-                )
+							Text(it.title, color = Color.Black)
-            }
+						}
-            if (searchResults.isNotEmpty()) {
+					}
-                LazyColumn(
+				}
-                    modifier = Modifier
+			} // Wrap MapView with AndroidView
-                        .fillMaxWidth()
+			AndroidView(factory = {
-                        .height(180.dp)
+				mapView.apply {
-                        .padding(bottom = 16.dp)
+					onCreate(null)
-                ) {
+					onResume()
-                    items(items = searchResults) {
+				}
-                        Box(modifier = Modifier
+			}, update = {
-                            .fillMaxWidth()
+				it.map.setOnMapClickListener { latLng ->
-                            .clickable {
+					selectLatLng = LatLonPoint(latLng.latitude, latLng.longitude)
-                                selectLatLng = it.latLonPoint
+					scope.launch {
-                                searchText = it.title
+						val address = reverseGeocode(context, selectLatLng)
-                            }
+						searchText = address
-                            .padding(5.dp)) {
+					}
-                            Text(it.title, color = Color.Black)
+				}
-                        }
+				if (! mapInitialized) {
-                    }
+					mapInitialized = true
-                }
+				}
-            }
+			}, modifier = Modifier
-            // Wrap MapView with AndroidView
+				.fillMaxWidth()
-            AndroidView(
+				.height(300.dp))
-                factory = {
-                    mapView.apply {
-                        onCreate(null)
-                        onResume()
-                    }
-                },
-                update = {
-                    it.map.setOnMapClickListener { latLng ->
-                        selectLatLng = LatLonPoint(latLng.latitude, latLng.longitude)
-                        scope.launch {
-                            val address = reverseGeocode(context, selectLatLng)
-                            searchText = address
-                        }
-                    }
-                    if (!mapInitialized) {
-                        mapInitialized = true
-                    }
-                },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(300.dp)
-            )
 
-            Spacer(modifier = Modifier.height(20.dp))
+			Spacer(modifier = Modifier.height(20.dp))
 
-            CommonButton(text = "确定") {
+			CommonButton(text = "确定") {
-                onLocationSelected(PoiData(name = searchText, lat = selectLatLng.latitude, lng = selectLatLng.longitude))
+				onLocationSelected(PoiData(name = searchText,
-            }
+					lat = selectLatLng.latitude,
-        }
+					lng = selectLatLng.longitude))
-    }
+			}
+		}
+	}
 }
 
-private suspend fun searchPoi(context: Context, query: String): List<PoiItem> {
+private suspend fun searchPoi(context : Context, query : String) : List<PoiItem> {
-    return suspendCoroutine { continuation ->
+	return suspendCoroutine { continuation ->
-        val poiSearchQuery = PoiSearch.Query(query, "", "") // 第二个参数是城市代码，留空表示全国搜索
+		val poiSearchQuery = PoiSearch.Query(query, "", "") // 第二个参数是城市代码，留空表示全国搜索
-        poiSearchQuery.pageNum = 0
+		poiSearchQuery.pageNum = 0
-        poiSearchQuery.pageSize = 10
+		poiSearchQuery.pageSize = 10
-        val poiSearch = PoiSearch(context, poiSearchQuery)
+		val poiSearch = PoiSearch(context, poiSearchQuery)
 
-        poiSearch.setOnPoiSearchListener(object : PoiSearch.OnPoiSearchListener {
+		poiSearch.setOnPoiSearchListener(object : PoiSearch.OnPoiSearchListener {
-            override fun onPoiSearched(result: PoiResult?, rCode: Int) {
+			override fun onPoiSearched(result : PoiResult?, rCode : Int) {
-                if (rCode == AMapException.CODE_AMAP_SUCCESS) {
+				if (rCode == AMapException.CODE_AMAP_SUCCESS) {
-                    val pois = result?.pois ?: emptyList()
+					val pois = result?.pois ?: emptyList()
-                    continuation.resume(pois)
+					continuation.resume(pois)
-                } else {
+				} else {
-                    Log.e("MapSearchScreen", "POI 搜索失败：$rCode")
+					Log.e("MapSearchScreen", "POI 搜索失败：$rCode")
-                    continuation.resume(emptyList())
+					continuation.resume(emptyList())
-                }
+				}
-            }
+			}
 
-            override fun onPoiItemSearched(poiItem: PoiItem?, rCode: Int) {
+			override fun onPoiItemSearched(poiItem : PoiItem?,
-                // Not used in this case
+				rCode : Int) { // Not used in this case
-            }
+			}
-        })
+		})
 
-        poiSearch.searchPOIAsyn()
+		poiSearch.searchPOIAsyn()
-    }
+	}
 }
 
-private suspend fun reverseGeocode(context: Context, latLng: LatLonPoint): String {
+private suspend fun reverseGeocode(context : Context, latLng : LatLonPoint) : String {
-    return suspendCoroutine { continuation ->
+	return suspendCoroutine { continuation ->
-        val geocodeSearch = GeocodeSearch(context)
+		val geocodeSearch = GeocodeSearch(context)
-        geocodeSearch.setOnGeocodeSearchListener(object : GeocodeSearch.OnGeocodeSearchListener {
+		geocodeSearch.setOnGeocodeSearchListener(object : GeocodeSearch.OnGeocodeSearchListener {
-            override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
+			override fun onRegeocodeSearched(result : RegeocodeResult?, rCode : Int) {
-                if (rCode == AMapException.CODE_AMAP_SUCCESS) {
+				if (rCode == AMapException.CODE_AMAP_SUCCESS) {
-                    val address = result?.regeocodeAddress?.formatAddress
+					val address = result?.regeocodeAddress?.formatAddress
-                    continuation.resume(address ?: "")
+					continuation.resume(address ?: "")
-                } else {
+				} else {
-                    Log.e("MapSearchScreen", "Reverse Geocode failed: $rCode")
+					Log.e("MapSearchScreen", "Reverse Geocode failed: $rCode")
-                    continuation.resume("")
+					continuation.resume("")
-                }
+				}
-            }
+			}
 
-            override fun onGeocodeSearched(result: GeocodeResult?, rCode: Int) {
+			override fun onGeocodeSearched(result : GeocodeResult?,
-                // Not used in reverse geocoding
+				rCode : Int) { // Not used in reverse geocoding
-            }
+			}
-        })
+		})
 
-        // Perform Reverse Geocoding (LatLng -> address)
+		// Perform Reverse Geocoding (LatLng -> address)
-        val query = com.amap.api.services.geocoder.RegeocodeQuery(latLng, 200f, GeocodeSearch.AMAP)
+		val query = com.amap.api.services.geocoder.RegeocodeQuery(latLng, 200f, GeocodeSearch.AMAP)
-        geocodeSearch.getFromLocationAsyn(query) // Use the async version
+		geocodeSearch.getFromLocationAsyn(query) // Use the async version
-    }
+	}
 }
 
-data class PoiData(val name: String? = null, val lat: Double? = null, val lng: Double? = null) : Serializable
+data class PoiData(val name : String? = null, val lat : Double? = null, val lng : Double? = null) :
+	Serializable
 
 @Preview
 @Composable
 fun PreviewMapSearchScreen() {
-    MapSearchScreen(onLocationSelected = {})
+	MapSearchScreen(onLocationSelected = {})
 }

servicing/src/main/java/com/za/ui/new_order/NewOrderActivity.kt

@@ -74,7 +74,7 @@ import com.za.ext.finish
 import com.za.servicing.R
 import com.za.ui.servicing.in_servicing_setting.OrderTaskNotesDialog
 
-class NewOrderActivity : BaseActivity() {
+internal class NewOrderActivity : BaseActivity() {
 
 	@Composable
 	override fun ContentView() {

servicing/src/main/java/com/za/ui/new_order/NewOrderItemView.kt

@@ -89,7 +89,7 @@ data class NewOrderItemUIBean(
 
 // 1 服务中  2 历史订单
 @Composable
-fun NewOrderItem(uiBean : NewOrderItemUIBean?,
+internal fun NewOrderItem(uiBean : NewOrderItemUIBean?,
 	goInServicing : () -> Unit = {},
 	goHistory : () -> Unit = {},
 	goDetail : () -> Unit = {},

servicing/src/main/java/com/za/ui/new_order/NewOrderVm.kt

@@ -34,7 +34,7 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
-class NewOrderVm : BaseVm<NewOrderVm.Action, NewOrderVm.UiState>() {
+internal class NewOrderVm : BaseVm<NewOrderVm.Action, NewOrderVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 

servicing/src/main/java/com/za/ui/order_report/HistoryReportActivity.kt

@@ -42,7 +42,7 @@ import com.za.base.view.EmptyView
 import com.za.base.view.HeadView
 import com.za.ext.finish
 
-class HistoryReportActivity : BaseActivity() {
+internal class HistoryReportActivity : BaseActivity() {
 	@Composable
 	override fun ContentView() {
 		HistoryReportScreen()
@@ -50,7 +50,7 @@ class HistoryReportActivity : BaseActivity() {
 }
 
 @Composable
-fun HistoryReportScreen(vm : HistoryReportVm = viewModel()) {
+internal fun HistoryReportScreen(vm : HistoryReportVm = viewModel()) {
 	val uiState by vm.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
 	val lifecycleOwner = LocalLifecycleOwner.current

servicing/src/main/java/com/za/ui/order_report/HistoryReportVm.kt

@@ -13,42 +13,41 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
-class HistoryReportVm : BaseVm<HistoryReportVm.Action, HistoryReportVm.UiState>() {
+internal class HistoryReportVm : BaseVm<HistoryReportVm.Action, HistoryReportVm.UiState>() {
-    private val _uiState = MutableStateFlow(UiState())
+	private val _uiState = MutableStateFlow(UiState())
-    val uiState get() = _uiState.asStateFlow()
+	val uiState get() = _uiState.asStateFlow()
 
-    override fun updateState(uiState: UiState) {
+	override fun updateState(uiState : UiState) {
-        _uiState.value = uiState
+		_uiState.value = uiState
-    }
+	}
 
-    override fun dispatch(action: Action) {
+	override fun dispatch(action : Action) {
-        when (action) {
+		when (action) {
-            Action.Init -> init()
+			Action.Init -> init()
-        }
+		}
-    }
+	}
 
-    private fun init() {
+	private fun init() {
-        LoadingManager.showLoading()
+		LoadingManager.showLoading()
-        val request = ReportHistoryRequest(taskId = "${GlobalData.currentOrder?.taskId}")
+		val request = ReportHistoryRequest(taskId = "${GlobalData.currentOrder?.taskId}")
-        RetrofitHelper.getDefaultService().getReportHistory(request)
+		RetrofitHelper.getDefaultService().getReportHistory(request).subscribeOn(Schedulers.io())
-            .subscribeOn(Schedulers.io())
+			.observeOn(AndroidSchedulers.mainThread())
-            .observeOn(AndroidSchedulers.mainThread())
+			.subscribe(object : BaseObserver<List<ReportHistoryBean>>() {
-            .subscribe(object : BaseObserver<List<ReportHistoryBean>>() {
+				override fun doSuccess(it : List<ReportHistoryBean>?) {
-                override fun doSuccess(it: List<ReportHistoryBean>?) {
+					LoadingManager.hideLoading()
-                    LoadingManager.hideLoading()
+					updateState(uiState.value.copy(historyReportList = it))
-                    updateState(uiState.value.copy(historyReportList = it))
+				}
-                }
 
-                override fun doFailure(code: Int, msg: String?) {
+				override fun doFailure(code : Int, msg : String?) {
-                    LoadingManager.hideLoading()
+					LoadingManager.hideLoading()
-                    ToastUtils.showLong(msg)
+					ToastUtils.showLong(msg)
-                }
+				}
-            })
+			})
-    }
+	}
 
-    data class UiState(val historyReportList: List<ReportHistoryBean>? = null)
+	data class UiState(val historyReportList : List<ReportHistoryBean>? = null)
 
-    sealed class Action {
+	sealed class Action {
-        data object Init : Action()
+		data object Init : Action()
-    }
+	}
 }

servicing/src/main/java/com/za/ui/order_report/OrderReportActivity.kt

@@ -44,7 +44,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -61,7 +60,7 @@ import com.za.ui.map_search.MapSearchActivity
 import com.za.ui.map_search.PoiData
 import kotlinx.coroutines.launch
 
-class OrderReportActivity : BaseActivity() {
+internal class OrderReportActivity : BaseActivity() {
     @Composable
     override fun ContentView() {
         OrderReportScreen()
@@ -73,7 +72,7 @@ private val TextGrey = Color(0xFF5F6368)
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun OrderReportScreen(vm: OrderReportVm = viewModel()) {
+internal fun OrderReportScreen(vm: OrderReportVm = viewModel()) {
     val uiState by vm.uiState.collectAsStateWithLifecycle()
     val scaffoldState = rememberBottomSheetScaffoldState()
     val scope = rememberCoroutineScope()
@@ -202,9 +201,3 @@ fun OrderReportScreen(vm: OrderReportVm = viewModel()) {
         }
     }
 }
-
-@Preview
-@Composable
-fun OrderReportPreview(modifier: Modifier = Modifier) {
-    OrderReportScreen()
-}

servicing/src/main/java/com/za/ui/order_report/OrderReportVm.kt

@@ -14,7 +14,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
-class OrderReportVm : BaseVm<OrderReportVm.Action, OrderReportVm.UiState>() {
+internal class OrderReportVm : BaseVm<OrderReportVm.Action, OrderReportVm.UiState>() {
     private val _uiState = MutableStateFlow(UiState())
     val uiState get() = _uiState.asStateFlow()
 

servicing/src/main/java/com/za/ui/order_report/ReportFloatingManager.kt

@@ -38,7 +38,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlin.math.abs
 
-class ReportFloatingManager : Service() {
+internal class ReportFloatingManager : Service() {
 	private var windowManager : WindowManager? = null
 	private var floatingView : View? = null
 	private var touchJob : Job? = null

servicing/src/main/java/com/za/ui/servicing/InServicingPhotoView.kt

@@ -359,7 +359,7 @@ private fun ocrRecognition(photoTemplateInfo : PhotoTemplateInfo,
 
 
 @Composable
-fun InServicingPhotoView(modifier : Modifier = Modifier,
+internal fun InServicingPhotoView(modifier : Modifier = Modifier,
 	photoTemplateInfo : PhotoTemplateInfo,
 	index : Int? = null,
 	success : (PhotoTemplateInfo) -> Unit) {
@@ -445,7 +445,7 @@ fun InServicingPhotoView(modifier : Modifier = Modifier,
 
 
 @Composable
-fun InServicingPhotoViewIsCanClick(modifier : Modifier = Modifier,
+internal fun InServicingPhotoViewIsCanClick(modifier : Modifier = Modifier,
 	photoTemplateInfo : PhotoTemplateInfo,
 	index : Int? = null,
 	isCanClick : Boolean = true,
@@ -534,7 +534,7 @@ fun InServicingPhotoViewIsCanClick(modifier : Modifier = Modifier,
 
 
 @Composable
-fun InServicingPhotoWithoutTitleView(modifier : Modifier = Modifier,
+internal fun InServicingPhotoWithoutTitleView(modifier : Modifier = Modifier,
 	photoTemplateInfo : PhotoTemplateInfo,
 	index : Int? = null,
 	success : (PhotoTemplateInfo) -> Unit) {
@@ -591,7 +591,7 @@ fun InServicingPhotoWithoutTitleView(modifier : Modifier = Modifier,
 }
 
 @Composable
-fun InServicingPhotoItemView(modifier : Modifier = Modifier,
+internal fun InServicingPhotoItemView(modifier : Modifier = Modifier,
 	photoTemplateInfo : PhotoTemplateInfo,
 	isCanClick : Boolean = true,
 	success : (PhotoTemplateInfo) -> Unit) {

servicing/src/main/java/com/za/ui/servicing/check_vehicle/CheckVehicleActivity.kt

@@ -24,7 +24,7 @@ import com.za.ext.goNextPage
 import com.za.ui.servicing.InServicingPhotoView
 import com.za.ui.servicing.view.InServicingHeadView
 
-class CheckVehicleActivity : BaseActivity() {
+internal class CheckVehicleActivity : BaseActivity() {
     @Composable
     override fun ContentView() {
         CheckVehicleScreen()
@@ -32,7 +32,7 @@ class CheckVehicleActivity : BaseActivity() {
 }
 
 @Composable
-fun CheckVehicleScreen(vm: CheckVehicleVm = viewModel()) {
+internal fun CheckVehicleScreen(vm: CheckVehicleVm = viewModel()) {
     val uiState = vm.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
 

servicing/src/main/java/com/za/ui/servicing/check_vehicle/CheckVehicleVm.kt

@@ -19,7 +19,7 @@ import com.za.offline.OfflineUpdateTaskBean
 import com.za.service.location.ZdLocationManager
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class CheckVehicleVm : IServicingVm<CheckVehicleVm.Action, CheckVehicleVm.UiState>() {
+internal class CheckVehicleVm : IServicingVm<CheckVehicleVm.Action, CheckVehicleVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/departure_photo/DeparturePhotoActivity.kt

@@ -24,7 +24,7 @@ import com.za.ext.goNextPage
 import com.za.ui.servicing.InServicingPhotoView
 import com.za.ui.servicing.view.InServicingHeadView
 
-class DeparturePhotoActivity : BaseActivity() {
+internal class DeparturePhotoActivity : BaseActivity() {
 	@Composable
 	override fun ContentView() {
 		DeparturePhotoScreen()
@@ -32,7 +32,7 @@ class DeparturePhotoActivity : BaseActivity() {
 }
 
 @Composable
-fun DeparturePhotoScreen(vm : DeparturePhotoVm = viewModel()) {
+internal fun DeparturePhotoScreen(vm : DeparturePhotoVm = viewModel()) {
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
 

servicing/src/main/java/com/za/ui/servicing/departure_photo/DeparturePhotoVm.kt

@@ -15,7 +15,7 @@ import com.za.net.CommonMethod
 import com.za.service.location.ZdLocationManager
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class DeparturePhotoVm : IServicingVm<DeparturePhotoVm.Action, DeparturePhotoVm.UiState>() {
+internal class DeparturePhotoVm : IServicingVm<DeparturePhotoVm.Action, DeparturePhotoVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 

servicing/src/main/java/com/za/ui/servicing/destination_photo/DestinationPhotoActivity.kt

@@ -24,7 +24,7 @@ import com.za.ext.goNextPage
 import com.za.ui.servicing.InServicingPhotoView
 import com.za.ui.servicing.view.InServicingHeadView
 
-class DestinationPhotoActivity : BaseActivity() {
+internal class DestinationPhotoActivity : BaseActivity() {
     @Composable
     override fun ContentView() {
         DestinationPhotoScreen()
@@ -32,7 +32,7 @@ class DestinationPhotoActivity : BaseActivity() {
 }
 
 @Composable
-fun DestinationPhotoScreen(vm: DestinationPhotoVm = viewModel()) {
+internal fun DestinationPhotoScreen(vm: DestinationPhotoVm = viewModel()) {
     val uiState = vm.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
 

servicing/src/main/java/com/za/ui/servicing/destination_photo/DestinationPhotoVm.kt

@@ -19,7 +19,7 @@ import com.za.offline.OfflineUpdateTaskBean
 import com.za.service.location.ZdLocationManager
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class DestinationPhotoVm : IServicingVm<DestinationPhotoVm.Action, DestinationPhotoVm.UiState>() {
+internal class DestinationPhotoVm : IServicingVm<DestinationPhotoVm.Action, DestinationPhotoVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/ele_check/EleSignCheckScreen.kt

@@ -61,7 +61,7 @@ import com.za.ui.camera.ZdCameraXActivity
 import com.za.ui.servicing.view.InServicingHeadView
 
 @Composable
-fun EleSignCheckScreen(vm: EleSignCheckVm = viewModel()) {
+internal fun EleSignCheckScreen(vm: EleSignCheckVm = viewModel()) {
     val context = LocalContext.current
     val uiState = vm.uiState.collectAsStateWithLifecycle()
     LaunchedEffect(key1 = Unit) {
@@ -163,8 +163,8 @@ private fun EleSignCheckContent(eleWorkOrderBean: EleWorkOrderBean?,
         .background(color = Color.White, shape = RoundedCornerShape(4.dp))) {
         Column(modifier = Modifier
             .fillMaxWidth()
-            .background(brush = Brush.verticalGradient(arrayListOf(Color(0xFF97A0BA), Color(0xFFE1E8F3))),
+            .background(brush = Brush.verticalGradient(arrayListOf(Color(0xFF97A0BA),
-                shape = RoundedCornerShape(topStart = 4.dp, topEnd = 4.dp))
+                Color(0xFFE1E8F3))), shape = RoundedCornerShape(topStart = 4.dp, topEnd = 4.dp))
             .padding(10.dp)) {
             Text(text = "验车拍照", color = Color(0xFF213B54), fontWeight = FontWeight.Bold, fontSize = 16.sp)
             Row(modifier = Modifier

servicing/src/main/java/com/za/ui/servicing/ele_check/EleSignCheckVm.kt

@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import java.io.File
 import java.util.Date
 
-class EleSignCheckVm : IServicingVm<EleSignCheckVm.Action, EleSignCheckVm.UiState>() {
+internal class EleSignCheckVm : IServicingVm<EleSignCheckVm.Action, EleSignCheckVm.UiState>() {
     private val _uiState = MutableStateFlow(UiState())
     val uiState get() = _uiState
     override fun updateState(uiState: UiState) {

servicing/src/main/java/com/za/ui/servicing/ele_sign/EleSignScreen.kt

@@ -49,7 +49,7 @@ import com.za.ui.view.SignatureView
 import kotlin.math.ceil
 
 @Composable
-fun EleSignScreen(vm : EleSignVm = viewModel()) {
+internal fun EleSignScreen(vm : EleSignVm = viewModel()) {
 	val context = LocalContext.current
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	LaunchedEffect(key1 = Unit) {

servicing/src/main/java/com/za/ui/servicing/ele_sign/EleSignVm.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 
-class EleSignVm : IServicingVm<EleSignVm.Action, EleSignVm.UiState>() {
+internal class EleSignVm : IServicingVm<EleSignVm.Action, EleSignVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/go_accident/GoAccidentSiteActivity.kt

@@ -52,7 +52,7 @@ import com.za.ui.new_order.NewOrderUiType
 import com.za.ui.servicing.view.InServicingHeadView
 import com.za.ui.servicing.view.ServiceOperation
 
-class GoAccidentSiteActivity : BaseActivity() {
+internal class GoAccidentSiteActivity : BaseActivity() {
 	@Composable
 	override fun ContentView() {
 		GoAccidentSiteScreen()
@@ -61,7 +61,7 @@ class GoAccidentSiteActivity : BaseActivity() {
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun GoAccidentSiteScreen(vm : GoAccidentSiteVm = viewModel()) {
+internal fun GoAccidentSiteScreen(vm : GoAccidentSiteVm = viewModel()) {
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
 	val lifecycleOwner = LocalLifecycleOwner.current
@@ -121,16 +121,13 @@ fun GoAccidentSiteScreen(vm : GoAccidentSiteVm = viewModel()) {
 			title = "任务提交失败，是否离线提交？",
 			cancelEnable = true,
 			cancel = {
-				vm.dispatch(GoAccidentSiteVm.Action.UpdateState(uiState.value.copy(
+				vm.dispatch(GoAccidentSiteVm.Action.UpdateState(uiState.value.copy(showOfflineDialog = false)))
-					showOfflineDialog = false)))
 			},
 			dismiss = {
-				vm.dispatch(GoAccidentSiteVm.Action.UpdateState(uiState.value.copy(
+				vm.dispatch(GoAccidentSiteVm.Action.UpdateState(uiState.value.copy(showOfflineDialog = false)))
-					showOfflineDialog = false)))
 			},
 			confirm = {
-				vm.dispatch(GoAccidentSiteVm.Action.UpdateState(uiState.value.copy(
+				vm.dispatch(GoAccidentSiteVm.Action.UpdateState(uiState.value.copy(showOfflineDialog = false)))
-					showOfflineDialog = false)))
 				vm.dispatch(GoAccidentSiteVm.Action.UpdateOffline)
 			})
 	}

servicing/src/main/java/com/za/ui/servicing/go_accident/GoAccidentSiteVm.kt

@@ -34,7 +34,7 @@ import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
-class GoAccidentSiteVm : IServicingVm<GoAccidentSiteVm.Action, GoAccidentSiteVm.UiState>() {
+internal class GoAccidentSiteVm : IServicingVm<GoAccidentSiteVm.Action, GoAccidentSiteVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/go_to_destination/GoToDestinationActivity.kt

@@ -52,7 +52,7 @@ import com.za.ui.new_order.NewOrderUiType
 import com.za.ui.servicing.view.InServicingHeadView
 import com.za.ui.servicing.view.ServiceOperation
 
-class GoToDestinationActivity : BaseActivity() {
+internal class GoToDestinationActivity : BaseActivity() {
 	@Composable
 	override fun ContentView() {
 		GoToDestinationScreen()
@@ -61,7 +61,7 @@ class GoToDestinationActivity : BaseActivity() {
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun GoToDestinationScreen(vm : GoToDestinationVm = viewModel()) {
+internal fun GoToDestinationScreen(vm : GoToDestinationVm = viewModel()) {
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
 	val lifecycleOwner = LocalLifecycleOwner.current

servicing/src/main/java/com/za/ui/servicing/go_to_destination/GoToDestinationVm.kt

@@ -39,7 +39,7 @@ import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
-class GoToDestinationVm : IServicingVm<GoToDestinationVm.Action, GoToDestinationVm.UiState>() {
+internal class GoToDestinationVm : IServicingVm<GoToDestinationVm.Action, GoToDestinationVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderDetailItemScreen.kt

@@ -47,7 +47,7 @@ import com.za.ext.copy
 import com.za.servicing.R
 
 @Composable
-fun OrderDetailItemScreen(orderInfo : OrderInfo?) {
+internal fun OrderDetailItemScreen(orderInfo : OrderInfo?) {
 	Column(modifier = Modifier
 		.fillMaxSize()
 		.verticalScroll(state = rememberScrollState())
@@ -433,7 +433,7 @@ private fun OrderDetailServiceInformationView(orderInfo : OrderInfo?) {
 }
 
 @Composable
-fun OrderDetailTime(orderInfo : OrderInfo?) {
+internal fun OrderDetailTime(orderInfo : OrderInfo?) {
 	val titleSize = 12.sp
 	val titleColor = Color(0xFF7A7A7A)
 	val contentColor = Color.Black

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderDetailScreen.kt

@@ -44,7 +44,7 @@ import com.za.ui.servicing.order_give_up.OrderGiveUpActivity
 import kotlinx.coroutines.launch
 
 @Composable
-fun OrderDetailScreen(orderInfo : OrderInfo?) {
+internal fun OrderDetailScreen(orderInfo : OrderInfo?) {
 	val context = LocalContext.current
 	val titleList = listOf("订单详情", "案件要求")
 	val pagerState = rememberPagerState(initialPage = 0, pageCount = { titleList.size })

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderEleScreen.kt

@@ -9,9 +9,9 @@ import androidx.compose.ui.graphics.Color
 import com.za.bean.db.order.OrderInfo
 
 @Composable
-fun OrderEleScreen(orderInfo: OrderInfo?) {
+internal fun OrderEleScreen(orderInfo : OrderInfo?) {
-    Box(modifier = Modifier.fillMaxSize()) {
+	Box(modifier = Modifier.fillMaxSize()) {
-        Text(text = "电子工单", color = Color.Black)
+		Text(text = "电子工单", color = Color.Black)
-    }
+	}
 
 }

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderOnSitePhoto.kt

@@ -28,7 +28,7 @@ import com.za.bean.db.order.OrderInfo
 import com.za.ext.finish
 
 @Composable
-fun OrderOnSitePhotoScreen(orderInfo: OrderInfo?) {
+internal fun OrderOnSitePhotoScreen(orderInfo: OrderInfo?) {
     val context = LocalContext.current
     val showPreviewPhotoDialog = remember { mutableStateOf<String?>("") }
     if (!showPreviewPhotoDialog.value.isNullOrBlank()) {

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderPhotoScreen.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.Color
 import com.za.bean.db.order.OrderInfo
 
 @Composable
-fun OrderPhotoScreen(orderInfo: OrderInfo?) {
+internal fun OrderPhotoScreen(orderInfo: OrderInfo?) {
     Box(modifier = Modifier.fillMaxSize()) {
         Text(text = "案件照片", color = Color.Black)
     }

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderRequirementsActivity.kt

@@ -8,7 +8,7 @@ import com.za.base.BaseActivity
 import com.za.base.Const
 import com.za.bean.db.order.OrderInfo
 
-class OrderRequirementsActivity : BaseActivity() {
+internal class OrderRequirementsActivity : BaseActivity() {
     @Composable
     override fun ContentView() {
         val orderInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderRequirementsScreen.kt

@@ -44,7 +44,7 @@ import com.za.servicing.R
 import com.za.ui.h5.CommonH5Activity
 
 @Composable
-fun OrderRequirementsScreen(orderInfo : OrderInfo?) {
+internal fun OrderRequirementsScreen(orderInfo : OrderInfo?) {
 	Scaffold {
 		Column(modifier = Modifier
 			.fillMaxSize()
@@ -63,7 +63,7 @@ fun OrderRequirementsScreen(orderInfo : OrderInfo?) {
 }
 
 @Composable
-fun OrderRequirementsItemView(title : String?, content : String?) {
+internal fun OrderRequirementsItemView(title : String?, content : String?) {
 	Column(modifier = Modifier
 		.fillMaxWidth()
 		.padding(vertical = 5.dp)) {

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderSettleScreen.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.Color
 import com.za.bean.db.order.OrderInfo
 
 @Composable
-fun OrderSettleScreen(orderInfo: OrderInfo?) {
+internal fun OrderSettleScreen(orderInfo: OrderInfo?) {
     Box(modifier = Modifier.fillMaxSize()) {
         Text(text = "结算单", color = Color.Black)
     }

servicing/src/main/java/com/za/ui/servicing/in_servicing_setting/OrderTriceScreen.kt

@@ -9,8 +9,8 @@ import androidx.compose.ui.graphics.Color
 import com.za.bean.db.order.OrderInfo
 
 @Composable
-fun OrderTriceScreen(orderInfo: OrderInfo?) {
+internal fun OrderTriceScreen(orderInfo : OrderInfo?) {
-    Box(modifier = Modifier.fillMaxSize()) {
+	Box(modifier = Modifier.fillMaxSize()) {
-        Text(text = "订单轨迹", color = Color.Black)
+		Text(text = "订单轨迹", color = Color.Black)
-    }
+	}
 }

servicing/src/main/java/com/za/ui/servicing/inservice_people_confirm/InServicePeopleConfirmActivity.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import com.za.base.BaseActivity
 
 
-class ServicePeopleConfirmActivity : BaseActivity() {
+internal class ServicePeopleConfirmActivity : BaseActivity() {
 
 	@Composable
 	override fun ContentView() {

servicing/src/main/java/com/za/ui/servicing/inservice_people_confirm/InServicePeopleConfirmVm.kt

@@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import java.io.File
 
-class InServicePeopleConfirmVm : IServicingVm<Action, UiState>() {
+internal class InServicePeopleConfirmVm : IServicingVm<Action, UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState as StateFlow<UiState>
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/inservice_people_confirm/ServicePeopleConfirmScreen.kt

@@ -43,7 +43,7 @@ import com.za.servicing.R
 import com.za.ui.camera.ServicePeopleRealActivity
 
 @Composable
-fun ServicePeopleConfirmScreen(vm : InServicePeopleConfirmVm = viewModel(),
+internal fun ServicePeopleConfirmScreen(vm : InServicePeopleConfirmVm = viewModel(),
 	success : () -> Unit = {},
 	onBack : () -> Unit) {
 	val context = LocalContext.current

servicing/src/main/java/com/za/ui/servicing/operation/InOperationActivity.kt

@@ -7,7 +7,7 @@ import com.za.ext.getEleState
 import com.za.ui.servicing.ele_check.EleSignCheckScreen
 import com.za.ui.servicing.ele_sign.EleSignScreen
 
-class InOperationActivity : BaseActivity() {
+internal class InOperationActivity : BaseActivity() {
 
     @Composable
     override fun ContentView() {

servicing/src/main/java/com/za/ui/servicing/operation/InOperationScreen.kt

@@ -24,7 +24,7 @@ import com.za.ui.servicing.InServicingPhotoView
 import com.za.ui.servicing.view.InServicingHeadView
 
 @Composable
-fun InOperationScreen(vm: InOperationVm = viewModel()) {
+internal fun InOperationScreen(vm: InOperationVm = viewModel()) {
     val uiState = vm.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
 

servicing/src/main/java/com/za/ui/servicing/operation/InOperationVm.kt

@@ -19,7 +19,7 @@ import com.za.offline.OfflineUpdateTaskBean
 import com.za.service.location.ZdLocationManager
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class InOperationVm : IServicingVm<InOperationVm.Action, InOperationVm.UiState>() {
+internal class InOperationVm : IServicingVm<InOperationVm.Action, InOperationVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/order_confirm/ChangeBatteryScreen.kt

@@ -33,7 +33,7 @@ import com.za.ext.goStatusPage
 import com.za.ui.servicing.InServicingPhotoView
 
 @Composable
-fun ChangeBatteryScreen(vm : ChangeBatteryVm = viewModel()) {
+internal fun ChangeBatteryScreen(vm : ChangeBatteryVm = viewModel()) {
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
 	LaunchedEffect(key1 = Unit) {

servicing/src/main/java/com/za/ui/servicing/order_confirm/ChangeBatteryVm.kt

@@ -23,7 +23,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class ChangeBatteryVm : BaseVm<ChangeBatteryVm.Action, ChangeBatteryVm.UiState>() {
+internal class ChangeBatteryVm : BaseVm<ChangeBatteryVm.Action, ChangeBatteryVm.UiState>() {
     private val _uiState = MutableStateFlow(UiState())
     val uiState get() = _uiState
 

servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmEleScreen.kt

@@ -73,7 +73,7 @@ import kotlin.math.ceil
 
 @Preview
 @Composable
-fun ConfirmEleScreen(vm : ConfirmEleVm = viewModel()) {
+internal fun ConfirmEleScreen(vm : ConfirmEleVm = viewModel()) {
 	val context = LocalContext.current
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	LaunchedEffect(key1 = Unit) {
@@ -414,7 +414,8 @@ fun ConfirmEleScreen(vm : ConfirmEleVm = viewModel()) {
 									vm.dispatch(ConfirmEleVm.Action.UploadServiceSignature(it))
 								},
 									serverPath = uiState.value.eleWorkOrderBean?.localServicePeopleSignPath
-										?: uiState.value.eleWorkOrderBean?.serverServicePeopleSignPath)
+										?: uiState.value.eleWorkOrderBean?.serverServicePeopleSignPath
+										?: GlobalData.driverInfoBean?.signatureUrl)
 							}
 						}
 					}

servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmEleVm.kt

@@ -30,7 +30,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 
-class ConfirmEleVm : IServicingVm<ConfirmEleVm.Action, ConfirmEleVm.UiState>() {
+internal class ConfirmEleVm : IServicingVm<ConfirmEleVm.Action, ConfirmEleVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 
@@ -283,7 +283,8 @@ class ConfirmEleVm : IServicingVm<ConfirmEleVm.Action, ConfirmEleVm.UiState>() {
 			} else null,
 			hasSuccess = eleWorkOrderBean.isSuccess,
 			recipientSignPath = eleWorkOrderBean.serverAcceptCarSignPath,
-			waitstaffSignPath = eleWorkOrderBean.serverServicePeopleSignPath)
+			waitstaffSignPath = eleWorkOrderBean.serverServicePeopleSignPath
+				?: GlobalData.driverInfoBean?.signatureUrl)
 		LoadingManager.showLoading()
 		RetrofitHelper.getDefaultService().saveElectronOrder(saveEleOrderRequest)
 			.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())

servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmH5SuccessScreen.kt

@@ -55,7 +55,7 @@ import com.za.signature.GridPaintActivity
 import com.za.signature.config.PenConfig
 
 @Composable
-fun ConfirmH5SuccessScreen(vm : ConfirmH5SuccessVm = viewModel()) {
+internal fun ConfirmH5SuccessScreen(vm : ConfirmH5SuccessVm = viewModel()) {
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
 	val webView = WebView(context)

servicing/src/main/java/com/za/ui/servicing/order_confirm/ConfirmH5SuccessVm.kt

@@ -26,7 +26,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.flow.MutableStateFlow
 import java.io.File
 
-class ConfirmH5SuccessVm : IServicingVm<ConfirmH5SuccessVm.Action, ConfirmH5SuccessVm.UiState>() {
+internal class ConfirmH5SuccessVm : IServicingVm<ConfirmH5SuccessVm.Action, ConfirmH5SuccessVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {

servicing/src/main/java/com/za/ui/servicing/order_confirm/EleSuccessScreen.kt

@@ -1,9 +0,0 @@
-package com.za.ui.servicing.order_confirm
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-
-@Composable
-fun EleSuccessScreen(modifier: Modifier = Modifier) {
-
-}

servicing/src/main/java/com/za/ui/servicing/order_confirm/OrderConfirmActivity.kt

@@ -17,7 +17,7 @@ import com.za.ui.servicing.order_confirm.input_money.InputMoneyActivity
 import com.za.ui.servicing.order_confirm.real_order_confirm.RealOrderConfirmActivity
 import com.za.ui.servicing.order_confirm.receive_money.ReceiveMoneyActivity
 
-class OrderConfirmActivity : BaseActivity() {
+internal class OrderConfirmActivity : BaseActivity() {
 
 	@Composable
 	override fun ContentView() {
@@ -26,7 +26,7 @@ class OrderConfirmActivity : BaseActivity() {
 }
 
 @Composable
-fun OrderConfirmInitScreen(vm : OrderConfirmInitVm = viewModel()) {
+internal fun OrderConfirmInitScreen(vm : OrderConfirmInitVm = viewModel()) {
 	val uiState = vm.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
 	LaunchedEffect(key1 = Unit) {

servicing/src/main/java/com/za/ui/servicing/order_confirm/OrderConfirmInitVm.kt

@@ -16,7 +16,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class OrderConfirmInitVm : IServicingVm<OrderConfirmInitVm.Action, OrderConfirmInitVm.UiState>() {
+internal class OrderConfirmInitVm : IServicingVm<OrderConfirmInitVm.Action, OrderConfirmInitVm.UiState>() {
 	private val _uiState = MutableStateFlow(UiState())
 	val uiState get() = _uiState
 	override fun updateState(uiState : UiState) {