dating-agency
/
dating_touchme_app
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://git.qniao.cn/dating-agency/dating_touchme_app

ios
Jolie 4 months ago
parent
ffe0efa6f3 dc05668ccc
commit
30a4405ce8
38 changed files with 2035 additions and 1140 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 198
      android/.kotlin/errors/errors-1763427903700.log
  2. 198
      android/.kotlin/errors/errors-1763427903713.log
  3. 1
      android/app/src/main/AndroidManifest.xml
  4. 13
      lib/components/page_appbar.dart
  5. 13
      lib/controller/discover/room_controller.dart
  6. 296
      lib/controller/mine/edit_info_controller.dart
  7. 13
      lib/controller/mine/login_controller.dart
  8. 5
      lib/controller/mine/mine_controller.dart
  9. 2
      lib/controller/mine/user_controller.dart
  10. 90
      lib/controller/mine/user_info_controller.dart
  11. 103
      lib/controller/setting/notification_controller.dart
  12. 230
      lib/controller/setting/setting_controller.dart
  13. 8
      lib/main.dart
  14. 12
      lib/model/mine/user_data.dart
  15. 4
      lib/model/rtc/rtc_channel_data.dart
  16. 3
      lib/network/api_urls.dart
  17. 1
      lib/network/network_config.dart
  18. 8
      lib/network/rtc_api.dart
  19. 62
      lib/network/rtc_api.g.dart
  20. 5
      lib/network/user_api.dart
  21. 50
      lib/network/user_api.g.dart
  22. 2
      lib/pages/home/report_page.dart
  23. 7
      lib/pages/main/main_page.dart
  24. 6
      lib/pages/mine/auth_center_page.dart
  25. 230
      lib/pages/mine/edit_info_page.dart
  26. 174
      lib/pages/mine/login_controller.dart
  27. 6
      lib/pages/mine/mine_page.dart
  28. 6
      lib/pages/mine/phone_page.dart
  29. 6
      lib/pages/mine/real_name_page.dart
  30. 410
      lib/pages/mine/setting_page.dart
  31. 111
      lib/pages/mine/user_info_page.dart
  32. 0
      lib/pages/setting/blacklist_page.dart
  33. 77
      lib/pages/setting/notice_page.dart
  34. 153
      lib/pages/setting/setting_page.dart
  35. 22
      lib/rtc/rtc_manager.dart
  36. 163
      lib/rtc/rtm_manager.dart
  37. 484
      pubspec.lock
  38. 3
      pubspec.yaml

198
android/.kotlin/errors/errors-1763427903700.log
View File

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

198
android/.kotlin/errors/errors-1763427903713.log
View File

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

1
android/app/src/main/AndroidManifest.xml
View File

@ -4,6 +4,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application
android:label="动我"
android:name="${applicationName}"

13
lib/components/page_appbar.dart
View File

@ -5,10 +5,10 @@ class PageAppbar extends StatelessWidget implements PreferredSizeWidget {
final Color? backgroundColor;
final Color? color;
final bool? bottom;
final String title;
final Widget? right;
const PageAppbar({super.key, required this.title, this.backgroundColor, this.color, this.right});
const PageAppbar({super.key, required this.title, this.backgroundColor, this.color, this.right, this.bottom});
@override
Widget build(BuildContext context) {
@ -21,11 +21,18 @@ class PageAppbar extends StatelessWidget implements PreferredSizeWidget {
title: Text(
title,
style: TextStyle(
fontSize: 20,
fontSize: 16,
fontWeight: FontWeight.bold,
color: const Color.fromRGBO(51, 51, 51, 1)
),
),
bottom: (bottom != null && bottom!) ? PreferredSize(
preferredSize: Size.fromHeight(0.5),
child: Container(
color: Colors.grey[300],
height: 0.5,
),
) : null,
);
}
@override

13
lib/controller/discover/room_controller.dart
View File

@ -1,8 +1,10 @@
import 'package:agora_token_generator/agora_token_generator.dart';
import 'package:dating_touchme_app/model/rtc/rtc_channel_data.dart';
import 'package:dating_touchme_app/network/network_service.dart';
import 'package:dating_touchme_app/rtc/rtc_manager.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import '../../pages/discover/live_room_page.dart';
@ -27,10 +29,9 @@ class RoomController extends GetxController {
isLoading.value = true;
final response = await _networkService.rtcApi.createRtcChannel();
final base = response.data;
if (base.isSuccess && base.data != null) {
rtcChannel.value = base.data;
await _joinRtcChannel(base.data!);
await _joinRtcChannel(base.data!.token, base.data!.channelId, base.data!.uid);
} else {
final message = base.message.isNotEmpty ? base.message : '创建频道失败';
SmartDialog.showToast(message);
@ -41,13 +42,13 @@ class RoomController extends GetxController {
isLoading.value = false;
}
}
Future<void> _joinRtcChannel(RtcChannelData data) async {
Future<void> _joinRtcChannel(String token, String channelName, int uid) async {
try {
await RTCManager.instance.joinChannel(
token: data.token,
channelId: data.channelId,
token: token,
channelId: channelName,
uid: uid
);
Get.to(() => const LiveRoomPage(id: 0));
} catch (e) {
SmartDialog.showToast('加入频道失败：$e');
}

296
lib/controller/mine/edit_info_controller.dart
View File

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

13
lib/controller/mine/login_controller.dart
View File

@ -1,4 +1,5 @@
import 'dart:async';
import 'package:dating_touchme_app/controller/global.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@ -110,14 +111,14 @@ class LoginController extends GetxController {
if (response.data.isSuccess) {
// 保存token和用户信息
if (response.data.data != null) {
final loginData = response.data.data!;
await storage.write('token', loginData.token);
await storage.write('userId', loginData.userId);
// 保存用户信息
await storage.write('userInfo', loginData.toJson());
final result = response.data.data!;
GlobalData().userId = result.userId;
GlobalData().qnToken = result.token;
await storage.write('token', result.token);
// await storage.write('userId', result.userId);
// 登录成功后获取用户信息
await _handleUserInfoRetrieval(loginData.userId);
await _handleUserInfoRetrieval(result.userId);
}
} else {
SmartDialog.showToast(response.data.message);

5
lib/controller/mine/mine_controller.dart
View File

@ -1,13 +1,12 @@
import 'package:dating_touchme_app/controller/global.dart';
import 'package:dating_touchme_app/generated/assets.dart';
import 'package:dating_touchme_app/model/mine/user_data.dart';
import 'package:dating_touchme_app/pages/mine/auth_center_page.dart';
import 'package:dating_touchme_app/pages/mine/my_wallet_page.dart';
import 'package:dating_touchme_app/pages/mine/rose_page.dart';
import 'package:dating_touchme_app/pages/mine/setting_page.dart';
import 'package:dating_touchme_app/pages/mine/user_help_center_page.dart';
import 'package:get/get.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import '../../pages/setting/setting_page.dart';
class MineController extends GetxController {

2
lib/controller/mine/user_controller.dart
View File

@ -85,8 +85,8 @@ class UserController extends GetxController {
if (response.data.isSuccess && response.data.data != null) {
// 成功获取基础信息后，调用获取婚姻信息详情接口
final baseInfo = response.data.data!;
final result = await _userApi.getMarriageInformationDetail();
// print(result.data);
if (result.data.isSuccess) {
if(result.data.data == null){
if(isMain){

90
lib/controller/mine/user_info_controller.dart
View File

@ -1,4 +1,5 @@
import 'dart:io';
import 'package:dating_touchme_app/controller/global.dart';
import 'package:dating_touchme_app/oss/oss_manager.dart';
import 'package:flustars/flustars.dart';
import 'package:get/get.dart';
@ -6,6 +7,7 @@ import 'package:permission_handler/permission_handler.dart';
import 'package:get_storage/get_storage.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:image_picker/image_picker.dart';
import '../../model/mine/user_data.dart';
import '../../network/user_api.dart';
import '../../pages/main/main_page.dart';
@ -25,7 +27,12 @@ class UserInfoController extends GetxController {
// GetStorage实例，用于存储用户信息
final storage = GetStorage();
Map<String, String> educationCodeMap = {
'大专以下': '0',
'大专': '1',
'本科': '2',
'硕士及以上': '3',
};
// UserApi实例
late UserApi _userApi;
@ -221,12 +228,7 @@ class UserInfoController extends GetxController {
}
// 学历代码映射
Map<String, String> educationCodeMap = {
'大专以下': '0',
'大专': '1',
'本科': '2',
'硕士及以上': '3',
};
return {
'birthYear': birthYear,
@ -243,18 +245,13 @@ class UserInfoController extends GetxController {
if (!_validateForm()) {
return;
}
isSubmitting.value = true;
try {
// 构建请求参数
final params = _buildSubmitParams();
if (avatarUrl.value.isNotEmpty) {
params['avatarUrl'] = avatarUrl.value;
}
// 打印提交的信息
print('提交用户信息参数: $params');
@ -264,40 +261,17 @@ class UserInfoController extends GetxController {
// 处理响应
if (response.data.isSuccess) {
// 获取 miId（资料id）
String miId = '';
final regData = response.data.data;
if (regData != null) {
miId = regData;
await storage.write('miId', miId);
} else {
// 尝试从本地存储获取
final stored = storage.read('miId');
if (stored is String && stored.isNotEmpty) {
miId = stored;
} else {
SmartDialog.showToast('获取资料ID失败，请重试');
return;
}
}
String miId = response.data.data;
// 先调用认证审核保存接口（保存头像，authenticationCode=8）
try {
final payload = {
'miId': miId,
'authenticationCode': '8',
'value': '0',
'imgUrl': avatarUrl.value.isNotEmpty ? [avatarUrl.value] : ['0'],
};
final auditResp = await _userApi.saveCertificationAudit(payload);
if (auditResp.data.isSuccess) {
}
else{
SmartDialog.showToast(auditResp.data.message);
return;
if(avatarUrl.value.isNotEmpty){
final payload = {
'miId': miId,
'authenticationCode': '8',
'value': '0',
'imgUrl': avatarUrl.value.isNotEmpty ? [avatarUrl.value] : ['0'],
};
await _userApi.saveCertificationAudit(payload);
}
} catch (e) {
print('保存认证审核失败: $e');
@ -306,23 +280,21 @@ class UserInfoController extends GetxController {
}
// 更新本地存储的用户信息
final currentUserInfo = storage.read('userInfo') ?? {};
if (currentUserInfo is Map<String, dynamic>) {
currentUserInfo.addAll({
'gender': gender.value,
'nickname': nickname.value,
'birthday': birthday.value,
'education': education.value,
'avatarUrl': avatarUrl.value,
});
await storage.write('userInfo', currentUserInfo);
}
GlobalData().userData!.id = miId;
final genderCode = gender.value == 'male' ? 0 : 1;// 1:男, 2:女
GlobalData().userData!.genderCode = genderCode;
GlobalData().userData!.nickName = nickname.value;
GlobalData().userData!.profilePhoto = avatarUrl.value;
GlobalData().userData!.education = education.value;
final code = educationCodeMap[education.value] ?? '0';
GlobalData().userData!.educationCode = int.parse(code);
// 显示成功提示
SmartDialog.showToast('信息提交成功！');
SmartDialog.showToast('信息提交成功');
// 延迟后跳转
Future.delayed(const Duration(milliseconds: 1500), () {
// await storage.write('token', GlobalData().qnToken);
await storage.write('userId', GlobalData().userId);
Future.delayed(const Duration(milliseconds: 100), () {
// 跳转到主页面（根据登录流程，应该跳转到MainPage）
Get.offAll(() => MainPage());
});

103
lib/controller/setting/notification_controller.dart
View File

@ -0,0 +1,103 @@
// controllers/notification_controller.dart
import 'package:get/get.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:app_settings/app_settings.dart';
class NotificationController extends GetxController {
// 权限状态
final Rx<PermissionStatus> notificationStatus = PermissionStatus.denied.obs;
final RxBool checking = false.obs;
// 初始化时检查权限
@override
void onInit() {
super.onInit();
// 延迟检查，确保服务已初始化
checkPermission();
}
// 检查通知权限状态
Future<PermissionStatus> checkPermission() async {
checking.value = true;
try {
// 检查通知权限
final status = await Permission.notification.status;
notificationStatus.value = status;
print('通知权限状态: $status');
return status;
} catch (e) {
print('检查通知权限失败: $e');
return PermissionStatus.denied;
} finally {
checking.value = false;
}
}
// 请求通知权限
Future<PermissionStatus> requestNotificationPermission() async {
try {
final status = await Permission.notification.request();
notificationStatus.value = status;
print('请求通知权限结果: $status');
return status;
} catch (e) {
print('请求通知权限失败: $e');
return PermissionStatus.denied;
}
}
// 打开应用设置页面（让用户手动开启权限）
Future<void> openSettings() async {
try {
AppSettings.openAppSettings(
type: AppSettingsType.notification,
);
} catch (e) {
print('打开设置页面失败: $e');
}
}
// 检查是否有通知权限的便捷方法
// Future<bool> hasNotificationPermission() async {
// final status = await checkNotificationPermission();
// return status.isGranted || status.isLimited;
// }
// 获取权限状态描述
String getPermissionStatusText() {
switch (notificationStatus.value) {
case PermissionStatus.granted:
return '已开启';
case PermissionStatus.denied:
return '已拒绝';
case PermissionStatus.restricted:
return '受限制';
case PermissionStatus.limited:
return '部分授权';
case PermissionStatus.permanentlyDenied:
return '永久拒绝';
case PermissionStatus.provisional:
return '临时授权';
}
}
// 获取权限状态颜色
String getPermissionStatusColor() {
switch (notificationStatus.value) {
case PermissionStatus.granted:
return '绿色';
case PermissionStatus.denied:
return '橙色';
case PermissionStatus.restricted:
return '红色';
case PermissionStatus.limited:
return '蓝色';
case PermissionStatus.permanentlyDenied:
return '红色';
case PermissionStatus.provisional:
return '黄色';
}
}
}

230
lib/controller/setting/setting_controller.dart
View File

@ -0,0 +1,230 @@
import 'dart:async';
import 'package:dating_touchme_app/controller/global.dart';
import 'package:dating_touchme_app/extension/ex_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:tdesign_flutter/tdesign_flutter.dart';
import '../../generated/assets.dart';
import 'package:package_info_plus/package_info_plus.dart';
class SettingController extends GetxController {
final storage = GetStorage();
final appName = ''.obs;
final packageName = ''.obs;
final version = ''.obs;
final buildNumber = ''.obs;
@override
Future<void> onInit() async {
super.onInit();
// 从全局依赖中获取UserApi
await getAppInfo();
}
// 获取验证码
Future<void> getAppInfo() async {
try {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
appName.value = packageInfo.appName;
packageName.value = packageInfo.packageName;
version.value = packageInfo.version;
buildNumber.value = packageInfo.buildNumber;
} catch (e) {
print('获取应用信息失败: $e');
}
}
Future<void> checkVersion() async {
try {
_showUpdateDialog();
} catch (e) {
print('检测版本跟新失败: $e');
}
}
void logout(){
storage.erase();
GlobalData().logout();
}
// 弹出版本升级的dialog
void _showUpdateDialog(){
Navigator.of(Get.context!).push(TDSlidePopupRoute(
modalBarrierColor: TDTheme.of(Get.context!).fontGyColor2,
slideTransitionFrom: SlideTransitionFrom.center,
builder: (context) {
return Material(
color: Colors.transparent,
child: Container(
color: Colors.transparent,
width: 299.w,
padding: EdgeInsets.only(top: 56.w),
child: Stack(
clipBehavior: Clip.none,
children: [
Container(
width: 299.w,
padding: EdgeInsets.only(
top: 147.w,
left: 30.w,
right: 30.w,
bottom: 25.w
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(18.w)),
color: Colors.white
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
"体验全新升级v1.2.0",
style: TextStyle(
fontSize: 16.w,
fontWeight: FontWeight.w500
),
),
SizedBox(height: 14.w,),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 2.w,
height: 5.w,
margin: EdgeInsets.only(
right: 10.w,
top: 6.w
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(2.w)),
color: const Color.fromRGBO(51, 51, 51, 1)
),
),
SizedBox(
width: 204.w,
child: Text(
"首页风格改版，更全面的内容，恍然一新的视觉用户体验。",
style: TextStyle(
fontSize: 12.w,
),
),
)
],
),
SizedBox(height: 8.w,),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 2.w,
height: 5.w,
margin: EdgeInsets.only(
right: 10.w,
top: 6.w
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(2.w)),
color: const Color.fromRGBO(51, 51, 51, 1)
),
),
SizedBox(
width: 204.w,
child: Text(
"优化了动画细节，让产品更流畅。",
style: TextStyle(
fontSize: 12.w,
),
),
)
],
),
SizedBox(height: 32.w,),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
width: 113.w,
height: 40.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(9.w)),
color: const Color.fromRGBO(245, 245, 245, 1)
),
child: Center(
child: Text(
"暂不更新",
style: TextStyle(
fontSize: 15.w,
color: const Color.fromRGBO(144, 144, 144, 1)
),
),
),
).onTap((){
Navigator.of(context).pop();
}),
Container(
width: 113.w,
height: 40.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(9.w)),
color: const Color.fromRGBO(245, 245, 245, 1),
gradient: const LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight, // 对应 CSS 90deg
colors: [
Color.fromRGBO(131, 89, 255, 1), // rgba(131, 89, 255, 1)
Color.fromRGBO(61, 138, 224, 1), // rgba(61, 138, 224, 1)
],
),
),
child: Center(
child: Text(
"立即升级",
style: TextStyle(
fontSize: 15.w,
fontWeight: FontWeight.w500,
color: Colors.white
),
),
),
),
],
)
],
),
),
Positioned(
left: 0,
top: -56.w,
child: Image.asset(
Assets.imagesUpdataBg,
width: 299.w,
),
),
Positioned(
left: 11.w,
top: -14.w,
child: Image.asset(
Assets.imagesUpdataIcon,
width: 36.w,
),
),
Positioned(
left: 43.w,
top: 29.w,
child: Image.asset(
Assets.imagesUpdataFont,
width: 76.w,
),
)
],
),
),
);
}));
}
}

8
lib/main.dart
View File

@ -22,8 +22,8 @@ void main() async {
// 设置环境配置 - 根据是否为release模式
EnvConfig.setEnvironment(Environment.dev);
RTCManager.instance.initialize(appId: '4c2ea9dcb4c5440593a418df0fdd512d');
IMManager.instance.initialize('1165251016193374#demo');
await RTCManager.instance.initialize(appId: '4c2ea9dcb4c5440593a418df0fdd512d');
await IMManager.instance.initialize('1165251016193374#demo');
// 初始化全局依赖
final networkService = NetworkService();
Get.put(networkService);
@ -84,10 +84,10 @@ class MyApp extends StatelessWidget {
// 判断token是否为空
final storage = GetStorage();
final token = storage.read<String>('token');
final userId = storage.read<String>('userId');
// 如果token不为空，显示主页；如果token为空，显示登录页面
if (token != null && token.isNotEmpty) {
if (userId != null && userId.isNotEmpty) {
return MainPage();
} else {
return LoginPage();

12
lib/model/mine/user_data.dart
View File

@ -1,11 +1,11 @@
// 用户详细信息实体类
class UserData {
final String? id;
final String? nickName;
String? id;
String? nickName;
final String? name;
final String? profilePhoto;
String? profilePhoto;
String? identityCard;
final int? genderCode;
int? genderCode;
final String? genderValue;
final String? homeCountryCode;
final String? homeCountry;
@ -23,8 +23,8 @@ class UserData {
final String? chineseZodiac;
final int? height;
final int? weight;
final int? educationCode;
final String? education;
int? educationCode;
String? education;
final int? maritalStatusCode;
final String? maritalStatusName;
final int? minimumIncome;

4
lib/model/rtc/rtc_channel_data.dart
View File

@ -2,16 +2,19 @@
class RtcChannelData {
final String channelId;
final String token;
final int uid;
RtcChannelData({
required this.channelId,
required this.token,
required this.uid,
});
factory RtcChannelData.fromJson(Map<String, dynamic> json) {
return RtcChannelData(
channelId: json['channelId']?.toString() ?? '',
token: json['token']?.toString() ?? '',
uid: json['uid'] ?? 0,
);
}
@ -19,6 +22,7 @@ class RtcChannelData {
return {
'channelId': channelId,
'token': token,
'uid': uid,
};
}

3
lib/network/api_urls.dart
View File

@ -23,7 +23,10 @@ class ApiUrls {
static const String getMaritalStatusList = 'dating-agency-service/user/get/marital/status/list';
static const String getPropertyList = 'dating-agency-service/user/get/property/permits';
static const String getOccupationList = 'dating-agency-service/user/get/occupation/list';
static const String getSwRtcToken = 'dating-agency-chat-audio/user/get/sw/rtc/token';
static const String createRtcChannel = 'dating-agency-chat-audio/user/create/rtc-channel';
static const String editOwnMarriageInformation = 'dating-agency-service/user/edit/own-marriage-information';
static const String getSwRtmToken = 'dating-agency-chat-audio/user/get/sw/rtm/token';
//首页相关接口
static const String getMarriageList = 'dating-agency-service/user/page/dongwo/marriage-information';

1
lib/network/network_config.dart
View File

@ -83,7 +83,6 @@ class ResponseInterceptor extends Interceptor {
) {
// 统一处理响应数据
final data = response.data;
// 检查响应状态码
if (response.statusCode == 200) {
// 假设后端返回的数据格式为 {"code": 0, "message": "success", "data": {...}}

8
lib/network/rtc_api.dart
View File

@ -12,6 +12,14 @@ abstract class RtcApi {
factory RtcApi(Dio dio) = _RtcApi;
/// 创建实时音视频频道
@GET(ApiUrls.getSwRtcToken)
Future<HttpResponse<BaseResponse<RtcChannelData>>> getSwRtcToken();
/// 获取声网 RTM Token
@GET(ApiUrls.getSwRtmToken)
Future<HttpResponse<BaseResponse<RtcChannelData>>> getSwRtmToken();
/// 创建实时音视频频道（返回字符串）
@POST(ApiUrls.createRtcChannel)
Future<HttpResponse<BaseResponse<RtcChannelData>>> createRtcChannel();
}

62
lib/network/rtc_api.g.dart
View File

@ -19,6 +19,68 @@ class _RtcApi implements RtcApi {
final ParseErrorLogger? errorLogger;
@override
Future<HttpResponse<BaseResponse<RtcChannelData>>> getSwRtcToken() async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null;
final _options = _setStreamType<HttpResponse<BaseResponse<RtcChannelData>>>(
Options(method: 'GET', headers: _headers, extra: _extra)
.compose(
_dio.options,
'dating-agency-chat-audio/user/get/sw/rtc/token',
queryParameters: queryParameters,
data: _data,
)
.copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
);
final _result = await _dio.fetch<Map<String, dynamic>>(_options);
late BaseResponse<RtcChannelData> _value;
try {
_value = BaseResponse<RtcChannelData>.fromJson(
_result.data!,
(json) => RtcChannelData.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<RtcChannelData>>> getSwRtmToken() async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null;
final _options = _setStreamType<HttpResponse<BaseResponse<RtcChannelData>>>(
Options(method: 'GET', headers: _headers, extra: _extra)
.compose(
_dio.options,
'dating-agency-chat-audio/user/get/sw/rtm/token',
queryParameters: queryParameters,
data: _data,
)
.copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
);
final _result = await _dio.fetch<Map<String, dynamic>>(_options);
late BaseResponse<RtcChannelData> _value;
try {
_value = BaseResponse<RtcChannelData>.fromJson(
_result.data!,
(json) => RtcChannelData.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<RtcChannelData>>> createRtcChannel() async {
final _extra = <String, dynamic>{};

5
lib/network/user_api.dart
View File

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

50
lib/network/user_api.g.dart
View File

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

2
lib/pages/home/report_page.dart
View File

@ -23,7 +23,7 @@ class _ReportPageState extends State<ReportPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: PageAppbar(title: "举报中心",),
appBar: PageAppbar(title: "举报中心"),
body: SingleChildScrollView(
child: Container(
padding: EdgeInsets.only(

7
lib/pages/main/main_page.dart
View File

@ -1,6 +1,7 @@
import 'package:dating_touchme_app/pages/main/tabbar/main_tab_bar.dart';
import 'package:dating_touchme_app/pages/message/message_page.dart';
import 'package:dating_touchme_app/pages/mine/mine_page.dart';
import 'package:dating_touchme_app/rtc/rtm_manager.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
@ -47,6 +48,7 @@ class _MainPageState extends State<MainPage> {
Get.put(RouteGuardService());
// 检查token并调用获取婚姻信息详情的方法
checkTokenAndFetchMarriageInfo();
initRTM();
}
// 检查token并获取婚姻信息详情
@ -58,6 +60,11 @@ class _MainPageState extends State<MainPage> {
await userController.getBaseUserInfo(userId, true);
}
}
initRTM() async {
String? userId = storage.read<String>('userId');
await RTMManager.instance.initialize(appId: '4c2ea9dcb4c5440593a418df0fdd512d', userId: userId ?? '');
}
@override
Widget build(BuildContext context) {

6
lib/pages/mine/auth_center_page.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../components/page_appbar.dart';
import '../../controller/mine/auth_controller.dart';
import '../../extension/router_service.dart';
import '../../generated/assets.dart';
@ -18,10 +19,7 @@ class AuthCenterPage extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xffF5F5F5),
appBar: AppBar(
title: Text('认证中心', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
centerTitle: true,
),
appBar: PageAppbar(title: "认证中心"),
body: Obx(() {
if (controller.isLoading.value) {
return const Center(child: CupertinoActivityIndicator(radius: 12,));

230
lib/pages/mine/edit_info_page.dart
View File

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

174
lib/pages/mine/login_controller.dart
View File

@ -1,174 +0,0 @@
// import 'dart:async';
// import 'package:dating_touchme_app/pages/main/main_page.dart';
// import 'package:get/get.dart';
// import 'package:get_storage/get_storage.dart';
// import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
// import 'package:dating_touchme_app/network/user_api.dart';
// import 'package:dating_touchme_app/pages/mine/user_info_page.dart';
//
//
// class LoginController extends GetxController {
// // 手机号输入
// final phoneNumber = ''.obs;
// // 验证码输入
// final verificationCode = ''.obs;
// // 是否正在发送验证码
// final isSendingCode = false.obs;
// // 倒计时秒数
// final countdownSeconds = 0.obs;
// // 是否正在登录中
// final isLoggingIn = false.obs;
//
// // 从GetX依赖注入中获取UserApi实例
// late UserApi _userApi;
// // GetStorage实例，用于存储token等信息
// final storage = GetStorage();
//
// @override
// void onInit() {
// super.onInit();
// // 从全局依赖中获取UserApi
// _userApi = Get.find<UserApi>();
// }
//
// // 获取验证码
// Future<void> getVerificationCode() async {
// // 验证手机号格式
// if (phoneNumber.value.isEmpty || phoneNumber.value.length != 11) {
// SmartDialog.showToast('请输入正确的手机号');
// return;
// }
//
// isSendingCode.value = true;
//
// try {
// // 构建请求参数
// final params = {
// 'purpose': 1, // 认证
// 'verifiableAccount': phoneNumber.value,
// 'verifiableAccountType': 1, // 手机
// };
//
// // 调用UserApi中的验证码接口
// final response = await _userApi.getVerificationCode(params);
//
// // 处理响应
// if (response.data.isSuccess) {
// // 生产环境移除打印，可考虑使用正式的日志框架
// // print('验证码发送成功');
// // 开始倒计时
// startCountdown();
// } else {
// SmartDialog.showToast(response.data.message);
// }
// } catch (e) {
// SmartDialog.showToast('网络请求失败，请重试');
// } finally {
// isSendingCode.value = false;
// }
// }
//
// // 开始倒计时
// void startCountdown() {
// countdownSeconds.value = 60;
// Timer.periodic(const Duration(seconds: 1), (timer) {
// countdownSeconds.value--;
// if (countdownSeconds.value <= 0) {
// timer.cancel();
// }
// });
// }
//
// // 清除错误信息 - 由于使用SmartDialog，此方法不再需要
// // void clearErrorMessage() {}
//
//
// // 登录方法
// Future<void> login() async {
// // 验证输入
// if (phoneNumber.value.isEmpty || phoneNumber.value.length != 11) {
// SmartDialog.showToast('请输入正确的手机号');
// return;
// }
//
// if (verificationCode.value.isEmpty) {
// SmartDialog.showToast('请输入验证码');
// return;
// }
//
// isLoggingIn.value = true;
//
// try {
// // 构建登录请求参数
// final params = {
// 'account': phoneNumber.value,
// 'accountType': 2, // 手机号类型
// 'captcha': verificationCode.value,
// };
//
// // 调用登录接口
// final response = await _userApi.login(params);
//
// // 处理响应
// if (response.data.isSuccess) {
// // 保存token和用户信息
// if (response.data.data != null) {
// final loginData = response.data.data!;
// await storage.write('token', loginData.token);
// await storage.write('userId', loginData.userId);
// // 保存用户信息
// await storage.write('userInfo', loginData.toJson());
//
// // 登录成功后获取用户基础信息
// await _getBaseUserInfo(loginData.userId);
// }
// } else {
// SmartDialog.showToast(response.data.message);
// }
// } catch (e) {
// SmartDialog.showToast('网络请求失败，请检查网络连接');
// } finally {
// isLoggingIn.value = false;
// }
// }
//
// // 获取用户基础信息
// Future<void> _getBaseUserInfo(String userId) async {
// try {
// final response = await _userApi.getBaseUserInfo(userId);
//
// if (response.data.isSuccess && response.data.data != null) {
// // 成功获取基础信息后，调用获取婚姻信息详情接口
// await _getMarriageInformationDetail();
// } else {
// SmartDialog.showToast(response.data.message);
// }
// } catch (e) {
// // 获取用户信息失败不影响登录流程
// SmartDialog.showToast('获取用户信息失败');
// }
// }
//
// // 获取用户婚姻信息详情
// Future<void> _getMarriageInformationDetail() async {
// try {
// final response = await _userApi.getMarriageInformationDetail();
// if (response.data.isSuccess) {
// // 检查data是否为null或者是空对象
// if(response.data.data == null){
// //跳转到完善信息
// SmartDialog.showToast('转到完善信息');
// // 导航到完善信息页面
// Get.offAll(() => UserInfoPage());
// }else{
// Get.offAll(MainPage());
// }
// } else {
// // 获取婚姻信息失败不影响登录流程
// }
// } catch (e) {
// // 获取婚姻信息失败不影响登录流程
// print('获取婚姻信息异常: $e');
// }
// }
// }

6
lib/pages/mine/mine_page.dart
View File

@ -1,3 +1,4 @@
import 'package:cached_network_image/cached_network_image.dart';
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';
@ -6,9 +7,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:dating_touchme_app/generated/assets.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import '../../extension/router_service.dart';
import '../discover/visitor_list_page.dart';
class MinePage extends StatefulWidget {
@ -75,11 +74,12 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
"${controller.userData.value?.profilePhoto ?? ""}",
width: 60.w,
height: 60.w,
fit: BoxFit.cover,
) : Image.asset(
Assets.imagesUserAvatar,
width: 60.w,
height: 60.w,
),
)
),
SizedBox(width: 14.w,),
Column(

6
lib/pages/mine/phone_page.dart
View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tdesign_flutter/tdesign_flutter.dart';
import '../../components/page_appbar.dart';
import '../../controller/mine/phone_controller.dart';
class PhonePage extends StatelessWidget {
@ -13,10 +14,7 @@ class PhonePage extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xffFFFFFF),
appBar: AppBar(
title: Text('手机认证', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
centerTitle: true,
),
appBar: PageAppbar(title: "手机认证", bottom: true),
body: Obx(() {
return IndexedStack(
index: controller.tabIndex.value,

6
lib/pages/mine/real_name_page.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:tdesign_flutter/tdesign_flutter.dart';
import '../../components/page_appbar.dart';
import '../../controller/mine/auth_controller.dart';
class RealNamePage extends StatelessWidget {
@ -14,10 +15,7 @@ class RealNamePage extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xffFFFFFF),
appBar: AppBar(
title: Text('实名认证', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
centerTitle: true,
),
appBar: PageAppbar(title: "实名认证"),
body: Column(
children: [
Container(

410
lib/pages/mine/setting_page.dart
View File

@ -1,410 +0,0 @@
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/blacklist_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:get/get_core/src/get_main.dart';
import 'package:tdesign_flutter/tdesign_flutter.dart';
class SettingPage extends StatefulWidget {
const SettingPage({super.key});
@override
State<SettingPage> createState() => _SettingPageState();
}
class _SettingPageState extends State<SettingPage> {
bool blockUser = false;
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color.fromRGBO(250, 250, 250, 1),
appBar: PageAppbar(title: "设置"),
body: SingleChildScrollView(
child: Container(
padding: EdgeInsets.symmetric(
vertical: 15.w,
horizontal: 10.w
),
child: Column(
children: [
BlockItem(
children: [
Item(
label: "后台播放",
child: TDSwitch(
isOn: blockUser,
trackOnColor: const Color.fromRGBO(117, 98, 249, 1),
onChanged: (bool e){
print(e);
blockUser = e;
setState(() {
});
return e;
},
),
),
LineItem(),
Item(
label: "语音/视频通话提示音",
child: TDSwitch(
isOn: blockUser,
trackOnColor: const Color.fromRGBO(117, 98, 249, 1),
onChanged: (bool e){
print(e);
blockUser = e;
setState(() {
});
return e;
},
),
),
],
),
BlockItem(
children: [
Item(
label: "安全中心",
child: Icon(
Icons.keyboard_arrow_right,
size: 10.w,
color: const Color.fromRGBO(191, 191, 191, 1),
),
),
LineItem(),
Item(
label: "黑名单",
child: Icon(
Icons.keyboard_arrow_right,
size: 10.w,
color: const Color.fromRGBO(191, 191, 191, 1),
),
).onTap((){
Get.to(() => BlacklistPage());
}),
],
),
BlockItem(
children: [
Item(
label: "隐私设置",
child: Icon(
Icons.keyboard_arrow_right,
size: 10.w,
color: const Color.fromRGBO(191, 191, 191, 1),
),
),
LineItem(),
Item(
label: "青少年模式",
child: Icon(
Icons.keyboard_arrow_right,
size: 10.w,
color: const Color.fromRGBO(191, 191, 191, 1),
),
),
],
),
BlockItem(
children: [
Item(
label: "系统权限管理",
child: Icon(
Icons.keyboard_arrow_right,
size: 10.w,
color: const Color.fromRGBO(191, 191, 191, 1),
),
),
LineItem(),
Item(
label: "消息通知",
child: Icon(
Icons.keyboard_arrow_right,
size: 10.w,
color: const Color.fromRGBO(191, 191, 191, 1),
),
),
LineItem(),
Item(
label: "检查更新",
child: Row(
children: [
Text(
"版本号 1.0.000",
style: TextStyle(
fontSize: 13.w,
color: const Color.fromRGBO(117, 98, 249, 1)
),
),
SizedBox(width: 10.w,),
Icon(
Icons.keyboard_arrow_right,
size: 10.w,
color: const Color.fromRGBO(191, 191, 191, 1),
)
],
),
).onTap((){
Navigator.of(context).push(TDSlidePopupRoute(
modalBarrierColor: TDTheme.of(context).fontGyColor2,
slideTransitionFrom: SlideTransitionFrom.center,
builder: (context) {
return Material(
color: Colors.transparent,
child: Container(
color: Colors.transparent,
width: 299.w,
padding: EdgeInsets.only(
top: 56.w
),
child: Stack(
clipBehavior: Clip.none,
children: [
Container(
width: 299.w,
padding: EdgeInsets.only(
top: 147.w,
left: 30.w,
right: 30.w,
bottom: 25.w
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(18.w)),
color: Colors.white
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
"体验全新升级v1.2.0",
style: TextStyle(
fontSize: 16.w,
fontWeight: FontWeight.w500
),
),
SizedBox(height: 14.w,),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 2.w,
height: 5.w,
margin: EdgeInsets.only(
right: 10.w,
top: 6.w
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(2.w)),
color: const Color.fromRGBO(51, 51, 51, 1)
),
),
SizedBox(
width: 204.w,
child: Text(
"首页风格改版，更全面的内容，恍然一新的视觉用户体验。",
style: TextStyle(
fontSize: 12.w,
),
),
)
],
),
SizedBox(height: 8.w,),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 2.w,
height: 5.w,
margin: EdgeInsets.only(
right: 10.w,
top: 6.w
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(2.w)),
color: const Color.fromRGBO(51, 51, 51, 1)
),
),
SizedBox(
width: 204.w,
child: Text(
"优化了动画细节，让产品更流畅。",
style: TextStyle(
fontSize: 12.w,
),
),
)
],
),
SizedBox(height: 32.w,),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
width: 113.w,
height: 40.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(9.w)),
color: const Color.fromRGBO(245, 245, 245, 1)
),
child: Center(
child: Text(
"暂不更新",
style: TextStyle(
fontSize: 15.w,
color: const Color.fromRGBO(144, 144, 144, 1)
),
),
),
),
Container(
width: 113.w,
height: 40.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(9.w)),
color: const Color.fromRGBO(245, 245, 245, 1),
gradient: const LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight, // 对应 CSS 90deg
colors: [
Color.fromRGBO(131, 89, 255, 1), // rgba(131, 89, 255, 1)
Color.fromRGBO(61, 138, 224, 1), // rgba(61, 138, 224, 1)
],
),
),
child: Center(
child: Text(
"立即升级",
style: TextStyle(
fontSize: 15.w,
fontWeight: FontWeight.w500,
color: Colors.white
),
),
),
),
],
)
],
),
),
Positioned(
left: 0,
top: -56.w,
child: Image.asset(
Assets.imagesUpdataBg,
width: 299.w,
),
),
Positioned(
left: 11.w,
top: -14.w,
child: Image.asset(
Assets.imagesUpdataIcon,
width: 36.w,
),
),
Positioned(
left: 43.w,
top: 29.w,
child: Image.asset(
Assets.imagesUpdataFont,
width: 76.w,
),
)
],
),
),
);
}));
}),
],
),
],
),
),
),
);
}
}
class BlockItem extends StatefulWidget {
final List<Widget> children;
const BlockItem({super.key, required this.children});
@override
State<BlockItem> createState() => _BlockItemState();
}
class _BlockItemState extends State<BlockItem> {
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.symmetric(
horizontal: 14.w
),
margin: EdgeInsets.only(
bottom: 10.w
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(9.w)),
color: Colors.white
),
child: Column(
children: widget.children,
),
);
}
}
class Item extends StatefulWidget {
final String label;
final Widget child;
const Item({super.key, required this.label, required this.child});
@override
State<Item> createState() => _ItemState();
}
class _ItemState extends State<Item> {
@override
Widget build(BuildContext context) {
return SizedBox(
height: 54.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
widget.label,
style: TextStyle(
fontSize: 13.w,
fontWeight: FontWeight.w500
),
),
widget.child
],
),
);
}
}
class LineItem extends StatelessWidget {
const LineItem({super.key});
@override
Widget build(BuildContext context) {
return Container(
width: 320.w,
height: 2.w,
color: const Color.fromRGBO(245, 245, 245, 1),
);
}
}

111
lib/pages/mine/user_info_page.dart
View File

@ -1,42 +1,74 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:dating_touchme_app/generated/assets.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:dating_touchme_app/controller/mine/user_info_controller.dart';
import 'package:tdesign_flutter/tdesign_flutter.dart';
class UserInfoPage extends StatelessWidget {
const UserInfoPage({Key? key}) : super(key: key);
UserInfoPage({super.key});
// 显示头像选择选项
void _showAvatarOptions(UserInfoController controller) {
showCupertinoModalPopup(
context: Get.context!,
builder: (context) => CupertinoActionSheet(
title: const Text('选择头像'),
actions: <Widget>[
CupertinoActionSheetAction(
child: const Text('拍照'),
onPressed: () async {
Navigator.pop(context);
await controller.handleCameraCapture();
},
),
CupertinoActionSheetAction(
child: const Text('从相册选择'),
onPressed: () async {
Navigator.pop(context);
await controller.handleGallerySelection();
},
),
],
cancelButton: CupertinoActionSheetAction(
child: const Text('取消'),
isDestructiveAction: true,
onPressed: () {
Navigator.pop(context);
},
),
),
void _showAvatarPopup(UserInfoController controller){
Navigator.of(Get.context!).push(
TDSlidePopupRoute(
slideTransitionFrom: SlideTransitionFrom.bottom,
builder: (context) {
return Container(
// color: TDTheme.of(context).bgColorContainer,
height: 490,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(12.0),
topRight: Radius.circular(12.0),
),
),
child: Column(
children: [
const SizedBox(height: 4),
CachedNetworkImage(imageUrl: 'https://dating-agency-prod.oss-cn-shenzhen.aliyuncs.com/1A437A945667.jpg', width: 375, height: 314),
const TDDivider(),
TDCell(
arrow: false,
titleWidget: Center(
child: Text('拍照', style: TextStyle(fontSize: 16.w, color: const Color.fromRGBO(51, 51, 51, 1))),
),
onClick: (cell) async{
Navigator.pop(context);
await controller.handleCameraCapture();
},
),
const TDDivider(),
TDCell(
arrow: false,
titleWidget: Center(
child: Text('从相册选择'),
),
onClick: (cell) async{
Navigator.pop(context);
await controller.handleGallerySelection();
},
),
Expanded(
child: Container(
color: Color(0xFFF3F3F3),
),
),
TDCell(
arrow: false,
titleWidget: Center(
child: Text('取消'),
),
onClick: (cell){
Navigator.pop(context);
},
),
],
),
);
}),
);
}
@ -228,7 +260,7 @@ class UserInfoPage extends StatelessWidget {
title: const Text(
'完善信息',
style: TextStyle(
fontSize: 20,
fontSize: 16,
fontWeight: FontWeight.bold,
color: Color.fromRGBO(51, 51, 51, 1),
),
@ -255,10 +287,9 @@ class UserInfoPage extends StatelessWidget {
child: Column(
children: [
const SizedBox(height: 25),
// 头像
GestureDetector(
onTap: () => _showAvatarOptions(controller),
onTap: () => _showAvatarPopup(controller),
child: Stack(
children: [
Container(
@ -369,7 +400,7 @@ class UserInfoPage extends StatelessWidget {
),
],
),
const SizedBox(height: 25),
const SizedBox(height: 20),
// 昵称
const Align(
@ -408,7 +439,7 @@ class UserInfoPage extends StatelessWidget {
],
),
),
const SizedBox(height: 25),
const SizedBox(height: 20),
// 出生日期
const Align(
@ -452,7 +483,7 @@ class UserInfoPage extends StatelessWidget {
),
),
),
const SizedBox(height: 25),
const SizedBox(height: 20),
// 学历
const Align(
@ -496,7 +527,7 @@ class UserInfoPage extends StatelessWidget {
),
),
),
const SizedBox(height: 25),
const SizedBox(height: 20),
// 邀请码
const Align(
@ -528,7 +559,7 @@ class UserInfoPage extends StatelessWidget {
),
),
),
const SizedBox(height: 50),
const SizedBox(height: 24),
// 开始交友按钮
SizedBox(
@ -562,7 +593,7 @@ class UserInfoPage extends StatelessWidget {
),
),
),
const SizedBox(height: 30),
const SizedBox(height: 20),
],
),
),

lib/pages/mine/blacklist_page.dart → lib/pages/setting/blacklist_page.dart
View File

77
lib/pages/setting/notice_page.dart
View File

@ -0,0 +1,77 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:tdesign_flutter/tdesign_flutter.dart';
import '../../components/page_appbar.dart';
import '../../controller/setting/notification_controller.dart';
class NoticePage extends StatelessWidget {
NoticePage({super.key});
final NotificationController controller = Get.put(NotificationController());
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xffF5F5F5),
appBar: PageAppbar(title: "消息通知"),
body: Expanded(
child: SingleChildScrollView(
padding: EdgeInsetsGeometry.symmetric(vertical: 16.w),
child: Obx(() {
return Column(
children: [
TDCellGroup(
theme: TDCellGroupTheme.cardTheme,
cells: [
TDCell(
arrow: true,
title: '接受推送通知',
description: controller.getPermissionStatusText(),
onClick: (cell){
controller.openSettings();
},
),
TDCell(
arrow: false,
title: '接受推送通知',
description: '一段很长很长的内容文字',
rightIconWidget: TDSwitch(
isOn: false,
trackOnColor: const Color.fromRGBO(117, 98, 249, 1),
onChanged: (bool e){
return false;
},
)
),
],
),
const SizedBox(height: 12),
TDCellGroup(
theme: TDCellGroupTheme.cardTheme,
cells: [
TDCell(
arrow: false,
title: '后台播放',
description: '一段很长很长的内容文字',
rightIconWidget: TDSwitch(
isOn: true,
trackOnColor: const Color.fromRGBO(117, 98, 249, 1),
onChanged: (bool e){
return false;
},
)
),
],
),
],
);
}),
),
),
);
}
}

153
lib/pages/setting/setting_page.dart
View File

@ -0,0 +1,153 @@
import 'package:dating_touchme_app/pages/mine/login_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:tdesign_flutter/tdesign_flutter.dart';
import '../../components/page_appbar.dart';
import '../../controller/setting/setting_controller.dart';
import 'blacklist_page.dart';
import 'notice_page.dart';
class SettingPage extends StatelessWidget {
SettingPage({super.key});
final SettingController controller = Get.put(SettingController());
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xffF5F5F5),
appBar: PageAppbar(title: "设置"),
body: Expanded(
child: SingleChildScrollView(
padding: EdgeInsetsGeometry.symmetric(vertical: 16.w),
child: Obx(() {
return Column(
children: [
TDCellGroup(
theme: TDCellGroupTheme.cardTheme,
cells: [
TDCell(
arrow: false,
title: '允许中间邀请弹窗',
rightIconWidget: TDSwitch(isOn: false,trackOnColor: const Color.fromRGBO(117, 98, 249, 1),onChanged: (bool e) {
return false;
})
),
TDCell(
arrow: false,
title: '后台播放',
rightIconWidget: TDSwitch(
isOn: true,
trackOnColor: const Color.fromRGBO(117, 98, 249, 1),
onChanged: (bool e) {
return false;
},
)
),
TDCell(
arrow: false,
title: '语音/视频通话提示音',
rightIconWidget: TDSwitch(isOn: false,trackOnColor: const Color.fromRGBO(117, 98, 249, 1),onChanged: (bool e) {
return false;
})
),
],
),
const SizedBox(height: 12),
TDCellGroup(
theme: TDCellGroupTheme.cardTheme,
cells: [
TDCell(arrow: true, title: '安全中心', onClick: (cell) {
print('安全中心');
}),
TDCell(arrow: true, title: '黑名单', onClick: (cell) {
Get.to(() => BlacklistPage());
}),
],
),
const SizedBox(height: 12),
TDCellGroup(
theme: TDCellGroupTheme.cardTheme,
cells: [
TDCell(arrow: true, title: '系统权限管理'),
TDCell(arrow: true, title: '消息通知', onClick: (cell) {
Get.to(() => NoticePage());
}),
TDCell(arrow: true, title: '检查更新', onClick: (cell) {
// _showUpdateDialog();
controller.checkVersion();
},
noteWidget: Text('当前版本：${controller.version.value}',style: TextStyle(fontSize: 13.w,color: const Color.fromRGBO(117, 98, 249, 1))),
)
],
),
const SizedBox(height: 64),
TDButton(
text: '退出登录',
width: MediaQuery.of(context).size.width - 40,
size: TDButtonSize.large,
type: TDButtonType.fill,
shape: TDButtonShape.round,
theme: TDButtonTheme.danger,
onTap: () {
showGeneralDialog(
context: context,
pageBuilder: (BuildContext buildContext, Animation<
double> animation,
Animation<double> secondaryAnimation) {
return TDAlertDialog(
title: '是否退出当前账号？',
buttonWidget: Container(
padding: EdgeInsetsGeometry.only(top: 16.w,
right: 30.w,
left: 30.w,
bottom: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
TDButton(
text: '取 消',
width: 120,
size: TDButtonSize.large,
type: TDButtonType.fill,
shape: TDButtonShape.round,
theme: TDButtonTheme.defaultTheme,
onTap: () {
Navigator.of(context).pop();
},
),
TDButton(
text: '确 定',
width: 120,
size: TDButtonSize.large,
type: TDButtonType.fill,
shape: TDButtonShape.round,
theme: TDButtonTheme.danger,
onTap: () {
controller.logout();
Navigator.of(context).pop();
Get.offAll(() => LoginPage());
},
),
],
),
)
);
},
);
},
),
const SizedBox(height: 24),
],
);
}),
),
),
);
}
}

22
lib/rtc/rtc_manager.dart
View File

@ -1,4 +1,10 @@
import 'dart:convert';
import 'package:agora_rtc_engine/agora_rtc_engine.dart';
import 'package:dating_touchme_app/rtc/rtm_manager.dart';
import 'package:get/get.dart';
import '../pages/discover/live_room_page.dart';
/// RTC 管理器，负责管理声网音视频通话功能
class RTCManager {
@ -57,7 +63,7 @@ class RTCManager {
Future<bool> initialize({
required String appId,
ChannelProfileType channelProfile =
ChannelProfileType.channelProfileCommunication,
ChannelProfileType.channelProfileLiveBroadcasting,
}) async {
try {
if (_isInitialized && _engine != null) {
@ -72,7 +78,9 @@ class RTCManager {
await _engine!.initialize(
RtcEngineContext(appId: appId, channelProfile: channelProfile),
);
await _engine?.setClientRole(role: ClientRoleType.clientRoleBroadcaster);
await _engine?.enableVideo();
await _engine?.startPreview();
// 注册事件处理器
_registerEventHandlers();
@ -91,10 +99,18 @@ class RTCManager {
_engine!.registerEventHandler(
RtcEngineEventHandler(
onJoinChannelSuccess: (RtcConnection connection, int elapsed) {
onJoinChannelSuccess: (RtcConnection connection, int elapsed) async{
_isInChannel = true;
_currentChannelId = connection.channelId;
print('加入频道成功，频道名：${connection.channelId}，耗时：${elapsed}ms');
if(connection.localUid == _currentUid){
await RTMManager.instance.subscribe(_currentChannelId ?? '');
await RTMManager.instance.publishChannelMessage(
channelName: _currentChannelId ?? '',
message: json.encode({'type': 'join_room', 'uid': _currentUid})
);
Get.to(() => const LiveRoomPage(id: 0));
}
if (onJoinChannelSuccess != null) {
onJoinChannelSuccess!(connection, elapsed);
}

163
lib/rtc/rtm_manager.dart
View File

@ -1,4 +1,12 @@
import 'package:agora_rtm/agora_rtm.dart';
import 'package:agora_token_generator/agora_token_generator.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import '../model/rtc/rtc_channel_data.dart';
import '../network/network_service.dart';
import '../network/rtc_api.dart';
/// 声网 RTM 管理器，聚合常用的客户端与 StreamChannel 操作
class RTMManager {
@ -13,6 +21,7 @@ class RTMManager {
bool _isLoggedIn = false;
String? _currentAppId;
String? _currentUserId;
late NetworkService _networkService;
final Map<String, StreamChannel> _streamChannels = {};
@ -52,39 +61,73 @@ class RTMManager {
_currentUserId == userId) {
return true;
}
_networkService = Get.find<NetworkService>();
await dispose();
final (status, client) = await RTM(appId, userId, config: config);
print('RTM初始化成功');
if (status.error) {
onOperationError?.call(status);
return false;
}
_client = client;
_currentAppId = appId;
_currentUserId = userId;
_isInitialized = true;
_registerClientListeners();
final response = await _networkService.rtcApi.getSwRtmToken();
// 处理响应
if (response.data.isSuccess) {
await login(response.data.data?.token ?? '');
} else {
SmartDialog.showToast(response.data.message);
}
return true;
}
/// 登录 RTM
Future<bool> login(String token) async {
print('RTM TOKEN：$token');
_ensureInitialized();
final (status, _) = await _client!.login(token);
GetStorage storage = GetStorage();
String userId = storage.read('userId') ?? '';
print('RTM userId：$userId');
String tokens = RtmTokenBuilder.buildToken(
appId: '4c2ea9dcb4c5440593a418df0fdd512d',
appCertificate: '16f34b45181a4fae8acdb1a28762fcfa',
userId: userId,
tokenExpireSeconds: 3600,
);
print('RTM TOKEN：$tokens');
final (status, _) = await _client!.login(tokens);
final ok = _handleStatus(status);
print(ok ? 'RTM 登录成功' : 'RTM 登录失败');
if (ok) {
_isLoggedIn = true;
}
return ok;
}
/// 创建频道
Future<bool> subscribe(String channelName) async {
_ensureInitialized();
final (status, _) = await _client!.subscribe(channelName);
print(!status.error ? 'RTM 订阅成功' : 'RTM 订阅失败');
return _handleStatus(status);
}
/// 取消订阅频道
Future<bool> unsubscribe(String channelName) async {
_ensureInitialized();
final (status, _) = await _client!.unsubscribe(channelName);
return _handleStatus(status);
}
/// 登出 RTM
Future<void> logout() async {
if (!_isInitialized || _client == null || !_isLoggedIn) return;
await leaveAllStreamChannels();
final (status, _) = await _client!.logout();
_handleStatus(status);
_isLoggedIn = false;
@ -97,13 +140,6 @@ class RTMManager {
return _handleStatus(status);
}
/// 设置底层参数（JSON）
Future<bool> setParameters(String paramsJson) async {
_ensureInitialized();
final status = await _client!.setParameters(paramsJson);
return _handleStatus(status);
}
/// 发布频道文本消息
Future<bool> publishChannelMessage({
required String channelName,
@ -123,99 +159,8 @@ class RTMManager {
return _handleStatus(status);
}
/// 创建/加入 StreamChannel
Future<bool> joinStreamChannel(
String channelName, {
String? token,
bool withMetadata = false,
bool withPresence = true,
bool withLock = false,
bool beQuiet = false,
}) async {
_ensureInitialized();
StreamChannel? channel = _streamChannels[channelName];
if (channel == null) {
final (createStatus, createdChannel) = await _client!.createStreamChannel(
channelName,
);
if (!_handleStatus(createStatus) || createdChannel == null) {
return false;
}
channel = createdChannel;
_streamChannels[channelName] = channel;
}
final (status, _) = await channel.join(
token: token,
withMetadata: withMetadata,
withPresence: withPresence,
withLock: withLock,
beQuiet: beQuiet,
);
return _handleStatus(status);
}
/// 离开 StreamChannel
Future<void> leaveStreamChannel(String channelName) async {
final channel = _streamChannels[channelName];
if (channel == null) return;
final (status, _) = await channel.leave();
_handleStatus(status);
await channel.release();
_streamChannels.remove(channelName);
}
/// 离开全部 StreamChannel
Future<void> leaveAllStreamChannels() async {
final names = _streamChannels.keys.toList();
for (final name in names) {
await leaveStreamChannel(name);
}
}
/// 加入主题
Future<bool> joinTopic({
required String channelName,
required String topic,
RtmMessageQos qos = RtmMessageQos.unordered,
RtmMessagePriority priority = RtmMessagePriority.normal,
String meta = '',
bool syncWithMedia = false,
}) async {
final channel = await _requireChannel(channelName);
final (status, _) = await channel.joinTopic(
topic,
qos: qos,
priority: priority,
meta: meta,
syncWithMedia: syncWithMedia,
);
return _handleStatus(status);
}
/// 发送主题消息
Future<bool> publishTopicMessage({
required String channelName,
required String topic,
required String message,
int sendTs = 0,
String? customType,
}) async {
final channel = await _requireChannel(channelName);
final (status, _) = await channel.publishTextMessage(
topic,
message,
sendTs: sendTs,
customType: customType,
);
return _handleStatus(status);
}
/// 释放 RTM Client
Future<void> dispose() async {
await leaveAllStreamChannels();
if (_client != null && _isLoggedIn) {
final (status, _) = await _client!.logout();
_handleStatus(status);
@ -248,20 +193,6 @@ class RTMManager {
);
}
Future<StreamChannel> _requireChannel(String channelName) async {
if (!_streamChannels.containsKey(channelName)) {
final ok = await joinStreamChannel(channelName);
if (!ok) {
throw Exception('加入 StreamChannel 失败：$channelName');
}
}
final channel = _streamChannels[channelName];
if (channel == null) {
throw Exception('StreamChannel 不存在：$channelName');
}
return channel;
}
bool _handleStatus(RtmStatus status) {
if (status.error) {
onOperationError?.call(status);

484
pubspec.lock
File diff suppressed because it is too large
View File

3
pubspec.yaml
View File

@ -58,6 +58,8 @@ dependencies:
wechat_assets_picker: ^9.8.0
wechat_camera_picker: ^4.4.0
tdesign_flutter: ^0.2.5
app_settings: ^6.1.1
package_info_plus: ^9.0.0
record: ^6.1.2
video_player: ^2.9.2
chewie: ^1.8.5 # 视频播放器UI
@ -68,6 +70,7 @@ dependencies:
agora_rtc_engine: ^6.5.3
pull_to_refresh: ^2.0.0
agora_rtm: ^2.2.5
agora_token_generator: ^1.0.0
location_plugin:
path: location_plugin

Write Preview
Loading…
Cancel
Save