对接完成修改信息接口，优化一些逻辑处理

android/.kotlin/errors/errors-1763427903700.log

@@ -0,0 +1,198 @@
+kotlin version: 2.1.0
+error message: Daemon compilation failed: null
+java.lang.Exception
+	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
+	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
+	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
+	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
+	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
+	at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:76)
+	at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
+	at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
+	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
+	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:209)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:166)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53)
+	at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
+	at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
+	at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)
+	at org.gradle.internal.Factories$1.create(Factories.java:31)
+	at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)
+	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)
+	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)
+	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
+	at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
+	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
+	at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
+	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
+	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
+	at java.base/java.lang.Thread.run(Unknown Source)
+Caused by: java.lang.AssertionError: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab
+	at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:236)
+	at org.jetbrains.kotlin.incremental.IncrementalCachesManager.close(IncrementalCachesManager.kt:55)
+	at kotlin.io.CloseableKt.closeFinally(Closeable.kt:56)
+	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:293)
+	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:129)
+	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:674)
+	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:91)
+	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1659)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(Unknown Source)
+	at java.base/java.lang.reflect.Method.invoke(Unknown Source)
+	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(Unknown Source)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source)
+	at java.base/java.security.AccessController.doPrivileged(Unknown Source)
+	at java.rmi/sun.rmi.transport.Transport.serviceCall(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(Unknown Source)
+	at java.base/java.security.AccessController.doPrivileged(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(Unknown Source)
+	... 3 more
+Caused by: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab
+	at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95)
+	at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53)
+	at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:223)
+	... 22 more
+	Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android.
+		at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+		at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+		at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+		at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+		at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+		... 24 more
+	Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android.
+		at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+		at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+		at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30)
+		at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109)
+		at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153)
+		at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+		at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+		at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+		at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+		... 24 more
+	Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android.
+		at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+		at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+		at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30)
+		at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:151)
+		at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:142)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+		at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+		at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+		at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+		... 24 more
+	Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\lookups: id-to-file.tab, file-to-id.tab
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.LookupStorage.close(LookupStorage.kt:155)
+		... 23 more
+		Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android.
+			at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+			at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+			at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+			at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:51)
+			at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:48)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+			at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+			at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+			... 25 more
+		Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android.
+			at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+			at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+			at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153)
+			at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+			at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+			at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+			... 25 more
+	Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\inputs: source-to-output.tab
+		... 25 more
+		Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android.
+			at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+			at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+			at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153)
+			at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+			at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+			at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+			at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+			... 24 more
+
+

android/.kotlin/errors/errors-1763427903713.log

@@ -0,0 +1,198 @@
+kotlin version: 2.1.0
+error message: Daemon compilation failed: null
+java.lang.Exception
+	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
+	at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
+	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
+	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
+	at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
+	at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:76)
+	at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
+	at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
+	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
+	at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:209)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:166)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59)
+	at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53)
+	at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
+	at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
+	at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
+	at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)
+	at org.gradle.internal.Factories$1.create(Factories.java:31)
+	at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)
+	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)
+	at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)
+	at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)
+	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
+	at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
+	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
+	at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
+	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
+	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
+	at java.base/java.lang.Thread.run(Unknown Source)
+Caused by: java.lang.AssertionError: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab
+	at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:236)
+	at org.jetbrains.kotlin.incremental.IncrementalCachesManager.close(IncrementalCachesManager.kt:55)
+	at kotlin.io.CloseableKt.closeFinally(Closeable.kt:56)
+	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:293)
+	at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:129)
+	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:674)
+	at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:91)
+	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1659)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(Unknown Source)
+	at java.base/java.lang.reflect.Method.invoke(Unknown Source)
+	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(Unknown Source)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source)
+	at java.base/java.security.AccessController.doPrivileged(Unknown Source)
+	at java.rmi/sun.rmi.transport.Transport.serviceCall(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(Unknown Source)
+	at java.base/java.security.AccessController.doPrivileged(Unknown Source)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(Unknown Source)
+	... 3 more
+Caused by: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab
+	at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95)
+	at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53)
+	at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:223)
+	... 22 more
+	Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android.
+		at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+		at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+		at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+		at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+		at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+		... 24 more
+	Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android.
+		at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+		at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+		at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30)
+		at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109)
+		at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153)
+		at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+		at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+		at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+		at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+		... 24 more
+	Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android.
+		at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+		at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+		at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33)
+		at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30)
+		at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:151)
+		at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:142)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+		at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+		at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179)
+		at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+		at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+		... 24 more
+	Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\lookups: id-to-file.tab, file-to-id.tab
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95)
+		at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53)
+		at org.jetbrains.kotlin.incremental.LookupStorage.close(LookupStorage.kt:155)
+		... 23 more
+		Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android.
+			at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+			at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+			at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+			at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:51)
+			at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:48)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+			at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+			at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+			... 25 more
+		Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android.
+			at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+			at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+			at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153)
+			at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+			at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+			at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+			... 25 more
+	Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\inputs: source-to-output.tab
+		... 25 more
+		Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android.
+			at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117)
+			at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128)
+			at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50)
+			at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109)
+			at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153)
+			at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422)
+			at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105)
+			at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108)
+			at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179)
+			at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136)
+			at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53)
+			at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87)
+			... 24 more
+
+

lib/controller/mine/edit_info_controller.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:dating_touchme_app/controller/global.dart';
 import 'package:dating_touchme_app/generated/assets.dart';
 import 'package:dating_touchme_app/model/mine/address_data.dart';
@@ -5,13 +7,17 @@ import 'package:dating_touchme_app/model/mine/education_data.dart';
 import 'package:dating_touchme_app/model/mine/occupation_data.dart';
 import 'package:dating_touchme_app/model/mine/user_data.dart';
 import 'package:dating_touchme_app/network/user_api.dart';
+import 'package:dating_touchme_app/oss/oss_manager.dart';
 import 'package:dating_touchme_app/pages/mine/auth_center_page.dart';
 import 'package:dating_touchme_app/pages/mine/my_wallet_page.dart';
 import 'package:dating_touchme_app/pages/mine/rose_page.dart';
+import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get_storage/get_storage.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:permission_handler/permission_handler.dart';
 
 class EditInfoController extends GetxController {
 
@@ -20,11 +26,7 @@ class EditInfoController extends GetxController {
   final menuActive = 1.obs;
 
 
-  List<String> imgList = [
-    "https://fastly.picsum.photos/id/64/800/800.jpg?hmac=NBZ4_-vqzD6p25oCeaW0H5vH-ql9zzei-SqJNeUo1QU",
-    "https://fastly.picsum.photos/id/985/800/800.jpg?hmac=DfRt99HFbMJ96DlN-poOhruWYRsexESE94ilLC3g1rU",
-    "https://fastly.picsum.photos/id/703/800/800.jpg?hmac=-bRTkPxnsiQ5kCo2tfXj6tFrXMD7YnVx7bQ0STno3Tg"
-  ];
+
 
   final nowSelect = 0.obs;
 
@@ -52,6 +54,31 @@ class EditInfoController extends GetxController {
 
   final areaShowData = {}.obs;
 
+  final avatarUrl = ''.obs;
+  // 本地选择的头像文件路径（提交时先上传）
+  final avatarLocalPath = ''.obs;
+
+  final imgList = <String>[].obs;
+
+  final location = "".obs;
+
+  final locationValue = [].obs;
+
+  final homeLocation = "".obs;
+
+  final homeLocationValue = [].obs;
+
+  final educationSelect = (-1).obs;
+
+  final occupation = "".obs;
+
+  final occupationValue = [].obs;
+
+  final incomeSelect = (-1).obs;
+
+  final maritalSelect = (-1).obs;
+
+  final propertySelect = (-1).obs;
 
   @override
   void onInit() {
@@ -175,4 +202,263 @@ class EditInfoController extends GetxController {
     print(areaShowData);
   }
 
+
+
+  // 选择头像 - 业务逻辑处理
+  Future<void> handleCameraCapture(int type) async {
+    try {
+      // 请求相机权限
+      final ok = await _ensurePermission(
+        Permission.camera,
+        denyToast: '相机权限被拒绝，请在设置中允许访问相机',
+      );
+      if (!ok) return;
+
+      // 请求麦克风权限（部分设备拍照/录像会一并请求建议预授权）
+      await _ensurePermission(Permission.microphone, denyToast: '麦克风权限被拒绝');
+
+      // 权限通过后拍照
+      final ImagePicker picker = ImagePicker();
+      final XFile? photo = await picker.pickImage(source: ImageSource.camera);
+
+      if (photo != null) {
+        if(type == 1){
+          avatarLocalPath.value = photo.path;
+        }
+        await processSelectedImage(File(photo.path), type);
+      }
+    } catch (e) {
+      print('拍照失败: $e');
+      // 更友好的错误提示
+      if (e.toString().contains('permission') || e.toString().contains('权限')) {
+        SmartDialog.showToast('相机权限被拒绝，请在设置中允许访问相机');
+      } else if (e.toString().contains('camera') ||
+          e.toString().contains('相机')) {
+        SmartDialog.showToast('设备没有可用的相机');
+      } else {
+        SmartDialog.showToast('拍照失败，请重试');
+      }
+    }
+  }
+
+  Future<void> handleGallerySelection(int type) async {
+    try {
+      // 请求相册/照片权限
+      // final ok = await _ensurePermission(
+      //   Permission.photos,
+      //   // Android 上 photos 等价于 storage/mediaLibrary，permission_handler 会映射
+      //   denyToast: '相册权限被拒绝，请在设置中允许访问相册',
+
+      // );
+      // if (!ok) return;
+
+      // 从相册选择图片
+      final ImagePicker picker = ImagePicker();
+      final XFile? image = await picker.pickImage(source: ImageSource.gallery);
+
+      if (image != null) {
+        if(type == 1){
+          avatarLocalPath.value = image.path;
+        }
+        await processSelectedImage(File(image.path), type);
+      }
+    } catch (e) {
+      print('选择图片失败: $e');
+      // 更友好的错误提示
+      if (e.toString().contains('permission') || e.toString().contains('权限')) {
+        SmartDialog.showToast('相册权限被拒绝，请在设置中允许访问相册');
+      } else {
+        SmartDialog.showToast('选择图片失败，请重试');
+      }
+    }
+  }
+
+  // 通用权限申请
+  Future<bool> _ensurePermission(Permission permission, {String? denyToast}) async {
+    var status = await permission.status;
+    if (status.isGranted) return true;
+
+    if (status.isDenied || status.isRestricted || status.isLimited) {
+      status = await permission.request();
+      if (status.isGranted) return true;
+      if (denyToast != null) SmartDialog.showToast(denyToast);
+      return false;
+    }
+
+    if (status.isPermanentlyDenied) {
+      if (denyToast != null) SmartDialog.showToast('$denyToast，前往系统设置开启');
+      // 延迟弹设置，避免与弹窗冲突
+      Future.delayed(const Duration(milliseconds: 300), openAppSettings);
+      return false;
+    }
+    return false;
+  }
+
+
+  // 处理选中的图片
+  Future<void> processSelectedImage(File imageFile, int type) async {
+    if(type == 1){
+      try {
+        // 显示加载提示
+        SmartDialog.showLoading(msg: '上传头像中...');
+        String objectName = '${DateUtil.getNowDateMs()}.${imageFile.path.split('.').last}';
+        String imageUrl = await OSSManager.instance.uploadFile(imageFile.readAsBytesSync(), objectName);
+        print('上传成功，图片URL: $imageUrl');
+        avatarUrl.value = imageUrl;
+        SmartDialog.dismiss();
+        SmartDialog.showToast('头像上传成功');
+      } catch (e) {
+        SmartDialog.dismiss();
+        print('处理图片失败: $e');
+        SmartDialog.showToast('上传头像失败，请重试');
+      }
+    } else {
+      try {
+        // 显示加载提示
+        SmartDialog.showLoading(msg: '上传相册中...');
+        String objectName = '${DateUtil.getNowDateMs()}.${imageFile.path.split('.').last}';
+        String imageUrl = await OSSManager.instance.uploadFile(imageFile.readAsBytesSync(), objectName);
+        print('上传成功，图片URL: $imageUrl');
+        imgList.add(imageUrl);
+        SmartDialog.dismiss();
+        SmartDialog.showToast('上传设置成功');
+      } catch (e) {
+        SmartDialog.dismiss();
+        print('处理图片失败: $e');
+        SmartDialog.showToast('上传相册失败，请重试');
+      }
+    }
+  }
+
+  saveData() async {
+    if(avatarUrl.value == ""){
+      SmartDialog.showToast('请上传头像');
+      return;
+    }
+    if(imgList.isEmpty){
+      SmartDialog.showToast('请上传相册');
+      return;
+    }
+    if(locationValue.isEmpty){
+      SmartDialog.showToast('请选择所在地');
+      return;
+    }
+    if(homeLocationValue.isEmpty){
+      SmartDialog.showToast('请选择家乡');
+      return;
+    }
+    if(educationSelect.value == -1){
+      SmartDialog.showToast('请选择学历');
+      return;
+    }
+    if(incomeSelect.value == -1){
+      SmartDialog.showToast('请选择收入');
+      return;
+    }
+    if(maritalSelect.value == -1){
+      SmartDialog.showToast('请选择婚姻状况');
+      return;
+    }
+    if(occupationValue.isEmpty){
+      SmartDialog.showToast('请选择职业');
+      return;
+    }
+    if(propertySelect.value == -1){
+      SmartDialog.showToast('请选择房产状况');
+      return;
+    }
+    try {
+      final avatarPayload = {
+        'miId': userData.value?.id ?? 0,
+        'authenticationCode': '8',
+        'value': '0',
+        'imgUrl': avatarUrl.value.isNotEmpty ? [avatarUrl.value] : ['0'],
+      };
+      final avatarAuditResp = await _userApi.saveCertificationAudit(avatarPayload);
+      if (avatarAuditResp.data.isSuccess) {
+
+      } else{
+
+        SmartDialog.showToast(avatarAuditResp.data.message);
+
+        return;
+      }
+    } catch(e){
+      print('头像提交审核失败: $e');
+      SmartDialog.showToast('头像提交审核失败，请重试');
+      return;
+    }
+
+
+
+    try{
+      final imgPayload = {
+        'miId': userData.value?.id ?? 0,
+        'authenticationCode': '6',
+        'value': '0',
+        'imgUrl': imgList.isNotEmpty ? imgList : ['0'],
+      };
+
+      final imgAuditResp = await _userApi.saveCertificationAudit(imgPayload);
+      if (imgAuditResp.data.isSuccess) {
+
+      } else{
+
+        SmartDialog.showToast(imgAuditResp.data.message);
+
+        return;
+      }
+    } catch(e){
+      print('相册提交审核失败: $e');
+      SmartDialog.showToast('相册提交审核失败，请重试');
+      return;
+
+    }
+
+
+    try {
+      final payload = {
+        'birthDate': userData.value?.birthDate ?? "",
+        'birthYear': userData.value?.birthYear ?? "",
+        'provinceCode': locationValue[0],
+        'provinceName': location.value.split("-")[0],
+        'cityCode': locationValue[1],
+        'cityName': location.value.split("-")[1],
+        'districtCode': locationValue[2],
+        'districtName': location.value.split("-")[2],
+        "educationCode": educationList[educationSelect.value].value,
+        "height": height,
+        'hometownProvinceCode': homeLocationValue[0],
+        'hometownProvinceName': homeLocation.value.split("-")[0],
+        'hometownCityCode': homeLocationValue[1],
+        'hometownCityName': homeLocation.value.split("-")[1],
+        "incomeCode": incomeList[incomeSelect.value].value,
+        "maritalStatusCode": maritalList[maritalSelect.value].value,
+        "nickName": userData.value?.nickName ?? "",
+        'occupation': occupation.value.split("-")[1],
+        'occupationCode': occupationValue[1],
+        "propertyPermitsCode": propertyList[propertySelect.value].value,
+
+      };
+
+      final response = await _userApi.editOwnMarriageInformation(payload);
+      if (response.data.isSuccess) {
+
+        SmartDialog.showToast('保存成功');
+        Get.back();
+      }
+      else{
+
+        SmartDialog.showToast(response.data.message);
+
+        return;
+      }
+    } catch (e) {
+      print('资料提交审核失败: $e');
+      SmartDialog.showToast('资料提交审核失败，请重试');
+      return;
+    }
+
+  }
+
 }

lib/network/api_urls.dart

@@ -24,6 +24,7 @@ class ApiUrls {
   static const String getPropertyList = 'dating-agency-service/user/get/property/permits';
   static const String getOccupationList = 'dating-agency-service/user/get/occupation/list';
   static const String createRtcChannel = 'dating-agency-chat-audio/user/create/rtc-channel';
+  static const String editOwnMarriageInformation = 'dating-agency-service/user/edit/own-marriage-information';
 
   //首页相关接口
   static const String getMarriageList = 'dating-agency-service/user/page/dongwo/marriage-information';

lib/network/user_api.dart

@@ -111,4 +111,9 @@ abstract class UserApi {
   Future<HttpResponse<BaseResponse<List<OccupationData>>>> getOccupationList(
       @Body() Map<String, dynamic> data,
   );
+
+  @POST(ApiUrls.editOwnMarriageInformation)
+  Future<HttpResponse<BaseResponse<dynamic>>> editOwnMarriageInformation(
+      @Body() Map<String, dynamic> data,
+  );
 }

lib/network/user_api.g.dart

@@ -188,8 +188,8 @@ class _UserApi implements UserApi {
 
   @override
   Future<HttpResponse<BaseResponse<dynamic>>> saveCertificationAudit(
-    Map<String, dynamic> data,
-  ) async {
+      Map<String, dynamic> data,
+      ) async {
     final _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
@@ -198,11 +198,11 @@ class _UserApi implements UserApi {
     final _options = _setStreamType<HttpResponse<BaseResponse<dynamic>>>(
       Options(method: 'POST', headers: _headers, extra: _extra)
           .compose(
-            _dio.options,
-            'dating-agency-service/user/save/certification/audit',
-            queryParameters: queryParameters,
-            data: _data,
-          )
+        _dio.options,
+        'dating-agency-service/user/save/certification/audit',
+        queryParameters: queryParameters,
+        data: _data,
+      )
           .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
     );
     final _result = await _dio.fetch<Map<String, dynamic>>(_options);
@@ -210,7 +210,7 @@ class _UserApi implements UserApi {
     try {
       _value = BaseResponse<dynamic>.fromJson(
         _result.data!,
-        (json) => json as dynamic,
+            (json) => json as dynamic,
       );
     } on Object catch (e, s) {
       errorLogger?.logError(e, s, _options);
@@ -727,6 +727,40 @@ class _UserApi implements UserApi {
     return httpResponse;
   }
 
+  @override
+  Future<HttpResponse<BaseResponse<dynamic>>> editOwnMarriageInformation(
+    Map<String, dynamic> data,
+  ) async {
+    final _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(data);
+    final _options = _setStreamType<HttpResponse<BaseResponse<dynamic>>>(
+      Options(method: 'POST', headers: _headers, extra: _extra)
+          .compose(
+            _dio.options,
+            'dating-agency-service/user/edit/own-marriage-information',
+            queryParameters: queryParameters,
+            data: _data,
+          )
+          .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
+    );
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late BaseResponse<dynamic> _value;
+    try {
+      _value = BaseResponse<dynamic>.fromJson(
+        _result.data!,
+        (json) => json as dynamic,
+      );
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
+    final httpResponse = HttpResponse(_value, _result);
+    return httpResponse;
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
         !(requestOptions.responseType == ResponseType.bytes ||

lib/pages/mine/edit_info_page.dart

@@ -1,11 +1,18 @@
+import 'dart:io';
+
 import 'package:dating_touchme_app/components/page_appbar.dart';
 import 'package:dating_touchme_app/controller/mine/edit_info_controller.dart';
+import 'package:dating_touchme_app/extension/ex_widget.dart';
 import 'package:dating_touchme_app/generated/assets.dart';
+import 'package:dating_touchme_app/model/mine/address_data.dart';
+import 'package:dating_touchme_app/model/mine/occupation_data.dart';
 import 'package:dating_touchme_app/pages/mine/signature_page.dart';
 import 'package:dating_touchme_app/pages/mine/tag_setting_page.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
 import 'package:tdesign_flutter/tdesign_flutter.dart';
 
 class EditInfoPage extends StatefulWidget {
@@ -28,9 +35,44 @@ class _EditInfoPageState extends State<EditInfoPage> {
 
   }
 
+
+  // 显示头像选择选项
+  void _showAvatarOptions(EditInfoController controller, int type) {
+    showCupertinoModalPopup(
+      context: Get.context!,
+      builder: (context) => CupertinoActionSheet(
+        title: const Text('选择头像'),
+        actions: <Widget>[
+          CupertinoActionSheetAction(
+            child: const Text('拍照'),
+            onPressed: () async {
+              Navigator.pop(context);
+              await controller.handleCameraCapture(type);
+            },
+          ),
+          CupertinoActionSheetAction(
+            child: const Text('从相册选择'),
+            onPressed: () async {
+              Navigator.pop(context);
+              await controller.handleGallerySelection(type);
+            },
+          ),
+        ],
+        cancelButton: CupertinoActionSheetAction(
+          child: const Text('取消'),
+          isDestructiveAction: true,
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
-    return GetBuilder<EditInfoController>(
+    return GetX<EditInfoController>(
+      init: EditInfoController(),
       builder: (controller) {
         return Scaffold(
           appBar: PageAppbar(title: "编辑资料"),
@@ -106,10 +148,15 @@ class _EditInfoPageState extends State<EditInfoPage> {
                       SizedBox(
                         child: ClipRRect(
                           borderRadius: BorderRadius.all(Radius.circular(85.w)),
-                          child: (controller.userData.value?.profilePhoto?.isNotEmpty ?? false) ? Image.network(
+                          child: controller.avatarLocalPath.value != "" ? Image.file(
+                            File(controller.avatarLocalPath.value),
+                            width: 85.w,
+                            height: 85.w,
+                          ) : (controller.userData.value?.profilePhoto?.isNotEmpty ?? false) ? Image.network(
                             "${controller.userData.value?.profilePhoto ?? ""}",
                             width: 85.w,
                             height: 85.w,
+                            fit: BoxFit.cover,
                           ) : Image.asset(
                             Assets.imagesUserAvatar,
                             width: 85.w,
@@ -127,7 +174,9 @@ class _EditInfoPageState extends State<EditInfoPage> {
                         ),
                       )
                     ],
-                  ),
+                  ).onTap(() {
+                    _showAvatarOptions(controller, 1);
+                  }),
                   SizedBox(height: 20.w,),
                   Container(
                     width: 375.w,
@@ -156,30 +205,18 @@ class _EditInfoPageState extends State<EditInfoPage> {
                             spacing: 5.w,
                             runSpacing: 5.w,
                             children: [
-                              ClipRRect(
-                                borderRadius: BorderRadius.all(Radius.circular(9.w)),
-                                child: Image.network(
-                                  "https://fastly.picsum.photos/id/1003/400/400.jpg?hmac=aA6suLuxF9UGDuOSzWauxOJBgBT0XeUFVqMIIjO4hJU",
-                                  width: 70.w,
-                                  height: 70.w,
-                                ),
-                              ),
-                              ClipRRect(
-                                borderRadius: BorderRadius.all(Radius.circular(18.w)),
-                                child: Image.network(
-                                  "https://fastly.picsum.photos/id/342/400/400.jpg?hmac=u_p3Kwp2J2A0XENzZfDKmtTzLjqsxLF48EUgImcL6v8",
-                                  width: 70.w,
-                                  height: 70.w,
-                                ),
-                              ),
-                              ClipRRect(
-                                borderRadius: BorderRadius.all(Radius.circular(18.w)),
-                                child: Image.network(
-                                  "https://fastly.picsum.photos/id/935/400/400.jpg?hmac=d-_aU-UWnAMEk7lMRmhv-yD1sBBeSmiQ9fbTmcQqDT4",
-                                  width: 70.w,
-                                  height: 70.w,
-                                ),
-                              ),
+                              ...controller.imgList.map((e){
+                                return ClipRRect(
+                                  borderRadius: BorderRadius.all(Radius.circular(9.w)),
+                                  child: Image.network(
+                                    e,
+                                    width: 70.w,
+                                    height: 70.w,
+                                    fit: BoxFit.cover,
+                                  ),
+                                );
+                              }),
+
                               Container(
                                 width: 70.w,
                                 height: 70.w,
@@ -194,7 +231,9 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                     color: const Color.fromRGBO(144, 144, 144, 1),
                                   ),
                                 ),
-                              )
+                              ).onTap(() {
+                                _showAvatarOptions(controller, 2);
+                              })
                             ],
                           ),
                         ),
@@ -361,6 +400,27 @@ class _EditInfoPageState extends State<EditInfoPage> {
                             TDPicker.showMultiLinkedPicker(context, title: '',
                                 onConfirm: (selected) {
                                   print(selected);
+                                  controller.location.value = selected.join("-");
+                                  Map province = address.firstWhere(
+                                      (e) => e["label"] == selected[0],
+                                    orElse: () => <String, Object>{},
+                                  );
+                                  if(province.isNotEmpty){
+                                    Map city = province["children"].firstWhere(
+                                      (e) => e["label"] == selected[1],
+                                      orElse: () => <String, Object>{},
+                                    );
+                                    if(city.isNotEmpty){
+                                      Map district = city["children"].firstWhere(
+                                            (e) => e["label"] == selected[2],
+                                        orElse: () => <String, Object>{},
+                                      );
+                                      if(city.isNotEmpty){
+                                        controller.locationValue.value = [province["value"], city["value"], district["value"]];
+                                        print([province["value"], city["value"], district["value"]]);
+                                      }
+                                    }
+                                  }
                                   setState(() {
 
                                   });
@@ -371,10 +431,11 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 initialData:[]);
                           },
                           child: Text(
-                            "请选择",
+                            controller.location.value != "" ? controller.location.value :"请选择",
                             style: TextStyle(
                                 fontSize: 13.w,
-                                color: const Color.fromRGBO(191, 191, 191, 1)
+                                color: controller.location.value != "" ? const Color.fromRGBO(51, 51, 51, 1) : const Color.fromRGBO(191, 191, 191, 1),
+                              fontWeight: controller.location.value != "" ? FontWeight.w500 : null,
                             ),
                           ),
                         ),),
@@ -383,6 +444,27 @@ class _EditInfoPageState extends State<EditInfoPage> {
                             TDPicker.showMultiLinkedPicker(context, title: '',
                                 onConfirm: (selected) {
                                   print(selected);
+                                  controller.homeLocation.value = selected.join("-");
+                                  Map province = address.firstWhere(
+                                        (e) => e["label"] == selected[0],
+                                    orElse: () => <String, Object>{},
+                                  );
+                                  if(province.isNotEmpty){
+                                    Map city = province["children"].firstWhere(
+                                          (e) => e["label"] == selected[1],
+                                      orElse: () => <String, Object>{},
+                                    );
+                                    if(city.isNotEmpty){
+                                      Map district = city["children"].firstWhere(
+                                            (e) => e["label"] == selected[2],
+                                        orElse: () => <String, Object>{},
+                                      );
+                                      if(city.isNotEmpty){
+                                        controller.homeLocationValue.value = [province["value"], city["value"], district["value"]];
+                                        print([province["value"], city["value"], district["value"]]);
+                                      }
+                                    }
+                                  }
                                   setState(() {
 
                                   });
@@ -393,10 +475,11 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 initialData:[]);
                           },
                           child: Text(
-                            "请选择",
+                            controller.homeLocation.value != "" ? controller.homeLocation.value :"请选择",
                             style: TextStyle(
-                                fontSize: 13.w,
-                                color: const Color.fromRGBO(191, 191, 191, 1)
+                              fontSize: 13.w,
+                              color: controller.homeLocation.value != "" ? const Color.fromRGBO(51, 51, 51, 1) : const Color.fromRGBO(191, 191, 191, 1),
+                              fontWeight: controller.homeLocation.value != "" ? FontWeight.w500 : null,
                             ),
                           ),
                         ),),
@@ -406,6 +489,7 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 onConfirm: (selected) {
                                   print(selected);
                                   print(controller.educationList[selected[0]]);
+                                  controller.educationSelect.value = selected[0];
                                   setState(() {
 
                                   });
@@ -413,10 +497,11 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 }, data: [controller.educationList.map((e) => e.desc ?? "").toList()]);
                           },
                           child: Text(
-                            "请选择",
+                            controller.educationSelect.value != -1 ? controller.educationList[controller.educationSelect.value].desc ?? "" : "请选择",
                             style: TextStyle(
                               fontSize: 13.w,
-                              color: const Color.fromRGBO(191, 191, 191, 1)
+                              color: controller.educationSelect.value != -1 ? const Color.fromRGBO(51, 51, 51, 1) :const Color.fromRGBO(191, 191, 191, 1),
+                              fontWeight: controller.educationSelect.value != -1 ? FontWeight.w500 : null
                             ),
                           ),
                         ),),
@@ -425,6 +510,15 @@ class _EditInfoPageState extends State<EditInfoPage> {
                             TDPicker.showMultiLinkedPicker(context, title: '',
                                 onConfirm: (selected) {
                                   print(selected);
+                                  controller.occupation.value = selected.join("-");
+                                  OccupationData first = controller.occupationList.firstWhere(
+                                      (e) => e.industry == selected[0],
+                                  );
+                                  OccupationList second = first.occupationList?.firstWhere(
+                                      (e) => e.occupation == selected[1]
+                                  ) ?? OccupationList();
+                                  print([first.industryCode, second.occupationCode]);
+                                  controller.occupationValue.value = [first.industryCode, second.occupationCode];
                                   setState(() {
 
                                   });
@@ -435,10 +529,11 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 initialData:[]);
                           },
                           child: Text(
-                            "请选择",
+                            controller.occupation.value != "" ? controller.occupation.value : "请选择",
                             style: TextStyle(
                                 fontSize: 13.w,
-                                color: const Color.fromRGBO(191, 191, 191, 1)
+                                color: controller.occupation.value != "" ? const Color.fromRGBO(51, 51, 51, 1) : const Color.fromRGBO(191, 191, 191, 1),
+                              fontWeight: controller.occupation.value != "" ? FontWeight.w500 : null
                             ),
                           ),
                         ),),
@@ -449,6 +544,7 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 onConfirm: (selected) {
                                   print(selected);
                                   print(controller.incomeList[selected[0]]);
+                                  controller.incomeSelect.value = selected[0];
                                   setState(() {
 
                                   });
@@ -456,10 +552,11 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 }, data: [controller.incomeList.map((e) => e.desc ?? "").toList()]);
                           },
                           child: Text(
-                            "请选择",
+                            controller.incomeSelect.value != -1 ? controller.incomeList[controller.incomeSelect.value].desc ?? "" :"请选择",
                             style: TextStyle(
                                 fontSize: 13.w,
-                                color: const Color.fromRGBO(191, 191, 191, 1)
+                                color: controller.incomeSelect.value != -1 ? const Color.fromRGBO(51, 51, 51, 1) : const Color.fromRGBO(191, 191, 191, 1),
+                              fontWeight: controller.incomeSelect.value != -1 ? FontWeight.w500 : null
                             ),
                           ),
                         ),),
@@ -469,6 +566,7 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 onConfirm: (selected) {
                                   print(selected);
                                   print(controller.maritalList[selected[0]]);
+                                  controller.maritalSelect.value = selected[0];
                                   setState(() {
 
                                   });
@@ -476,10 +574,11 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 }, data: [controller.maritalList.map((e) => e.desc ?? "").toList()]);
                           },
                           child: Text(
-                            "请选择",
+                            controller.maritalSelect.value != -1 ? controller.maritalList[controller.maritalSelect.value].desc ?? "" :"请选择",
                             style: TextStyle(
                                 fontSize: 13.w,
-                                color: const Color.fromRGBO(191, 191, 191, 1)
+                                color: controller.maritalSelect.value != -1 ? const Color.fromRGBO(51, 51, 51, 1) : const Color.fromRGBO(191, 191, 191, 1),
+                                fontWeight: controller.maritalSelect.value != -1 ? FontWeight.w500 : null
                             ),
                           ),
                         ),),
@@ -489,6 +588,7 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 onConfirm: (selected) {
                                   print(selected);
                                   print(controller.propertyList[selected[0]]);
+                                  controller.propertySelect.value = selected[0];
                                   setState(() {
 
                                   });
@@ -496,13 +596,41 @@ class _EditInfoPageState extends State<EditInfoPage> {
                                 }, data: [controller.propertyList.map((e) => e.desc ?? "").toList()]);
                           },
                           child: Text(
-                            "请选择",
+                            controller.propertySelect.value != -1 ? controller.propertyList[controller.propertySelect.value].desc ?? "" :"请选择",
                             style: TextStyle(
                                 fontSize: 13.w,
-                                color: const Color.fromRGBO(191, 191, 191, 1)
+                                color: controller.propertySelect.value != -1 ? const Color.fromRGBO(51, 51, 51, 1) : const Color.fromRGBO(191, 191, 191, 1),
+                                fontWeight: controller.propertySelect.value != -1 ? FontWeight.w500 : null
                             ),
                           ),
                         ),),
+
+
+                        Container(
+                          margin: EdgeInsets.symmetric(
+                            vertical: 30.w
+                          ),
+                          child: Container(
+                            width: 255.w,
+                            height: 42.w,
+                            decoration: BoxDecoration(
+                                borderRadius: BorderRadius.all(Radius.circular(42.w)),
+                                color: const Color.fromRGBO(117, 98, 249, 1)
+                            ),
+                            child: Center(
+                              child: Text(
+                                "保存修改",
+                                style: TextStyle(
+                                    fontSize: 14.w,
+                                    color: Colors.white,
+                                    fontWeight: FontWeight.w500
+                                ),
+                              ),
+                            ),
+                          ).onTap((){
+                            controller.saveData();
+                          }),
+                        )
                         // SizedBox(height: 8.w,),
                         // InkWell(
                         //   onTap: (){
@@ -578,11 +706,23 @@ class _EditInfoPageState extends State<EditInfoPage> {
                 if(controller.menuActive.value  == 2) ...[
                   Stack(
                     children: [
-                      Image.network(
+                      controller.imgList.length > 0 ? Image.network(
                         controller.imgList[controller.nowSelect.value],
                         width: 375.w,
                         height: 384.w,
                         fit: BoxFit.cover,
+                      ) : controller.avatarLocalPath.value != "" ? Image.file(
+                        File(controller.avatarLocalPath.value),
+                        width: 375.w,
+                        height: 384.w,
+                      ) : (controller.userData.value?.profilePhoto?.isNotEmpty ?? false) ? Image.network(
+                        "${controller.userData.value?.profilePhoto ?? ""}",
+                        width: 375.w,
+                        height: 384.w,
+                      ) : Image.asset(
+                        Assets.imagesUserAvatar,
+                        width: 375.w,
+                        height: 384.w,
                       ),
                       SingleChildScrollView(
                         child: Container(
@@ -842,7 +982,7 @@ class _EditInfoPageState extends State<EditInfoPage> {
                           ),
                         ),
                       ),
-                      Positioned(
+                      if(controller.imgList.length > 0) Positioned(
                         left: 15.w,
                         top: 313.w,
                         child: Row(

lib/pages/mine/mine_page.dart

@@ -75,6 +75,7 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
                             "${controller.userData.value?.profilePhoto ?? ""}",
                             width: 60.w,
                             height: 60.w,
+                            fit: BoxFit.cover,
                           ) : Image.asset(
                             Assets.imagesUserAvatar,
                             width: 60.w,