排版完成钱包页面，对接玫瑰相关接口，会员中心排版约一半

android/.kotlin/errors/errors-1762996678930.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\audioplayers_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\audioplayers_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\audioplayers_android-5.2.1\android\src\main\kotlin\xyz\luan\audioplayers\AudioContextAndroid.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\audioplayers_android-5.2.1\android\src\main\kotlin\xyz\luan\audioplayers\AudioContextAndroid.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\audioplayers_android-5.2.1\android\src\main\kotlin\xyz\luan\audioplayers\AudioContextAndroid.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\audioplayers_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\audioplayers_android-5.2.1\android\src\main\kotlin\xyz\luan\audioplayers\AudioContextAndroid.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\audioplayers_android-5.2.1\android\src\main\kotlin\xyz\luan\audioplayers\AudioContextAndroid.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\audioplayers_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\audioplayers_android-5.2.1\android\src\main\kotlin\xyz\luan\audioplayers\AudioContextAndroid.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-1762996678980.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\package_info_plus\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\package_info_plus\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\package_info_plus-9.0.0\android\src\main\kotlin\dev\fluttercommunity\plus\packageinfo\PackageInfoPlugin.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\package_info_plus-9.0.0\android\src\main\kotlin\dev\fluttercommunity\plus\packageinfo\PackageInfoPlugin.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\package_info_plus-9.0.0\android\src\main\kotlin\dev\fluttercommunity\plus\packageinfo\PackageInfoPlugin.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\package_info_plus\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\package_info_plus-9.0.0\android\src\main\kotlin\dev\fluttercommunity\plus\packageinfo\PackageInfoPlugin.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\package_info_plus-9.0.0\android\src\main\kotlin\dev\fluttercommunity\plus\packageinfo\PackageInfoPlugin.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\package_info_plus\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\package_info_plus-9.0.0\android\src\main\kotlin\dev\fluttercommunity\plus\packageinfo\PackageInfoPlugin.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-1762996679015.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\record_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\record_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\record_android-1.4.4\android\src\main\kotlin\com\llfbandit\record\RecordPlugin.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\record_android-1.4.4\android\src\main\kotlin\com\llfbandit\record\RecordPlugin.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\record_android-1.4.4\android\src\main\kotlin\com\llfbandit\record\RecordPlugin.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\record_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\record_android-1.4.4\android\src\main\kotlin\com\llfbandit\record\RecordPlugin.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\record_android-1.4.4\android\src\main\kotlin\com\llfbandit\record\RecordPlugin.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\record_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\record_android-1.4.4\android\src\main\kotlin\com\llfbandit\record\RecordPlugin.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-1762996679087.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\wakelock_plus\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\wakelock_plus\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\wakelock_plus-1.4.0\android\src\main\kotlin\dev\fluttercommunity\plus\wakelock\Wakelock.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\wakelock_plus-1.4.0\android\src\main\kotlin\dev\fluttercommunity\plus\wakelock\Wakelock.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\wakelock_plus-1.4.0\android\src\main\kotlin\dev\fluttercommunity\plus\wakelock\Wakelock.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\wakelock_plus\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\wakelock_plus-1.4.0\android\src\main\kotlin\dev\fluttercommunity\plus\wakelock\Wakelock.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\wakelock_plus-1.4.0\android\src\main\kotlin\dev\fluttercommunity\plus\wakelock\Wakelock.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\wakelock_plus\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\wakelock_plus-1.4.0\android\src\main\kotlin\dev\fluttercommunity\plus\wakelock\Wakelock.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/gradle.properties

@@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m
 android.useAndroidX=true
 android.enableJetifier=true
 
-#
-#systemProp.http.proxyHost=127.0.0.1
-#systemProp.http.proxyPort=10810
-#systemProp.https.proxyHost=127.0.0.1
-#systemProp.https.proxyPort=10810
+
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=10810
+systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyPort=10810

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

lib/components/home_appbar.dart

@@ -52,7 +52,7 @@ class _HomeAppbarState extends State<HomeAppbar> {
                               Text(
                                 entry.value,
                                 style: TextStyle(
-                                    fontSize: active == entry.key ? 19.w : 17.w,
+                                    fontSize: active == entry.key ? 19 : 17,
                                     color: const Color.fromRGBO(51, 51, 51, 1),
                                     fontWeight: active == entry.key ? FontWeight.w600 : FontWeight.w400
                                 ),
@@ -60,7 +60,7 @@ class _HomeAppbarState extends State<HomeAppbar> {
                               SizedBox(height: ScreenUtil().setWidth(4),),
                               if(active == entry.key) Image.asset(
                                 Assets.imagesTabChangeIcon,
-                                width: ScreenUtil().setWidth(12),
+                                width: 20,
                               )
                             ],
                           ),

lib/components/page_appbar.dart

@@ -21,8 +21,8 @@ class PageAppbar extends StatelessWidget implements PreferredSizeWidget {
       title: Text(
         title,
         style: TextStyle(
-            fontSize: ScreenUtil().setWidth(13),
-            fontWeight: FontWeight.w500,
+            fontSize: 20,
+            fontWeight: FontWeight.bold,
             color: const Color.fromRGBO(51, 51, 51, 1)
         ),
       ),

lib/controller/mine/rose_controller.dart

@@ -0,0 +1,70 @@
+import 'package:dating_touchme_app/model/mine/rose_data.dart';
+import 'package:dating_touchme_app/network/user_api.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+
+class RoseController extends GetxController {
+
+  // UserApi实例
+  late UserApi _userApi;
+  final roseList = <RoseData>[].obs;
+
+  final roseNum = 0.obs;
+
+  final payChecked = true.obs;
+
+  final activePay = 0.obs;
+
+
+
+  changePayActive(int index){
+    activePay.value = index;
+
+  }
+
+  @override
+  void onInit() {
+    super.onInit();
+
+    _userApi = Get.find<UserApi>();
+
+    getRoseList();
+    getRoseNum();
+  }
+
+  getRoseList() async {
+    try{
+      final response = await _userApi.listVirtualCurrencyProduct({});
+      if (response.data.isSuccess && response.data.data != null) {
+        final data = response.data.data;
+
+        roseList.addAll(data?.toList() ?? []);
+      } else {
+
+        // 响应失败，抛出异常
+        throw Exception(response.data.message ?? '获取数据失败');
+      }
+    } catch (e) {
+      print('玫瑰列表获取失败: $e');
+      SmartDialog.showToast('玫瑰列表获取失败');
+      rethrow;
+    }
+  }
+
+  getRoseNum() async {
+    try {
+      final response = await _userApi.getVirtualAccount({});
+      if (response.data.isSuccess && response.data.data != null) {
+        final data = response.data.data;
+        roseNum.value = data?.balance ?? 0;
+      } else {
+        roseNum.value = 0;
+      }
+    } catch (e){
+      print('玫瑰数量取失败: $e');
+      SmartDialog.showToast('玫瑰数量取失败');
+      rethrow;
+    }
+  }
+
+}

lib/controller/mine/rose_history_controller.dart

@@ -0,0 +1,59 @@
+import 'package:dating_touchme_app/model/mine/rose_history_data.dart';
+import 'package:dating_touchme_app/network/user_api.dart';
+import 'package:easy_refresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
+class RoseHistoryController extends GetxController {
+
+  late UserApi _userApi;
+
+  List<String> friendNavList = ["赠送记录", "收支详情", "聊天券记录"].obs;
+
+  final friendNavActive = 0.obs;
+
+  final roseHistoryList = <Records>[].obs;
+
+
+  late final EasyRefreshController listRefreshController;
+
+
+  @override
+  void onInit() {
+    super.onInit();
+
+    listRefreshController = EasyRefreshController(
+      controlFinishRefresh: true,
+      controlFinishLoad: true,
+    );
+    _userApi = Get.find<UserApi>();
+    getHistoryList();
+  }
+
+  changeNavTab(int i) async {
+    roseHistoryList.clear();
+    friendNavActive.value = i;
+    getHistoryList();
+  }
+
+  getHistoryList() async {
+    try{
+      final response = await _userApi.pageVirtualAccountRecord(
+        pageNum: 1,
+        pageSize: 10,
+        tradeType: friendNavActive.value == 0 ? 202 : friendNavActive.value == 1 ? null : 201
+      );
+      if (response.data.isSuccess && response.data.data != null) {
+        final data = response.data.data?.records ?? [];
+
+        roseHistoryList.addAll(data.toList());
+      } else {
+
+        // 响应失败，抛出异常
+        throw Exception(response.data.message ?? '获取数据失败');
+      }
+    } catch(e) {
+
+    }
+  }
+
+}

lib/controller/mine/user_controller.dart

@@ -73,7 +73,7 @@ class UserController extends GetxController {
       if (response.data.isSuccess) {
         // 检查data是否为null或者是空对象
         final information = response.data.data;
-        if (information == null || information.id.isEmpty || information.genderCode.isNaN || information.birthYear == null) {
+        if (information == null || information.id.isEmpty || information.genderCode.isNaN || information.birthYear == null || information.nickName.isEmpty) {
           //跳转到完善信息
           SmartDialog.showToast('转到完善信息');
           // 导航到完善信息页面

lib/generated/assets.dart

@@ -11,6 +11,8 @@ class Assets {
   static const String imagesAudio = 'assets/images/audio.png';
   static const String imagesAvatarsExample = 'assets/images/avatars_example.png';
   static const String imagesBackIcon = 'assets/images/back_icon.png';
+  static const String imagesBankIcon = 'assets/images/bank_icon.png';
+  static const String imagesBankcardIcon = 'assets/images/bankcard_icon.png';
   static const String imagesBgEditAvatars = 'assets/images/bg_edit_avatars.png';
   static const String imagesBgInformation = 'assets/images/bg_information.png';
   static const String imagesBtnBgIcon = 'assets/images/btn_bg_icon.png';
@@ -69,6 +71,7 @@ class Assets {
   static const String imagesSeat = 'assets/images/seat.png';
   static const String imagesSendMessageIcon = 'assets/images/send_message_icon.png';
   static const String imagesSetting = 'assets/images/setting.png';
+  static const String imagesSettingIcon = 'assets/images/setting_icon.png';
   static const String imagesShop = 'assets/images/shop.png';
   static const String imagesSubscript = 'assets/images/subscript.png';
   static const String imagesTabChangeIcon = 'assets/images/tab_change_icon.png';
@@ -78,6 +81,9 @@ class Assets {
   static const String imagesVideo = 'assets/images/video.png';
   static const String imagesVip = 'assets/images/vip.png';
   static const String imagesVipBanner = 'assets/images/vip_banner.png';
+  static const String imagesVipBg = 'assets/images/vip_bg.png';
+  static const String imagesVipFont = 'assets/images/vip_font.png';
+  static const String imagesVipImg = 'assets/images/vip_img.png';
   static const String imagesVoice = 'assets/images/voice.png';
   static const String imagesVoiceIcon = 'assets/images/voice_icon.png';
   static const String imagesWallet = 'assets/images/wallet.png';

lib/model/mine/rose_data.dart

@@ -0,0 +1,52 @@
+class RoseData {
+  String? productId;
+  String? productSpecId;
+  num? mainCategory;
+  num? subCategory;
+  String? productTitle;
+  String? productDesc;
+  String? detailDesc;
+  num? unitOriginalPrice;
+  num? unitSellingPrice;
+  String? purchaseTimeValue;
+
+  RoseData(
+      {this.productId,
+        this.productSpecId,
+        this.mainCategory,
+        this.subCategory,
+        this.productTitle,
+        this.productDesc,
+        this.detailDesc,
+        this.unitOriginalPrice,
+        this.unitSellingPrice,
+        this.purchaseTimeValue});
+
+  RoseData.fromJson(Map<String, dynamic> json) {
+    productId = json['productId'];
+    productSpecId = json['productSpecId'];
+    mainCategory = json['mainCategory'];
+    subCategory = json['subCategory'];
+    productTitle = json['productTitle'];
+    productDesc = json['productDesc'];
+    detailDesc = json['detailDesc'];
+    unitOriginalPrice = json['unitOriginalPrice'];
+    unitSellingPrice = json['unitSellingPrice'];
+    purchaseTimeValue = json['purchaseTimeValue'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['productId'] = this.productId;
+    data['productSpecId'] = this.productSpecId;
+    data['mainCategory'] = this.mainCategory;
+    data['subCategory'] = this.subCategory;
+    data['productTitle'] = this.productTitle;
+    data['productDesc'] = this.productDesc;
+    data['detailDesc'] = this.detailDesc;
+    data['unitOriginalPrice'] = this.unitOriginalPrice;
+    data['unitSellingPrice'] = this.unitSellingPrice;
+    data['purchaseTimeValue'] = this.purchaseTimeValue;
+    return data;
+  }
+}

lib/model/mine/rose_history_data.dart

@@ -0,0 +1,57 @@
+class RoseHistoryData {
+  List<Records>? records;
+  int? total;
+  int? size;
+  int? current;
+  int? pages;
+
+  RoseHistoryData(
+      {this.records, this.total, this.size, this.current, this.pages});
+
+  RoseHistoryData.fromJson(Map<String, dynamic> json) {
+    if (json['records'] != null) {
+      records = <Records>[];
+      json['records'].forEach((v) {
+        records!.add(new Records.fromJson(v));
+      });
+    }
+    total = json['total'];
+    size = json['size'];
+    current = json['current'];
+    pages = json['pages'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    if (this.records != null) {
+      data['records'] = this.records!.map((v) => v.toJson()).toList();
+    }
+    data['total'] = this.total;
+    data['size'] = this.size;
+    data['current'] = this.current;
+    data['pages'] = this.pages;
+    return data;
+  }
+}
+
+class Records {
+  int? tradeType;
+  int? tradeBalance;
+  String? createTime;
+
+  Records({this.tradeType, this.tradeBalance, this.createTime});
+
+  Records.fromJson(Map<String, dynamic> json) {
+    tradeType = json['tradeType'];
+    tradeBalance = json['tradeBalance'];
+    createTime = json['createTime'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['tradeType'] = this.tradeType;
+    data['tradeBalance'] = this.tradeBalance;
+    data['createTime'] = this.createTime;
+    return data;
+  }
+}

lib/model/mine/user_rose_data.dart

@@ -0,0 +1,18 @@
+class UserRoseData {
+  String? id;
+  int? balance;
+
+  UserRoseData({this.id, this.balance});
+
+  UserRoseData.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    balance = json['balance'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['id'] = this.id;
+    data['balance'] = this.balance;
+    return data;
+  }
+}

lib/network/api_urls.dart

@@ -12,6 +12,9 @@ class ApiUrls {
   static const String getHxUserToken = 'dating-agency-chat-audio/user/get/hx/user/token';
   static const String getApplyTempAuth = 'dating-agency-uec/get/apply-temp-auth';
   static const String saveCertificationAudit = 'dating-agency-service/user/save/certification/audit';
+  static const String listVirtualCurrencyProduct = 'dating-agency-mall/user/list/virtual-currency-product';
+  static const String getVirtualAccount = 'dating-agency-mall/user/get/virtual-account';
+  static const String pageVirtualAccountRecord = 'dating-agency-mall/user/page/virtual-account-record';
 
   //首页相关接口
   static const String getMarriageList = 'dating-agency-service/user/page/dongwo/marriage-information';

lib/network/user_api.dart

@@ -1,7 +1,10 @@
 import 'package:dating_touchme_app/model/common/oss_data.dart';
 import 'package:dating_touchme_app/model/mine/login_data.dart';
+import 'package:dating_touchme_app/model/mine/rose_data.dart';
+import 'package:dating_touchme_app/model/mine/rose_history_data.dart';
 import 'package:dating_touchme_app/model/mine/user_base_data.dart';
 import 'package:dating_touchme_app/model/mine/user_data.dart';
+import 'package:dating_touchme_app/model/mine/user_rose_data.dart';
 import 'package:dating_touchme_app/network/response_model.dart';
 import 'package:dating_touchme_app/network/api_urls.dart';
 import 'package:retrofit/retrofit.dart';
@@ -46,4 +49,21 @@ abstract class UserApi {
 
   @GET(ApiUrls.getApplyTempAuth)
   Future<HttpResponse<BaseResponse<OssData>>> getApplyTempAuth();
-}
+
+  @GET(ApiUrls.listVirtualCurrencyProduct)
+  Future<HttpResponse<BaseResponse<List<RoseData>>>> listVirtualCurrencyProduct(
+    @Body() Map<String, dynamic> data,
+  );
+
+  @GET(ApiUrls.getVirtualAccount)
+  Future<HttpResponse<BaseResponse<UserRoseData>>> getVirtualAccount(
+    @Body() Map<String, dynamic> data,
+  );
+
+  @GET(ApiUrls.pageVirtualAccountRecord)
+  Future<HttpResponse<BaseResponse<RoseHistoryData>>> pageVirtualAccountRecord({
+    @Query('pageNum') required int pageNum,
+    @Query('pageSize') required int pageSize,
+    @Query('tradeType') int? tradeType,
+  });
+}

lib/network/user_api.g.dart

@@ -282,6 +282,123 @@ class _UserApi implements UserApi {
     return httpResponse;
   }
 
+  @override
+  Future<HttpResponse<BaseResponse<List<RoseData>>>> listVirtualCurrencyProduct(
+    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<List<RoseData>>>>(
+      Options(method: 'GET', headers: _headers, extra: _extra)
+          .compose(
+            _dio.options,
+            'dating-agency-mall/user/list/virtual-currency-product',
+            queryParameters: queryParameters,
+            data: _data,
+          )
+          .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
+    );
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late BaseResponse<List<RoseData>> _value;
+    try {
+      _value = BaseResponse<List<RoseData>>.fromJson(
+        _result.data!,
+        (json) => json is List<dynamic>
+            ? json
+                  .map<RoseData>(
+                    (i) => RoseData.fromJson(i as Map<String, dynamic>),
+                  )
+                  .toList()
+            : List.empty(),
+      );
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
+    final httpResponse = HttpResponse(_value, _result);
+    return httpResponse;
+  }
+
+  @override
+  Future<HttpResponse<BaseResponse<UserRoseData>>> getVirtualAccount(
+    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<UserRoseData>>>(
+      Options(method: 'GET', headers: _headers, extra: _extra)
+          .compose(
+            _dio.options,
+            'dating-agency-mall/user/get/virtual-account',
+            queryParameters: queryParameters,
+            data: _data,
+          )
+          .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
+    );
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late BaseResponse<UserRoseData> _value;
+    try {
+      _value = BaseResponse<UserRoseData>.fromJson(
+        _result.data!,
+        (json) => UserRoseData.fromJson(json as Map<String, dynamic>),
+      );
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
+    final httpResponse = HttpResponse(_value, _result);
+    return httpResponse;
+  }
+
+  @override
+  Future<HttpResponse<BaseResponse<RoseHistoryData>>> pageVirtualAccountRecord({
+    required int pageNum,
+    required int pageSize,
+    int? tradeType,
+  }) async {
+    final _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{
+      r'pageNum': pageNum,
+      r'pageSize': pageSize,
+      r'tradeType': tradeType,
+    };
+    queryParameters.removeWhere((k, v) => v == null);
+    final _headers = <String, dynamic>{};
+    const Map<String, dynamic>? _data = null;
+    final _options =
+        _setStreamType<HttpResponse<BaseResponse<RoseHistoryData>>>(
+          Options(method: 'GET', headers: _headers, extra: _extra)
+              .compose(
+                _dio.options,
+                'dating-agency-mall/user/page/virtual-account-record',
+                queryParameters: queryParameters,
+                data: _data,
+              )
+              .copyWith(
+                baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl),
+              ),
+        );
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late BaseResponse<RoseHistoryData> _value;
+    try {
+      _value = BaseResponse<RoseHistoryData>.fromJson(
+        _result.data!,
+        (json) => RoseHistoryData.fromJson(json as Map<String, 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/add_bankcard_page.dart

@@ -0,0 +1,279 @@
+import 'package:dating_touchme_app/components/page_appbar.dart';
+import 'package:dating_touchme_app/extension/ex_widget.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+class AddBankcardPage extends StatefulWidget {
+  const AddBankcardPage({super.key});
+
+  @override
+  State<AddBankcardPage> createState() => _AddBankcardPageState();
+}
+
+class _AddBankcardPageState extends State<AddBankcardPage> {
+
+
+  String username = '';
+  final TextEditingController _usernameController = TextEditingController();
+
+  List<String> bankList = [
+    "农业银行",
+    "建设银行",
+    "工商银行",
+    "中信银行",
+    "广发银行"
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: PageAppbar(title: "提现"),
+      body: SingleChildScrollView(
+        child: Container(
+          padding: EdgeInsetsGeometry.symmetric(
+            horizontal: 28.w,
+            vertical: 16.w
+          ),
+          child: Column(
+            children: [
+              Container(
+                padding: EdgeInsets.only(
+                    bottom: 12.w
+                ),
+                decoration: BoxDecoration(
+                    border: Border(
+                        bottom: BorderSide(
+                            width: 1,
+                            color: const Color.fromRGBO(238, 238, 238, 1)
+                        )
+                    )
+                ),
+                child: Row(
+                  children: [
+                    Text(
+                      "添加银行卡",
+                      style: TextStyle(
+                          fontSize: 14.w,
+                          fontWeight: FontWeight.w500
+                      ),
+                    )
+                  ],
+                ),
+              ),
+              addItem(label: "持卡人", child: TextField(
+                controller: _usernameController,
+                keyboardType: TextInputType.number,
+                style: TextStyle(
+                    fontSize: ScreenUtil().setWidth(13),
+                    height: 1,
+                ),
+                decoration: InputDecoration(
+                  contentPadding: EdgeInsets.symmetric(
+                      vertical: 0,
+                      horizontal: 0
+                  ),
+                  hintText: "请输入持卡人姓名",
+                  hintStyle: TextStyle(
+                    color: Colors.grey
+                  ),
+
+                  border: const OutlineInputBorder(
+                    borderSide: BorderSide.none, // 这将移除边框 // 可选：设置圆角
+                  ),
+                  // 如果你希望聚焦时和未聚焦时都没有边框，也可以设置 focusedBorder 和 enabledBorder
+                  focusedBorder: const OutlineInputBorder(
+                    borderSide: BorderSide.none,
+                    borderRadius: BorderRadius.all(Radius.circular(4.0)),
+                  ),
+                  enabledBorder: const OutlineInputBorder(
+                    borderSide: BorderSide.none,
+                    borderRadius: BorderRadius.all(Radius.circular(4.0)),
+                  ),
+                ),
+                onChanged: (value){
+                  username = value;
+                },
+              )),
+              addItem(label: "卡号", child: TextField(
+                controller: _usernameController,
+                keyboardType: TextInputType.number,
+                style: TextStyle(
+                    fontSize: ScreenUtil().setWidth(13),
+                    height: 1
+                ),
+                decoration: InputDecoration(
+                  contentPadding: EdgeInsets.symmetric(
+                      vertical: 0,
+                      horizontal: 0
+                  ),
+                  hintText: "请输入银行卡号",
+                  hintStyle: TextStyle(
+                      color: Colors.grey
+                  ),
+
+                  border: const OutlineInputBorder(
+                    borderSide: BorderSide.none, // 这将移除边框 // 可选：设置圆角
+                  ),
+                  // 如果你希望聚焦时和未聚焦时都没有边框，也可以设置 focusedBorder 和 enabledBorder
+                  focusedBorder: const OutlineInputBorder(
+                    borderSide: BorderSide.none,
+                    borderRadius: BorderRadius.all(Radius.circular(4.0)),
+                  ),
+                  enabledBorder: const OutlineInputBorder(
+                    borderSide: BorderSide.none,
+                    borderRadius: BorderRadius.all(Radius.circular(4.0)),
+                  ),
+                ),
+                onChanged: (value){
+                  username = value;
+                },
+              ), iconName: Icons.camera_alt_outlined),
+              addItem(label: "所属银行", child: Text(
+                "请选择所属银行",
+                style: TextStyle(
+                  fontSize: 13.w,
+                  color: Colors.grey
+                ),
+              ), iconName: Icons.keyboard_arrow_right).onTap((){
+
+                showModalBottomSheet(
+                    context: Get.context!,
+                    builder: (BuildContext context) {
+                      return Container(
+                        height: 357.w,
+                        color: Colors.white,
+                        child: Column(
+                          children: [
+                            Container(
+                              height: 37.w,
+                              color: const Color.fromRGBO(247, 247, 247, 1),
+                              padding: EdgeInsetsGeometry.symmetric(
+                                  horizontal: 16.w
+                              ),
+                              child: Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                children: [
+                                  Text(
+                                    "取消",
+                                    style: TextStyle(
+                                        fontSize: 14.w,
+                                        color: const Color.fromRGBO(153, 153, 153, 1)
+                                    ),
+                                  ).onTap((){
+                                    Navigator.pop(context);
+                                  }),
+                                  Text(
+                                    "选择所属银行",
+                                    style: TextStyle(
+                                        fontSize: 14.w,
+                                        fontWeight: FontWeight.w500
+                                    ),
+                                  ),
+                                  Text(
+                                    "确定",
+                                    style: TextStyle(
+                                        fontSize: 14.w,
+                                        color: const Color.fromRGBO(238, 129, 27, 1)
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            Expanded(
+                              child: CupertinoPicker(
+                                itemExtent: 60.w,
+                                onSelectedItemChanged: (int value) {
+                                  print(value);
+                                },
+                                children: [
+                                  ...bankList.map((e){
+                                    return Center(
+                                      child: Text(
+                                        e,
+                                        style: TextStyle(
+                                          fontSize: 14.w,
+                                          fontWeight: FontWeight.w500
+                                        ),
+                                      ),
+                                    );
+                                  }), 
+                                ],
+                              ),
+                            )
+                          ],
+                        ),
+                      );
+                    }
+                );
+              }),
+              addItem(label: "开户行", child: Text(
+                "请选择开户支行",
+                style: TextStyle(
+                    fontSize: 13.w,
+                    color: Colors.grey
+                ),
+              ), iconName: Icons.keyboard_arrow_right),
+              SizedBox(height: 40.w,),
+              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
+                    ),
+                  ),
+                ),
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget addItem({required String label, required Widget child, IconData? iconName}){
+    return Container(
+      height: 44.w,
+      decoration: BoxDecoration(
+        border: Border(
+          bottom: BorderSide(
+            width: 1,
+            color: const Color.fromRGBO(238, 238, 238, 1)
+          )
+        )
+      ),
+      child: Row(
+        children: [
+          SizedBox(
+            width: 66.w,
+            child: Text(
+              label,
+              style: TextStyle(
+                  fontSize: 14.w,
+                  fontWeight: FontWeight.w500
+              ),
+            ),
+          ),
+          Expanded(
+              child: child
+          ),
+          if(iconName != null) Icon(
+            iconName,
+            size: 20.w,
+            color: const Color.fromRGBO(153, 153, 153, 1),
+          )
+        ],
+      ),
+    );
+  }
+}

lib/pages/mine/mine_page.dart

@@ -1,5 +1,7 @@
 import 'package:dating_touchme_app/controller/mine/mine_controller.dart';
+import 'package:dating_touchme_app/extension/ex_widget.dart';
 import 'package:dating_touchme_app/pages/mine/edit_info_page.dart';
+import 'package:dating_touchme_app/pages/mine/vip_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:dating_touchme_app/generated/assets.dart';
@@ -153,7 +155,9 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
                   child: SizedBox(
                     width: 73.w,
                     height: 28.w,
-                  ),
+                  ).onTap((){
+                    Get.to(() => VipPage());
+                  }),
                 ),
               )
             ],

lib/pages/mine/rose_history_page.dart

@@ -1,101 +1,131 @@
 import 'package:dating_touchme_app/components/page_appbar.dart';
+import 'package:dating_touchme_app/controller/mine/rose_history_controller.dart';
 import 'package:dating_touchme_app/generated/assets.dart';
+import 'package:dating_touchme_app/model/mine/rose_history_data.dart';
+import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class RoseHistoryPage extends StatefulWidget {
-  const RoseHistoryPage({super.key});
-
-  @override
-  State<RoseHistoryPage> createState() => _RoseHistoryPageState();
-}
-
-class _RoseHistoryPageState extends State<RoseHistoryPage> {
-
+import 'package:get/get.dart';
 
 
-  List<String> friendNavList = ["赠送记录", "收支详情", "聊天券记录"];
+class RoseHistoryPage extends StatelessWidget {
+  const RoseHistoryPage({super.key});
 
-  int friendNavActive = 0;
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: PageAppbar(title: "交易记录"),
-      body: SingleChildScrollView(
-        child: Container(
-          padding: EdgeInsets.symmetric(
-            vertical: 6.w,
-            horizontal: 15.w
-          ),
-          child: Column(
-            children: [
-              Row(
-                children: [
-                  ...friendNavList.asMap().entries.map((entry){
-                    return Container(
-                      margin: EdgeInsets.only(right: 25.w),
-                      child: InkWell(
-                        onTap: (){
-                          friendNavActive = entry.key;
-                          setState(() {
+    return GetX<RoseHistoryController>(
+      init: RoseHistoryController(),
+      builder: (controller){
+        return Scaffold(
+          appBar: PageAppbar(title: "交易记录"),
+          body: EasyRefresh(
+            controller: controller.listRefreshController,
+            // 下拉刷新
+            onRefresh: () async {
+              print('推荐列表下拉刷新被触发');
+              Future.delayed(Duration(seconds: 3), () {
+                print("3 秒后执行");
+                controller.listRefreshController.finishRefresh(IndicatorResult.success);
+              });
+            },
+            // 上拉加载更多
+            onLoad: () async {  
+              print('推荐列表上拉加载被触发, hasMore: ');
+              Future.delayed(Duration(seconds: 3), () {
+                print("3 秒后执行");
+                controller.listRefreshController.finishLoad(IndicatorResult.success);
+              });
+            },
+            child: SingleChildScrollView(
+              child: Container(
+                padding: EdgeInsets.symmetric(
+                    vertical: 6.w,
+                    horizontal: 15.w
+                ),
+                child: Column(
+                  children: [
+                    Row(
+                      children: [
+                        ...controller.friendNavList.asMap().entries.map((entry){
+                          return Container(
+                            margin: EdgeInsets.only(right: 25.w),
+                            child: InkWell(
+                              onTap: (){
+                                controller.changeNavTab(entry.key);
 
-                          });
-                        },
-                        child: Container(
-                          padding: entry.key == friendNavActive ? EdgeInsets.symmetric(vertical: 2.w, horizontal: 26.w) : EdgeInsets.zero,
-                          decoration: BoxDecoration(
-                              borderRadius: BorderRadius.all(Radius.circular(21.w)),
-                              color: entry.key == friendNavActive ? const Color.fromRGBO(117, 98, 249, 1) : Colors.transparent
-                          ),
-                          child: Text(
-                            entry.value,
-                            style: TextStyle(
-                                fontSize: 12.w,
-                                color: entry.key == friendNavActive ? Colors.white : const Color.fromRGBO(51, 51, 51, .7),
-                                fontWeight: entry.key == friendNavActive ? FontWeight.w700 : FontWeight.w500
+                              },
+                              child: Container(
+                                padding: entry.key == controller.friendNavActive.value ? EdgeInsets.symmetric(vertical: 2.w, horizontal: 26.w) : EdgeInsets.zero,
+                                decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.all(Radius.circular(21.w)),
+                                    color: entry.key == controller.friendNavActive.value ? const Color.fromRGBO(117, 98, 249, 1) : Colors.transparent
+                                ),
+                                child: Text(
+                                  entry.value,
+                                  style: TextStyle(
+                                      fontSize: 12.w,
+                                      color: entry.key == controller.friendNavActive.value ? Colors.white : const Color.fromRGBO(51, 51, 51, .7),
+                                      fontWeight: entry.key == controller.friendNavActive.value ? FontWeight.w700 : FontWeight.w500
+                                  ),
+                                ),
+                              ),
                             ),
-                          ),
-                        ),
-                      ),
-                    );
-                  }),
+                          );
+                        }),
 
-                ],
-              ),
-              SizedBox(height: 4.w,),
-              if(friendNavActive != 2) ...[
-                SendItem(),
-                SendItem(),
-                SendItem(),
-                SendItem(),
-                SendItem(),
-              ],
-              if(friendNavActive == 2) ...[
-                ChatCouponItem(),
-                ChatCouponItem(),
-                ChatCouponItem(),
-                ChatCouponItem(),
-                ChatCouponItem(),
-              ],
-              SizedBox(height: 6.w,),
-              Text(
-                "没有更多了",
-                style: TextStyle(
-                  fontSize: 11.w,
-                  color: const Color.fromRGBO(144, 144, 144, 1),
+                      ],
+                    ),
+                    SizedBox(height: 4.w,),
+                    if(controller.friendNavActive.value != 2) ...[
+                      ...controller.roseHistoryList.map((e){
+                        return SendItem(item: e);
+                      })
+                    ],
+                    if(controller.friendNavActive.value == 2) ...[
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                      ChatCouponItem(),
+                    ],
+                    SizedBox(height: 6.w,),
+                    Text(
+                      "没有更多了",
+                      style: TextStyle(
+                        fontSize: 11.w,
+                        color: const Color.fromRGBO(144, 144, 144, 1),
+                      ),
+                    )
+                  ],
                 ),
-              )
-            ],
+              ),
+            ),
           ),
-        ),
-      ),
+        );
+      },
     );
   }
 }
 
 class SendItem extends StatefulWidget {
-  const SendItem({super.key});
+  final Records item;
+  const SendItem({super.key, required this.item});
 
   @override
   State<SendItem> createState() => _SendItemState();
@@ -140,7 +170,9 @@ class _SendItemState extends State<SendItem> {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   Text(
-                    "视频详情直播间送礼物",
+                    widget.item.tradeType == 201 ? "聊天花费" :
+                    widget.item.tradeType == 202 ? "赠送礼物" :
+                    widget.item.tradeType == 101 ? "充值" : "",
                     style: TextStyle(
                       fontSize: 13.w,
                       color: const Color.fromRGBO(51, 51, 51, 1),
@@ -148,7 +180,7 @@ class _SendItemState extends State<SendItem> {
                     ),
                   ),
                   Text(
-                    "2025-11-03  17:55:55",
+                    "${widget.item.createTime}",
                     style: TextStyle(
                       fontSize: 11.w,
                       color: const Color.fromRGBO(144, 144, 144, 1),
@@ -159,7 +191,7 @@ class _SendItemState extends State<SendItem> {
             ],
           ),
           Text(
-            "-1支",
+            "${widget.item.tradeType == 101 ? "+" : "-"}${widget.item.tradeBalance}支",
             style: TextStyle(
               fontSize: 13.w,
               color: const Color.fromRGBO(227, 84, 84, 1)

lib/pages/mine/rose_page.dart

@@ -1,271 +1,239 @@
 import 'package:dating_touchme_app/components/page_appbar.dart';
+import 'package:dating_touchme_app/controller/mine/rose_controller.dart';
 import 'package:dating_touchme_app/generated/assets.dart';
+import 'package:dating_touchme_app/model/mine/rose_data.dart';
 import 'package:dating_touchme_app/pages/mine/rose_history_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
-class RosePage extends StatefulWidget {
+class RosePage extends StatelessWidget {
   const RosePage({super.key});
 
-  @override
-  State<RosePage> createState() => _RosePageState();
-}
-
-class _RosePageState extends State<RosePage> {
-
-
-
-
-  bool payChecked = true;
-
-  int activePay = 0;
-  List<Map> payList = [
-    {"num": 10, "price": 10, "hasTag": true},
-    {"num": 60, "price": 60, "hasTag": true},
-    {"num": 300, "price": 60, "hasTag": true},
-    {"num": 1080, "price": 1080, "hasTag": false},
-    {"num": 2880, "price": 2880, "hasTag": false},
-    {"num": 5000, "price": 5000, "hasTag": false},
-    {"num": 10000, "price": 10000, "hasTag": false},
-    {"num": 20000, "price": 20000, "hasTag": false},
-    {"num": 50000, "price": 50000, "hasTag": false},
-  ];
-
-
-
-  changePayActive(int index){
-    activePay = index;
-    setState(() {
-
-    });
-  }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: PageAppbar(title: "玫瑰充值", right: Container(
-        margin: EdgeInsets.only(right: 14.w),
-        child: InkWell(
-          onTap: (){
-            // context.pushNamed(RouteNames.payHistory);
-            Get.to(() => RoseHistoryPage());
-          },
-          child: Text(
-            "交易记录",
-            style: TextStyle(
-              fontSize: 13.w,
-              color: const Color.fromRGBO(144, 144, 144, 1),
+    return GetX<RoseController>(
+      init: RoseController(),
+      builder: (controller){
+        return Scaffold(
+          appBar: PageAppbar(title: "玫瑰充值", right: Container(
+            margin: EdgeInsets.only(right: 14.w),
+            child: InkWell(
+              onTap: (){
+                // context.pushNamed(RouteNames.payHistory);
+                Get.to(() => RoseHistoryPage());
+              },
+              child: Text(
+                "交易记录",
+                style: TextStyle(
+                  fontSize: 13.w,
+                  color: const Color.fromRGBO(144, 144, 144, 1),
+                ),
+              ),
             ),
-          ),
-        ),
-      ),),
-      body: SingleChildScrollView(
-        child: Container(
-          padding: EdgeInsets.symmetric(
-            vertical: 10.w,
-            horizontal: 12.w
-          ),
-          child: Column(
-            children: [
-              Image.asset(
-                Assets.imagesRoseBanner,
-                width: 350.w,
-                height: 161.w,
+          ),),
+          body: SingleChildScrollView(
+            child: Container(
+              padding: EdgeInsets.symmetric(
+                  vertical: 10.w,
+                  horizontal: 12.w
               ),
-              SizedBox(height: 22.w,),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.start,
+              child: Column(
                 children: [
-                  Text(
-                    "余额：",
-                    style: TextStyle(
-                      fontSize: 11.w,
-                      color: const Color.fromRGBO(144, 144, 144, 1),
-                      fontWeight: FontWeight.w500
-                    ),
-                  ),
-                  Text(
-                    "15",
-                    style: TextStyle(
-                      fontSize: 16.w,
-                      color: const Color.fromRGBO(117, 98, 249, 1),
-                      fontWeight: FontWeight.w700
-                    ),
-                  ),
-                  SizedBox(width: 5.w,),
                   Image.asset(
-                    Assets.imagesRoseGift,
-                    width: 13.w,
-                    height: 13.w,
-                  )
-                ],
-              ),
-
-
-              Wrap(
-                spacing: 4.w,
-                runSpacing: 7.w,
-                children: [
-                  ...payList.asMap().entries.map((entry){
-                    return PayItem(item: entry.value, active: activePay, index: entry.key, changeActive: changePayActive);
-                  }),
-                ],
-              ),
-              Container(
-                height: 1,
-                margin: EdgeInsets.only(
-                    top: 10.w,
-                    bottom: 15.w
-                ),
-                color: const Color.fromRGBO(219, 219, 219, 1),
-              ),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
+                    Assets.imagesRoseBanner,
+                    width: 350.w,
+                    height: 161.w,
+                  ),
+                  SizedBox(height: 22.w,),
                   Row(
+                    mainAxisAlignment: MainAxisAlignment.start,
                     children: [
-                      Image.asset(
-                        Assets.imagesAliPay,
-                        width: 17.w,
-                        height: 17.w,
-                      ),
-                      SizedBox(width: 6.w,),
                       Text(
-                        "支付宝支付",
+                        "余额：",
                         style: TextStyle(
                             fontSize: 11.w,
-                            color: const Color.fromRGBO(51, 51, 51, 1),
+                            color: const Color.fromRGBO(144, 144, 144, 1),
                             fontWeight: FontWeight.w500
                         ),
+                      ),
+                      Text(
+                        "${controller.roseNum.value}",
+                        style: TextStyle(
+                            fontSize: 16.w,
+                            color: const Color.fromRGBO(117, 98, 249, 1),
+                            fontWeight: FontWeight.w700
+                        ),
+                      ),
+                      SizedBox(width: 5.w,),
+                      Image.asset(
+                        Assets.imagesRoseGift,
+                        width: 13.w,
+                        height: 13.w,
                       )
                     ],
                   ),
-                  Checkbox(
-                    value: payChecked,
-                    onChanged: (value) {
-                      payChecked = true;
-                      setState(() {
 
-                      });
-                    },
-                    activeColor: const Color.fromRGBO(117, 98, 249, 1),
-                    side: const BorderSide(color: Colors.grey),
-                    shape: const CircleBorder(),
-                    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+
+                  Wrap(
+                    spacing: 4.w,
+                    runSpacing: 7.w,
+                    children: [
+                      ...controller.roseList.asMap().entries.map((entry){
+                        return PayItem(item: entry.value, active: controller.activePay.value, index: entry.key, changeActive: controller.changePayActive);
+                      }),
+                    ],
+                  ),
+                  Container(
+                    height: 1,
+                    margin: EdgeInsets.only(
+                        top: 10.w,
+                        bottom: 15.w
+                    ),
+                    color: const Color.fromRGBO(219, 219, 219, 1),
                   ),
-                ],
-              ),
-              SizedBox(height: 10.w,),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
                   Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      Image.asset(
-                        Assets.imagesWechatPay,
-                        width: 17.w,
-                        height: 17.w,
+                      Row(
+                        children: [
+                          Image.asset(
+                            Assets.imagesAliPay,
+                            width: 17.w,
+                            height: 17.w,
+                          ),
+                          SizedBox(width: 6.w,),
+                          Text(
+                            "支付宝支付",
+                            style: TextStyle(
+                                fontSize: 11.w,
+                                color: const Color.fromRGBO(51, 51, 51, 1),
+                                fontWeight: FontWeight.w500
+                            ),
+                          )
+                        ],
                       ),
-                      SizedBox(width: 6.w,),
-                      Text(
-                        "支付宝支付",
-                        style: TextStyle(
-                            fontSize: 11.w,
-                            color: const Color.fromRGBO(51, 51, 51, 1),
-                            fontWeight: FontWeight.w500
+                      Checkbox(
+                        value: controller.payChecked.value,
+                        onChanged: (value) {
+                          controller.payChecked.value = true;
+                        },
+                        activeColor: const Color.fromRGBO(117, 98, 249, 1),
+                        side: const BorderSide(color: Colors.grey),
+                        shape: const CircleBorder(),
+                        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                      ),
+                    ],
+                  ),
+                  SizedBox(height: 10.w,),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Row(
+                        children: [
+                          Image.asset(
+                            Assets.imagesWechatPay,
+                            width: 17.w,
+                            height: 17.w,
+                          ),
+                          SizedBox(width: 6.w,),
+                          Text(
+                            "支付宝支付",
+                            style: TextStyle(
+                                fontSize: 11.w,
+                                color: const Color.fromRGBO(51, 51, 51, 1),
+                                fontWeight: FontWeight.w500
+                            ),
+                          )
+                        ],
+                      ),
+                      Checkbox(
+                        value: !controller.payChecked.value,
+                        onChanged: (value) {
+                          controller.payChecked.value = false;
+                        },
+                        activeColor: const Color.fromRGBO(117, 98, 249, 1),
+                        side: const BorderSide(color: Colors.grey),
+                        shape: const CircleBorder(),
+                        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                      ),
+                    ],
+                  ),
+                  SizedBox(height: 8.w,),
+                  Row(
+                    children: [
+                      RichText(
+                        text: TextSpan(
+                            style: TextStyle(
+                                fontSize: 11.w,
+                                fontWeight: FontWeight.w500
+                            ),
+                            children: const [
+                              TextSpan(
+                                  text: "充值既代表同意",
+                                  style: TextStyle(
+                                      color: Color.fromRGBO(189, 189, 189, 1)
+                                  )
+                              ),
+                              TextSpan(
+                                  text: "《动我充值协议》",
+                                  style: TextStyle(
+                                      color: Color.fromRGBO(71, 123, 255, 1)
+                                  )
+                              ),
+                              TextSpan(
+                                  text: "和隐私政策",
+                                  style: TextStyle(
+                                      color: Color.fromRGBO(189, 189, 189, 1)
+                                  )
+                              ),
+                            ]
                         ),
                       )
                     ],
                   ),
-                  Checkbox(
-                    value: !payChecked,
-                    onChanged: (value) {
-                      payChecked = false;
-                      setState(() {
-
-                      });
-                    },
-                    activeColor: const Color.fromRGBO(117, 98, 249, 1),
-                    side: const BorderSide(color: Colors.grey),
-                    shape: const CircleBorder(),
-                    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                  ),
-                ],
-              ),
-              SizedBox(height: 8.w,),
-              Row(
-                children: [
-                  RichText(
-                    text: TextSpan(
+                  SizedBox(height: 50.w,),
+                  Container(
+                    width: 325.w,
+                    height: 45.w,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.all(Radius.circular(45.w)),
+                      gradient: LinearGradient(
+                        begin: Alignment.centerLeft,  // 0%：左边开始
+                        end: Alignment.centerRight,   // 100%：右边结束
+                        colors: [
+                          Color.fromRGBO(131, 89, 255, 1),  // 紫色
+                          Color.fromRGBO(77, 127, 231, 1),  // 中间淡蓝
+                          Color.fromRGBO(61, 138, 224, 1),  // 右侧深蓝
+                        ],
+                        stops: [0.0, 0.7753, 1.0], // 对应 CSS 百分比：0%、77.53%、100%
+                      ),
+                    ),
+                    child: Center(
+                      child: Text(
+                        "立即充值",
                         style: TextStyle(
-                            fontSize: 11.w,
+                            fontSize: 18.w,
+                            color: Colors.white,
                             fontWeight: FontWeight.w500
                         ),
-                        children: const [
-                          TextSpan(
-                              text: "充值既代表同意",
-                              style: TextStyle(
-                                  color: Color.fromRGBO(189, 189, 189, 1)
-                              )
-                          ),
-                          TextSpan(
-                              text: "《动我充值协议》",
-                              style: TextStyle(
-                                  color: Color.fromRGBO(71, 123, 255, 1)
-                              )
-                          ),
-                          TextSpan(
-                              text: "和隐私政策",
-                              style: TextStyle(
-                                  color: Color.fromRGBO(189, 189, 189, 1)
-                              )
-                          ),
-                        ]
+                      ),
                     ),
                   )
                 ],
               ),
-              SizedBox(height: 50.w,),
-              Container(
-                width: 325.w,
-                height: 45.w,
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.all(Radius.circular(45.w)),
-                  gradient: LinearGradient(
-                    begin: Alignment.centerLeft,  // 0%：左边开始
-                    end: Alignment.centerRight,   // 100%：右边结束
-                    colors: [
-                      Color.fromRGBO(131, 89, 255, 1),  // 紫色
-                      Color.fromRGBO(77, 127, 231, 1),  // 中间淡蓝
-                      Color.fromRGBO(61, 138, 224, 1),  // 右侧深蓝
-                    ],
-                    stops: [0.0, 0.7753, 1.0], // 对应 CSS 百分比：0%、77.53%、100%
-                  ),
-                ),
-                child: Center(
-                  child: Text(
-                    "立即充值",
-                    style: TextStyle(
-                        fontSize: 18.w,
-                        color: Colors.white,
-                        fontWeight: FontWeight.w500
-                    ),
-                  ),
-                ),
-              )
-            ],
+            ),
           ),
-        ),
-      ),
+        );
+      },
     );
   }
 }
 
 
-
 class PayItem extends StatefulWidget {
-  final Map item;
+  final RoseData item;
   final int active;
   final int index;
   final void Function(int) changeActive;
@@ -299,7 +267,7 @@ class _PayItemState extends State<PayItem> {
                   text: TextSpan(
                       children: [
                         TextSpan(
-                          text: "${widget.item["num"]}",
+                          text: "${widget.item.purchaseTimeValue}",
                           style: TextStyle(
                               fontSize: 17.w,
                               color: const Color.fromRGBO(51, 51, 51, 1),
@@ -318,7 +286,7 @@ class _PayItemState extends State<PayItem> {
                   ),
                 ),
                 Text(
-                  "${widget.item["price"]}元",
+                  "${widget.item.unitSellingPrice}元",
                   style: TextStyle(
                       fontSize: 11.w,
                       color: const Color.fromRGBO(144, 144, 144, 144),
@@ -328,7 +296,7 @@ class _PayItemState extends State<PayItem> {
               ],
             ),
           ),
-          if(widget.item["hasTag"]) Positioned(
+          if(widget.item.detailDesc != null) Positioned(
             top: 0,
             left: 0,
             child: Container(
@@ -353,7 +321,7 @@ class _PayItemState extends State<PayItem> {
               ),
               child: Center(
                 child: Text(
-                  "送新人大礼包",
+                  widget.item.detailDesc ?? "",
                   style: TextStyle(
                       fontSize: 6.w,
                       color: widget.active == widget.index ? Colors.white : const Color.fromRGBO(237, 23, 50, 1),

lib/pages/mine/vip_page.dart

@@ -0,0 +1,263 @@
+import 'package:dating_touchme_app/components/page_appbar.dart';
+import 'package:dating_touchme_app/generated/assets.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class VipPage extends StatefulWidget {
+  const VipPage({super.key});
+
+  @override
+  State<VipPage> createState() => _VipPageState();
+}
+
+class _VipPageState extends State<VipPage> {
+
+
+  bool checked = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        Positioned(
+          child: Container(
+            width: 375.w,
+            height: 812.h,
+            color: Colors.white,
+          ),
+        ),
+        Positioned(
+          left: 0,
+          top: -200,
+          child: Image.asset(
+            Assets.imagesVipBg,
+            width: 561.w,
+            height: 1120.w,
+            fit: BoxFit.cover,
+          ),
+        ),
+        Scaffold(
+          appBar: PageAppbar(
+            title: "会员中心",
+            backgroundColor: Colors.transparent,
+            right:  Container(
+              margin: EdgeInsets.only(
+                right: 18.w
+              ),
+              child: InkWell(
+                onTap: (){
+                  print("12121");
+                },
+                child: Image.asset(
+                  Assets.imagesSettingIcon,
+                  width: 17.w,
+                ),
+              ),
+            ),),
+          backgroundColor: Colors.transparent,
+          body: SingleChildScrollView(
+            child: Column(
+              children: [
+                Container(
+                  padding: EdgeInsets.only(
+                    top: 20.w,
+                    left: 15.w
+                  ),
+                  child:
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween ,
+                    children: [
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Row(
+                            children: [
+                              Image.asset(
+                                Assets.imagesUserAvatar,
+                                width: 60.w,
+                                height: 60.w,
+                              ),
+                              SizedBox(width: 15.w,),
+                              Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    "用户昵称",
+                                    style: TextStyle(
+                                      fontSize: 18.w,
+                                      fontWeight: FontWeight.w700
+                                    ),
+                                  ),
+                                  SizedBox(height: 6.w,),
+                                  Container(
+                                    width: 32.w,
+                                    height: 16.w,
+                                    decoration: BoxDecoration(
+                                      borderRadius: BorderRadius.all(Radius.circular(16.w)),
+                                      color: const Color.fromRGBO(201, 201, 201, 1)
+                                    ),
+                                    child: Center(
+                                      child: Image.asset(
+                                        Assets.imagesVipFont,
+                                        width: 20.w,
+                                        height: 8.w,
+                                      ),
+                                    ),
+                                  )
+                                ],
+                              )
+                            ],
+                          ),
+                          SizedBox(height: 29.w,),
+                          Text(
+                            "开通 动我vip 畅享尊贵特权~",
+                            style: TextStyle(
+                              fontSize: 11.w,
+                              color: const Color.fromRGBO(144, 144, 144, 1 )
+                            ),
+                          )
+                        ],
+                      ),
+                      Image.asset(
+                        Assets.imagesVipImg,
+                        width: 158.w,
+                        height: 179.w,
+                      )
+                    ],
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+        Positioned(
+          top: 270.w,
+          left: 0,
+          child: Material(
+            child: Container(
+              width: 375.w,
+              height: 821.h - 270.w,
+              padding: EdgeInsetsGeometry.symmetric(
+                vertical: 22.w,
+                horizontal: 13.w
+              ),
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.vertical(
+                  top: Radius.circular(18.w)
+                ),
+                color: Colors.white
+              ),
+              child: Column(
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      VipItem(),
+                      VipItem(),
+                      VipItem(),
+                    ],
+                  ),
+                  SizedBox(height: 12.w,),
+                  Row(
+                    children: [
+
+                      Checkbox(
+                        value: checked,
+                        onChanged: (value) {
+                          checked = value ?? false;
+                          setState(() {
+
+                          });
+                        },
+                        activeColor: const Color.fromRGBO(117, 98, 249, 1),
+                        side: const BorderSide(color: Colors.grey),
+                        shape: const CircleBorder(),
+                        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                      ),
+                      Text(
+                        "我已阅读并同意《会员购买协议》",
+                        style: TextStyle(
+                          fontSize: 11.w,
+                          color: const Color.fromRGBO(189, 189, 189, 1)
+                        ),
+                      )
+                    ],
+                  )
+                ],
+              ),
+            ),
+          ),
+        )
+      ],
+    );
+  }
+}
+
+class VipItem extends StatefulWidget {
+  const VipItem({super.key});
+
+  @override
+  State<VipItem> createState() => _VipItemState();
+}
+
+class _VipItemState extends State<VipItem> {
+  @override
+  Widget build(BuildContext context) {
+    return
+      Container(
+        width: 111.w,
+        height: 117.w,
+        padding: EdgeInsets.only(
+          top: 16.w,
+          bottom: 21.w
+        ),
+        decoration: BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(18.w)),
+            border: Border.all(width: 1, color: Color.fromRGBO(222, 222, 222, 1))
+        ),
+        child: Column(
+          children: [
+            Text(
+              "3个月",
+              style: TextStyle(
+                fontSize: 11.w,
+                fontWeight: FontWeight.w700
+              ),
+            ),
+            SizedBox(height: 2.w,),
+            Text(
+              "￥29.3/月",
+              style: TextStyle(
+                fontSize: 11.w,
+                color: const Color.fromRGBO(144, 144, 144, 1)
+              ),
+            ),
+            SizedBox(height: 23.w,),
+            RichText(
+              text: TextSpan(
+                style: TextStyle(
+                  color: const Color.fromRGBO(248, 85, 66, 1),
+                  fontWeight: FontWeight.w700
+                ),
+                children: [
+                  TextSpan(
+                    text: "￥",
+                    style: TextStyle(
+                      fontSize: 12.w
+                    )
+                  ),
+                  TextSpan(
+                      text: "88",
+                      style: TextStyle(
+                          fontSize: 18.w
+                      )
+                  ),
+                ]
+              ),
+            )
+          ],
+        ),
+      );
+  }
+}
+

lib/pages/mine/withdraw_history_page.dart

@@ -0,0 +1,120 @@
+import 'package:dating_touchme_app/components/page_appbar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class WithdrawHistoryPage extends StatefulWidget {
+  const WithdrawHistoryPage({super.key});
+
+  @override
+  State<WithdrawHistoryPage> createState() => _WithdrawHistoryPageState();
+}
+
+class _WithdrawHistoryPageState extends State<WithdrawHistoryPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: PageAppbar(title: "提现"),
+      body: SingleChildScrollView(
+        child: Container(
+          padding: EdgeInsetsGeometry.symmetric(
+            vertical: 11.w,
+            horizontal: 16.w
+          ),
+          child: Column(
+            children: [
+              historyItem(),
+              historyItem(),
+              historyItem(),
+              historyItem(),
+              historyItem(),
+              historyItem(),
+              historyItem(),
+              historyItem(),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget historyItem() {
+    return Container(
+      padding: EdgeInsets.only(
+        bottom: 12.w
+      ),
+      margin: EdgeInsets.only(
+        bottom: 16.w
+      ),
+      decoration: BoxDecoration(
+        border: Border(
+          bottom: BorderSide(
+            width: 1,
+            color: const Color.fromRGBO(238, 238, 238, 1)
+          )
+        )
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          RichText(
+            text: TextSpan(
+              children: [
+                TextSpan(
+                  text: "提现金额：",
+                  style: TextStyle(
+                    fontSize: 14.w,
+                    fontWeight: FontWeight.w500,
+                    color: const Color.fromRGBO(51, 51, 51, 1)
+                  )
+                ),
+                TextSpan(
+                    text: "680.00",
+                    style: TextStyle(
+                        fontSize: 14.w,
+                        fontWeight: FontWeight.w500,
+                      color: const Color.fromRGBO(238, 129, 27, 1)
+                    )
+                ),
+              ]
+            ),
+          ),
+          SizedBox(height: 8.w,),
+          Text(
+            "提现到工商银行（2465）",
+            style: TextStyle(
+              fontSize: 12.w,
+            ),
+          ),
+          SizedBox(height: 8.w,),
+          Text(
+            "申请时间：2024-04-23 15:23:48",
+            style: TextStyle(
+              fontSize: 12.w,
+              color: const Color.fromRGBO(153, 153, 153, 1)
+            ),
+          ),
+          SizedBox(height: 8.w,),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                "处理时间：2024-04-23 15:23:48",
+                style: TextStyle(
+                    fontSize: 12.w,
+                    color: const Color.fromRGBO(153, 153, 153, 1)
+                ),
+              ),
+              Text(
+                "查看打款凭证",
+                style: TextStyle(
+                  fontSize: 12.w,
+                  color: const Color.fromRGBO(25, 114, 248, 1)
+                ),
+              )
+            ],
+          )
+        ],
+      ),
+    );
+  }
+}

lib/pages/mine/withdraw_page.dart

@@ -1,6 +1,11 @@
 import 'package:dating_touchme_app/components/page_appbar.dart';
+import 'package:dating_touchme_app/extension/ex_widget.dart';
+import 'package:dating_touchme_app/generated/assets.dart';
+import 'package:dating_touchme_app/pages/mine/add_bankcard_page.dart';
+import 'package:dating_touchme_app/pages/mine/withdraw_history_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 
 class WithdrawPage extends StatefulWidget {
   const WithdrawPage({super.key});
@@ -68,7 +73,76 @@ class _WithdrawPageState extends State<WithdrawPage> {
                     ),
                   )
                 ],
-              ),
+              ).onTap(() {
+                showModalBottomSheet(
+                    context: Get.context!,
+                    builder: (BuildContext context) {
+                      return Container(
+                        height: 357.w,
+                        color: Colors.white,
+                        child: Column(
+                          children: [
+                            Container(
+                              height: 37.w,
+                              color: const Color.fromRGBO(247, 247, 247, 1),
+                              padding: EdgeInsetsGeometry.symmetric(
+                                horizontal: 16.w
+                              ),
+                              child: Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                children: [
+                                  Text(
+                                    "取消",
+                                    style: TextStyle(
+                                      fontSize: 14.w,
+                                      color: const Color.fromRGBO(153, 153, 153, 1)
+                                    ),
+                                  ).onTap((){
+                                    Navigator.pop(context);
+                                  }),
+                                  Text(
+                                    "选择到账银行卡",
+                                    style: TextStyle(
+                                      fontSize: 14.w,
+                                      fontWeight: FontWeight.w500
+                                    ),
+                                  ),
+                                  Text(
+                                    "取消",
+                                    style: TextStyle(
+                                        fontSize: 14.w,
+                                        color: const Color.fromRGBO(153, 153, 153, 0)
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            Expanded(
+                              child: SingleChildScrollView(
+                                child: Container(
+                                  padding: EdgeInsets.all(16.w),
+                                  child: Column(
+                                    children: [
+                                      cardItem(),
+                                      cardItem(),
+                                      cardItem(),
+                                      cardItem(),
+                                      cardItem(),
+                                      cardItem(),
+                                      addCard().onTap((){
+                                        Get.to(() => AddBankcardPage());
+                                      }),
+                                    ],
+                                  ),
+                                ),
+                              ),
+                            )
+                          ],
+                        ),
+                      );
+                    }
+                );
+              }),
             ),
             Container(
               padding:  EdgeInsetsGeometry.symmetric(
@@ -119,7 +193,9 @@ class _WithdrawPageState extends State<WithdrawPage> {
                           fontSize: 12.w,
                           color: const Color.fromRGBO(25, 114, 248, 1)
                         ),
-                      )
+                      ).onTap((){
+                        Get.to(() => WithdrawHistoryPage());
+                      })
                     ],
                   )
                 ],
@@ -130,4 +206,107 @@ class _WithdrawPageState extends State<WithdrawPage> {
       ),
     );
   }
+
+  Widget cardItem(){
+    return Container(
+      padding: EdgeInsets.only(
+        bottom: 12.w
+      ),
+      margin: EdgeInsets.only(
+        bottom: 20.w
+      ),
+      decoration: BoxDecoration(
+        border: Border(
+          bottom: BorderSide(
+            width: 1,
+            color: const Color.fromRGBO(238, 238, 238, 1)
+          )
+        )
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Row (
+            children: [
+              Image.asset(
+                Assets.imagesBankIcon,
+                width: 16.w,
+              ),
+              SizedBox(width: 10.w,),
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    "工商银行",
+                    style: TextStyle(
+                      fontSize: 14.w,
+                      fontWeight: FontWeight.w500
+                    ),
+                  ),
+                  Text(
+                    "**** **** **** 236",
+                    style: TextStyle(
+                        fontSize: 14.w,
+                        color: const Color.fromRGBO(153, 153, 153, 1)
+                    ),
+                  ),
+                ],
+              )
+            ],
+          ),
+          Icon(
+              Icons.check,
+            size: 20.w,
+            color: const Color.fromRGBO(238, 129, 27, 1),
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget addCard(){
+    return Container(
+      padding: EdgeInsets.only(
+          bottom: 12.w
+      ),
+      margin: EdgeInsets.only(
+          bottom: 20.w
+      ),
+      decoration: BoxDecoration(
+          border: Border(
+              bottom: BorderSide(
+                  width: 1,
+                  color: const Color.fromRGBO(238, 238, 238, 1)
+              )
+          )
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Row (
+            children: [
+              Image.asset(
+                Assets.imagesBankcardIcon,
+                width: 16.w,
+              ),
+              SizedBox(width: 10.w,),
+              Text(
+                "使用新卡提现",
+                style: TextStyle(
+                    fontSize: 14.w,
+                    fontWeight: FontWeight.w500
+                ),
+              ),
+            ],
+          ),
+          Icon(
+            Icons.keyboard_arrow_right,
+            size: 20.w,
+            color: const Color.fromRGBO(153, 153, 153, 1),
+          )
+        ],
+      ),
+    );
+  }
+
 }