diff --git a/aar/base/build.gradle b/aar/base/build.gradle
deleted file mode 100644
index 587b7c2..0000000
--- a/aar/base/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('base-release.aar'))
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c579b5e..066bcbb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 import com.bingce.AndroidSdk
 import com.bingce.AndroidX
+import com.bingce.Kotlin
 import com.bingce.Libs
-import com.bingce.ModuleName
 
 apply plugin: 'com.android.application'
 apply plugin: 'org.jetbrains.kotlin.android'
@@ -86,61 +86,90 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
-    def moduleName = new ModuleName(project)
-    implementation project(moduleName.bingceModule("appBase"))
-    implementation project(moduleName.bingceModule("repository"))
-    implementation project(moduleName.bingceModule("base"))
-//    implementation project(moduleName.bingceModule("leancloud"))
-    implementation project(moduleName.bingceModule("base-java"))
-    implementation project(moduleName.bingceModule("utils"))
-    implementation project(moduleName.bingceModule("coordlib"))
-    implementation project(moduleName.bingceModule("device"))
-    implementation project(moduleName.bingceModule("device-ui"))
-    implementation project(moduleName.bingceModule("rtk"))
-    implementation project(moduleName.bingceModule("totalstation"))
-    implementation project(moduleName.bingceModule("level"))
-    implementation project(moduleName.bingceModule("bcdialog-style"))
-    implementation project(moduleName.openSourceModule("utilcode"))
-    implementation project(moduleName.openSourceModule("colorful"))//选择主题颜色
-    implementation project(moduleName.openSourceModule("dragExpandGrid"))//管理里的布局
-    implementation project(moduleName.openSourceModule("lsettingitemlibrary"))//用户信息里
-    implementation project(moduleName.openSourceModule("spinkit"))//loading控件 导出使用
-    implementation project(moduleName.openSourceModule("splashview"))//广告view
-    implementation project(moduleName.openSourceModule("poishadowjar"))//导入excel
-    implementation project(moduleName.openSourceModule("safFilePicker"))//选择文件
-    implementation project(moduleName.openSourceModule("fastjson"))
-    implementation project(moduleName.openSourceModule("agentweb"))
-    implementation project(":opensource:exFilePicker")
-    implementation project(":sdk:tensorFlowTTS")//语音播报
-    implementation Libs.RxImagePicker.core
-//    implementation Libs.RxImagePicker.support
-//    implementation Libs.RxImagePicker.supportWechat
-
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
-
-//    implementation "cn.leancloud:storage-android:8.2.5"
-//    implementation "cn.leancloud:realtime-android:8.2.5"
-    implementation Libs.LeanCloud.storage
-    implementation Libs.LeanCloud.realtime
-    implementation AndroidX.multidex
-    implementation AndroidX.material
+    implementation AndroidX.Paging.runtime
+    implementation AndroidX.Paging.common
+    implementation AndroidX.Room.runtime
+    implementation AndroidX.Room.ktx
+    implementation AndroidX.Room.paging
+    implementation AndroidX.annotationz
     implementation AndroidX.appcompat
+    implementation AndroidX.cardView
+    implementation AndroidX.constraintLayout
+    implementation AndroidX.documentFile
+    implementation AndroidX.Ktx.fragment
+    implementation AndroidX.legacyPreference
+    implementation AndroidX.legacySupport
+    implementation AndroidX.Lifecycle.runtimeKt
+    implementation AndroidX.material
+    implementation AndroidX.materialDialogs
+    implementation AndroidX.multidex
+    implementation AndroidX.preference
+    implementation AndroidX.recyclerview
+    implementation Kotlin.corountine
+    implementation Kotlin.sdk
+    implementation Libs.Glide.core
+    implementation Libs.OkHttp.core
+    implementation Libs.OkHttp.loggingInterceptor
+    implementation Libs.Retrofit2.converterFastjson
+    implementation Libs.Retrofit2.core
+    implementation Libs.agentWeb
+    implementation Libs.appUpdate
+    implementation Libs.banner
+    implementation Libs.changeLog
+    implementation Libs.circleImage
+    implementation Libs.compressor
+    implementation Libs.datePicker
+    implementation Libs.downloader
+    implementation Libs.dragExpandGrid
+    implementation Libs.eventBus
+    implementation Libs.fabButton
+    implementation Libs.fileDownloader
     implementation Libs.flycoTabLayout
+    implementation Libs.giftDrawable
+    implementation Libs.gson
+    implementation Libs.imageTextButton
+    implementation Libs.keyboardVisibility
+    implementation Libs.loadingView
+
+    implementation Libs.materialAbout
+    implementation Libs.materialEditText
+    implementation Libs.photoView
+    implementation Libs.pickerView
+    implementation Libs.progressBar
+    implementation Libs.recyclerviewAnimator
+    implementation Libs.rootBeer
+    implementation Libs.rubberStamp
+    implementation Libs.scanplus
+    implementation Libs.swipeLayout
+    implementation Libs.tabBar
+    implementation Libs.tencentSonic
+    implementation Libs.threadPoster
+    implementation Libs.timber
+    implementation Libs.unCrop
+    implementation Libs.webChatSdk
+    implementation Libs.xxPermissions
+    annotationProcessor AndroidX.Room.compiler
+    annotationProcessor Libs.Glide.compiler
+
+
+//    constraints {
+//        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10") {
+//            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+//        }
+//        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10") {
+//            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+//        }
+//    }
 
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test:runner:1.1.0"
     androidTestImplementation "androidx.test:rules:1.1.0"
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 
-    implementation 'com.google.android.gms:play-services-auth:20.7.0'
     implementation "androidx.core:core:1.13.1"
     implementation "androidx.core:core-ktx:1.13.1"
 
+    implementation "com.github.zagum:Android-SwitchIcon:1.4.0"//必须的
+
+
 }
\ No newline at end of file
diff --git a/app/libs/appBase-release.aar b/app/libs/appBase-release.aar
new file mode 100644
index 0000000..d581db1
Binary files /dev/null and b/app/libs/appBase-release.aar differ
diff --git a/app/libs/base-java-release.aar b/app/libs/base-java-release.aar
new file mode 100644
index 0000000..620e8df
Binary files /dev/null and b/app/libs/base-java-release.aar differ
diff --git a/aar/base/base-release.aar b/app/libs/base-release.aar
similarity index 100%
rename from aar/base/base-release.aar
rename to app/libs/base-release.aar
diff --git a/app/libs/colorful-release.aar b/app/libs/colorful-release.aar
new file mode 100644
index 0000000..f44c8eb
Binary files /dev/null and b/app/libs/colorful-release.aar differ
diff --git a/app/libs/coordlib-release.aar b/app/libs/coordlib-release.aar
new file mode 100644
index 0000000..0a10e1c
Binary files /dev/null and b/app/libs/coordlib-release.aar differ
diff --git a/app/libs/device-release.aar b/app/libs/device-release.aar
new file mode 100644
index 0000000..b76455e
Binary files /dev/null and b/app/libs/device-release.aar differ
diff --git a/app/libs/device-ui-release.aar b/app/libs/device-ui-release.aar
new file mode 100644
index 0000000..ae93585
Binary files /dev/null and b/app/libs/device-ui-release.aar differ
diff --git a/app/libs/leancloud-release.aar b/app/libs/leancloud-release.aar
new file mode 100644
index 0000000..c019d2d
Binary files /dev/null and b/app/libs/leancloud-release.aar differ
diff --git a/app/libs/level-release.aar b/app/libs/level-release.aar
new file mode 100644
index 0000000..ec45b5b
Binary files /dev/null and b/app/libs/level-release.aar differ
diff --git a/app/libs/lsettingitemlibrary-release.aar b/app/libs/lsettingitemlibrary-release.aar
new file mode 100644
index 0000000..7e24175
Binary files /dev/null and b/app/libs/lsettingitemlibrary-release.aar differ
diff --git a/app/libs/menuItemBadge-release.aar b/app/libs/menuItemBadge-release.aar
new file mode 100644
index 0000000..226b243
Binary files /dev/null and b/app/libs/menuItemBadge-release.aar differ
diff --git a/app/libs/repository-release.aar b/app/libs/repository-release.aar
new file mode 100644
index 0000000..7a0b062
Binary files /dev/null and b/app/libs/repository-release.aar differ
diff --git a/app/libs/rtk-release.aar b/app/libs/rtk-release.aar
new file mode 100644
index 0000000..895c257
Binary files /dev/null and b/app/libs/rtk-release.aar differ
diff --git a/app/libs/spinkit-release.aar b/app/libs/spinkit-release.aar
new file mode 100644
index 0000000..1acc626
Binary files /dev/null and b/app/libs/spinkit-release.aar differ
diff --git a/app/libs/surveyorBase-release.aar b/app/libs/surveyorBase-release.aar
new file mode 100644
index 0000000..204f5b0
Binary files /dev/null and b/app/libs/surveyorBase-release.aar differ
diff --git a/app/libs/totalstation-release.aar b/app/libs/totalstation-release.aar
new file mode 100644
index 0000000..706d411
Binary files /dev/null and b/app/libs/totalstation-release.aar differ
diff --git a/app/libs/utilcode-release.aar b/app/libs/utilcode-release.aar
new file mode 100644
index 0000000..7da45f5
Binary files /dev/null and b/app/libs/utilcode-release.aar differ
diff --git a/app/libs/utils-release.aar b/app/libs/utils-release.aar
new file mode 100644
index 0000000..4c9f9c7
Binary files /dev/null and b/app/libs/utils-release.aar differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..324e72c
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index 2c21261..6333e33 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -5,6 +5,7 @@
     <color name="text_color_1">#333333</color>
     <color name="text_color_2">#999</color>
     <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
 
 
     <color name="hor_line">#f2f2f2</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b338b78..9212c8e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,18 +28,7 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="item_text">
-        <item name="android:textSize">25sp</item>
-        <item name="android:layout_margin">10dp</item>
-        <item name="android:layout_marginStart">20dp</item>
-        <item name="android:textColor">@color/black</item>
-        <item name="android:gravity">start|center_vertical</item>
-    </style>
 
-    <style name="small_item_text" parent="item_text">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#99000000</item>
-    </style>
 
     <style name="item_text_little_without_margin">
         <item name="android:textSize">18sp</item>
@@ -84,28 +73,11 @@
         <item name="cornerRadius">30dp</item>
     </style>
 
-    <style name="label_text">
-        <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">19sp</item>
-    </style>
 
     <style name="alert_dialog_button_color" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog" />
 
     <style name="alert_dialog_button_normal" parent="Widget.AppCompat.Button.Borderless" />
 
-
-<!--    <style name="textview_add_button">-->
-<!--        <item name="android:background">@drawable/transparent_ripple_bg</item>-->
-<!--        <item name="android:clickable">true</item>-->
-<!--        <item name="android:focusable">true</item>-->
-<!--        <item name="android:gravity">center</item>-->
-<!--        <item name="android:text">+</item>-->
-<!--        <item name="android:textColor">?colorPrimary</item>-->
-<!--        <item name="android:textSize">25sp</item>-->
-<!--        <item name="android:paddingStart">20dp</item>-->
-<!--        <item name="android:paddingEnd">20dp</item>-->
-<!--    </style>-->
-
     <style name="textview_title" parent="@android:style/TextAppearance.DialogWindowTitle" />
 
     <style name="textview_content" parent="@android:style/TextAppearance.Widget.TextView" />
@@ -130,32 +102,6 @@
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="ExFilePickerThemeCustom" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="efp__ic_action_cancel">@drawable/efp_dark__ic_action_cancel</item>
-        <item name="efp__ic_action_deselect">@drawable/efp_dark__ic_action_deselect</item>
-        <item name="efp__ic_action_grid">@drawable/efp_dark__ic_action_grid</item>
-        <item name="efp__ic_action_invert_selection">
-            @drawable/efp_dark__ic_action_invert_selection
-        </item>
-        <item name="efp__ic_action_list">@drawable/efp_dark__ic_action_list</item>
-        <item name="efp__ic_action_new_folder">@drawable/efp_dark__ic_action_new_folder</item>
-        <item name="efp__ic_action_ok">@drawable/efp_dark__ic_action_ok</item>
-        <item name="efp__ic_action_select_all">@drawable/efp_dark__ic_action_select_all</item>
-        <item name="efp__ic_action_sort">@drawable/efp_dark__ic_action_sort</item>
-        <item name="efp__ic_action_storage">@drawable/efp_dark__ic_action_storage</item>
-    </style>
-
-<!--    <style name="textview_add_button_black">-->
-<!--        <item name="android:background">@drawable/transparent_ripple_bg</item>-->
-<!--        <item name="android:clickable">true</item>-->
-<!--        <item name="android:focusable">true</item>-->
-<!--        <item name="android:gravity">center</item>-->
-<!--        <item name="android:text">+</item>-->
-<!--        <item name="android:textColor">@color/black</item>-->
-<!--        <item name="android:textSize">25sp</item>-->
-<!--        <item name="android:paddingStart">20dp</item>-->
-<!--        <item name="android:paddingEnd">20dp</item>-->
-<!--    </style>-->
 
     <style name="BottomDialogAnimation" parent="android:Animation">
         <item name="android:windowEnterAnimation">@anim/dialog_enter_bottom</item>
diff --git a/build.gradle b/build.gradle
index 2d190f7..8251547 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,13 +7,8 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-//        classpath Libs.ButterKnife.plugin
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
-        classpath "com.android.tools.build:gradle:7.3.1"
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
-
-//        classpath 'com.android.tools.build:gradle:7.4.2'
-//        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10'
+        classpath "com.android.tools.build:gradle:7.4.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index 9205545..e7b4def 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,145 +1 @@
 include ':app'
-
-
-def properties = properties(rootProject)
-def bcDir = properties.getProperty('bingce.dir')
-
-if (bcDir == null || bcDir.empty) throw new RuntimeException("需要在local.properties中设置bingce.dir路径")
-
-// 定义一个方法来获取指定目录下的当前 Git 分支
-def listGitBranches(File gitDirectory) {
-    def command = ['git', 'symbolic-ref', '--short', '-q', 'HEAD']
-    def processBuilder = new ProcessBuilder(command)
-
-    // 设置工作目录为指定的 Git 仓库目录
-    processBuilder.directory(gitDirectory)
-
-    // 捕获命令输出
-    def process = processBuilder.start()
-    def reader = new BufferedReader(new InputStreamReader(process.inputStream))
-    def branches = []
-    String line
-    while ((line = reader.readLine()) != null) {
-        return line
-    }
-
-    // 检查进程是否成功执行
-    def exitCode = process.waitFor()
-    if (exitCode != 0) {
-        // 如果命令执行失败，可以抛出异常或做其他处理
-        throw new RuntimeException("Git command failed with exit code ${exitCode}")
-    }
-
-    return ""
-}
-
-// 例如，要检测指定目录的 Git 分支，可以调用 getGitBranch 方法
-//def gitDirectory = new File(bcDir)
-//def currentBranch = listGitBranches(gitDirectory)
-//
-//if (currentBranch != "master_alpha_tj_offline") throw new RuntimeException("需要将${bcDir}仓库切换到master_alpha_tj_offline分支")
-
-
-static def properties(ProjectDescriptor rootProject) {
-    Properties properties = new Properties()
-    properties.load(new File(rootProject.projectDir, 'local.properties').newDataInputStream())
-    return properties
-}
-
-static def bingceModule(ProjectDescriptor rootProject, String name) {
-    def properties = properties(rootProject)
-    def useAAR = properties.getProperty('useAAR')
-    def useBaseAAR = properties.getProperty('useBaseAAR')
-
-    if ("base" == name) {
-        if ("false" == useBaseAAR && "false" == useAAR) {
-            return ":bingce:base"
-        } else {
-            return ":aar:base"
-        }
-    }
-    if ("false" == useAAR) {
-        return ":bingce:$name"
-    } else {
-        return ":aar:$name"
-    }
-}
-
-static def openSourceModule(ProjectDescriptor rootProject, String name) {
-    def properties = properties(rootProject)
-    def useAAR = properties.getProperty('useAAR')
-
-    if ("false" == useAAR) {
-        return ":opensource:$name"
-    } else {
-        return ":aar:$name"
-    }
-}
-
-static def includeBingceModule(Settings settings, ProjectDescriptor rootProject, String bcDir, String name) {
-    def moduleName = bingceModule(rootProject, name)
-    settings.include(moduleName)
-    if (moduleName == ":aar:base") return // base 模块不需要设置 projectDir
-    settings.project(moduleName).projectDir = new File(bcDir, "bingce/$name")
-}
-
-static def includeOpenSourceModule(Settings settings, ProjectDescriptor rootProject, String bcDir, String name) {
-    settings.include(openSourceModule(rootProject, name))
-    settings.project(openSourceModule(rootProject, name)).projectDir = new File(bcDir, "opensource/$name")
-}
-
-static def includeSdkModule(Settings settings, ProjectDescriptor rootProject, String bcDir, String name) {
-    def moduleName = ":sdk:$name"
-    settings.include(moduleName)
-    settings.project(moduleName).projectDir = new File(bcDir, "sdk/$name")
-}
-
-includeBingceModule(settings, rootProject, bcDir, "base")
-includeBingceModule(settings, rootProject, bcDir, "base-java")
-includeBingceModule(settings, rootProject, bcDir, "appBase")
-includeBingceModule(settings, rootProject, bcDir, "leancloud")
-includeBingceModule(settings, rootProject, bcDir, "repository")
-includeBingceModule(settings, rootProject, bcDir, "coordlib")
-includeBingceModule(settings, rootProject, bcDir, "device")
-includeBingceModule(settings, rootProject, bcDir, "device-ui")
-includeBingceModule(settings, rootProject, bcDir, "utils")
-includeBingceModule(settings, rootProject, bcDir, "totalstation")
-includeBingceModule(settings, rootProject, bcDir, "rtk")
-includeBingceModule(settings, rootProject, bcDir, "level")
-includeBingceModule(settings, rootProject, bcDir, "bc-dialog")
-includeBingceModule(settings, rootProject, bcDir, "DialogXInterface")
-includeBingceModule(settings, rootProject, bcDir, "bcdialog-style")
-
-
-includeOpenSourceModule(settings, rootProject, bcDir, "hellocharts")
-includeOpenSourceModule(settings, rootProject, bcDir, "gson")
-includeOpenSourceModule(settings, rootProject, bcDir, "fastjson")
-includeOpenSourceModule(settings, rootProject, bcDir, "javadxf")
-includeOpenSourceModule(settings, rootProject, bcDir, "utilcode")
-includeOpenSourceModule(settings, rootProject, bcDir, "colorful")
-includeOpenSourceModule(settings, rootProject, bcDir, "dragExpandGrid")
-includeOpenSourceModule(settings, rootProject, bcDir, "lsettingitemlibrary")
-includeOpenSourceModule(settings, rootProject, bcDir, "spinkit")
-includeOpenSourceModule(settings, rootProject, bcDir, "splashview")
-includeOpenSourceModule(settings, rootProject, bcDir, "poishadowjar")
-includeOpenSourceModule(settings, rootProject, bcDir, "safFilePicker")
-includeOpenSourceModule(settings, rootProject, bcDir, "exFilePicker")
-includeOpenSourceModule(settings, rootProject, bcDir, "agentweb")
-includeOpenSourceModule(settings, rootProject, bcDir, "fastBle")
-includeOpenSourceModule(settings, rootProject, bcDir, "socket-core")
-includeOpenSourceModule(settings, rootProject, bcDir, "socket-common-interface")
-includeOpenSourceModule(settings, rootProject, bcDir, "socket-client")
-includeOpenSourceModule(settings, rootProject, bcDir, "socket-usbSerialForAndroid")
-includeOpenSourceModule(settings, rootProject, bcDir, "usbSerialForAndroid")
-includeOpenSourceModule(settings, rootProject, bcDir, "menuItemBadge")
-includeOpenSourceModule(settings, rootProject, bcDir, "triangle-library")
-
-includeSdkModule(settings, rootProject, bcDir, "jama")
-includeSdkModule(settings, rootProject, bcDir, "libqxwz-sdkcore")
-includeSdkModule(settings, rootProject, bcDir, "libsixents-sdkcore")
-includeSdkModule(settings, rootProject, bcDir, "cmccSdk")
-includeSdkModule(settings, rootProject, bcDir, "luowangSdk")
-includeSdkModule(settings, rootProject, bcDir, "ruide-extension-sdk")
-includeSdkModule(settings, rootProject, bcDir, "huaceRtkSdk")
-includeSdkModule(settings, rootProject, bcDir, "southGnssSdk")
-includeSdkModule(settings, rootProject, bcDir, "tensorFlowTTS")