diff --git a/android/.kotlin/errors/errors-1763427903700.log b/android/.kotlin/errors/errors-1763427903700.log new file mode 100644 index 0000000..5aeb2b9 --- /dev/null +++ b/android/.kotlin/errors/errors-1763427903700.log @@ -0,0 +1,198 @@ +kotlin version: 2.1.0 +error message: Daemon compilation failed: null +java.lang.Exception + at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69) + at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111) + at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:76) + at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62) + at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:209) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:166) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) + at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53) + at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59) + at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174) + at java.base/java.util.concurrent.FutureTask.run(Unknown Source) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169) + at org.gradle.internal.Factories$1.create(Factories.java:31) + at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source) + at java.base/java.util.concurrent.FutureTask.run(Unknown Source) + at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64) + at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) + at java.base/java.lang.Thread.run(Unknown Source) +Caused by: java.lang.AssertionError: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab + at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:236) + at org.jetbrains.kotlin.incremental.IncrementalCachesManager.close(IncrementalCachesManager.kt:55) + at kotlin.io.CloseableKt.closeFinally(Closeable.kt:56) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:293) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:129) + at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:674) + at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:91) + at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1659) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(Unknown Source) + at java.base/java.lang.reflect.Method.invoke(Unknown Source) + at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(Unknown Source) + at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source) + at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source) + at java.base/java.security.AccessController.doPrivileged(Unknown Source) + at java.rmi/sun.rmi.transport.Transport.serviceCall(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(Unknown Source) + at java.base/java.security.AccessController.doPrivileged(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(Unknown Source) + ... 3 more +Caused by: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:223) + ... 22 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153) + at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:151) + at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:142) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\lookups: id-to-file.tab, file-to-id.tab + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.LookupStorage.close(LookupStorage.kt:155) + ... 23 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:51) + at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:48) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 25 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153) + at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 25 more + Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\shared_preferences_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\inputs: source-to-output.tab + ... 25 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\shared_preferences_android-2.4.16\android\src\main\kotlin\io\flutter\plugins\sharedpreferences\MessagesAsync.g.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153) + at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + + diff --git a/android/.kotlin/errors/errors-1763427903713.log b/android/.kotlin/errors/errors-1763427903713.log new file mode 100644 index 0000000..b4f85e9 --- /dev/null +++ b/android/.kotlin/errors/errors-1763427903713.log @@ -0,0 +1,198 @@ +kotlin version: 2.1.0 +error message: Daemon compilation failed: null +java.lang.Exception + at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69) + at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159) + at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111) + at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:76) + at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62) + at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44) + at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:209) + at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) + at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:166) + at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) + at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53) + at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41) + at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59) + at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174) + at java.base/java.util.concurrent.FutureTask.run(Unknown Source) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169) + at org.gradle.internal.Factories$1.create(Factories.java:31) + at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127) + at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164) + at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source) + at java.base/java.util.concurrent.FutureTask.run(Unknown Source) + at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64) + at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) + at java.base/java.lang.Thread.run(Unknown Source) +Caused by: java.lang.AssertionError: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab + at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:236) + at org.jetbrains.kotlin.incremental.IncrementalCachesManager.close(IncrementalCachesManager.kt:55) + at kotlin.io.CloseableKt.closeFinally(Closeable.kt:56) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compileNonIncrementally(IncrementalCompilerRunner.kt:293) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:129) + at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:674) + at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:91) + at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1659) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(Unknown Source) + at java.base/java.lang.reflect.Method.invoke(Unknown Source) + at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(Unknown Source) + at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source) + at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source) + at java.base/java.security.AccessController.doPrivileged(Unknown Source) + at java.rmi/sun.rmi.transport.Transport.serviceCall(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(Unknown Source) + at java.base/java.security.AccessController.doPrivileged(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(Unknown Source) + ... 3 more +Caused by: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\jvm\kotlin: class-fq-name-to-source.tab, source-to-classes.tab, internal-name-to-source.tab + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.com.google.common.io.Closer.close(Closer.java:223) + ... 22 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153) + at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:33) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.save(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:151) + at org.jetbrains.kotlin.incremental.storage.AppendableCollectionExternalizer.save(LazyStorage.kt:142) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\lookups: id-to-file.tab, file-to-id.tab + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:95) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.close(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.LookupStorage.close(LookupStorage.kt:155) + ... 23 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:51) + at org.jetbrains.kotlin.incremental.storage.LegacyFileExternalizer.save(IdToFileMap.kt:48) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:443) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 25 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153) + at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.close(PersistentStorage.kt:124) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 25 more + Suppressed: java.lang.Exception: Could not close incremental caches in D:\www\dating_touchme_app\build\video_player_android\kotlin\compileDebugKotlin\cacheable\caches-jvm\inputs: source-to-output.tab + ... 25 more + Suppressed: java.lang.IllegalArgumentException: this and base files have different roots: C:\Users\Administrator\AppData\Local\Pub\Cache\hosted\pub.flutter-io.cn\video_player_android-2.8.19\android\src\main\kotlin\io\flutter\plugins\videoplayer\Messages.kt and D:\www\dating_touchme_app\android. + at kotlin.io.FilesKt__UtilsKt.toRelativeString(Utils.kt:117) + at kotlin.io.FilesKt__UtilsKt.relativeTo(Utils.kt:128) + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:24) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153) + at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doPut(PersistentMapImpl.java:451) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.put(PersistentMapImpl.java:422) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.put(PersistentHashMap.java:105) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.applyChanges(InMemoryStorage.kt:108) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.applyChanges(InMemoryStorage.kt:179) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.close(InMemoryStorage.kt:136) + at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.close(BasicMap.kt:157) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner$close$1.invoke(BasicMapsOwner.kt:53) + at org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.forEachMapSafe(BasicMapsOwner.kt:87) + ... 24 more + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a2ad459..4a34cf8 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ + _joinRtcChannel(RtcChannelData data) async { + Future _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'); } diff --git a/lib/controller/mine/edit_info_controller.dart b/lib/controller/mine/edit_info_controller.dart index 4ea82a1..c468f53 100644 --- a/lib/controller/mine/edit_info_controller.dart +++ b/lib/controller/mine/edit_info_controller.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:dating_touchme_app/controller/global.dart'; import 'package:dating_touchme_app/generated/assets.dart'; import 'package:dating_touchme_app/model/mine/address_data.dart'; @@ -5,13 +7,17 @@ import 'package:dating_touchme_app/model/mine/education_data.dart'; import 'package:dating_touchme_app/model/mine/occupation_data.dart'; import 'package:dating_touchme_app/model/mine/user_data.dart'; import 'package:dating_touchme_app/network/user_api.dart'; +import 'package:dating_touchme_app/oss/oss_manager.dart'; import 'package:dating_touchme_app/pages/mine/auth_center_page.dart'; import 'package:dating_touchme_app/pages/mine/my_wallet_page.dart'; import 'package:dating_touchme_app/pages/mine/rose_page.dart'; +import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get_storage/get_storage.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:permission_handler/permission_handler.dart'; class EditInfoController extends GetxController { @@ -20,11 +26,7 @@ class EditInfoController extends GetxController { final menuActive = 1.obs; - List 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 = [].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 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 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 _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 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; + } + + } + } \ No newline at end of file diff --git a/lib/controller/mine/login_controller.dart b/lib/controller/mine/login_controller.dart index d2c0f0e..e502737 100644 --- a/lib/controller/mine/login_controller.dart +++ b/lib/controller/mine/login_controller.dart @@ -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); diff --git a/lib/controller/mine/mine_controller.dart b/lib/controller/mine/mine_controller.dart index eeee6c0..4188ac1 100644 --- a/lib/controller/mine/mine_controller.dart +++ b/lib/controller/mine/mine_controller.dart @@ -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 { diff --git a/lib/controller/mine/user_controller.dart b/lib/controller/mine/user_controller.dart index efa1462..31fc56e 100644 --- a/lib/controller/mine/user_controller.dart +++ b/lib/controller/mine/user_controller.dart @@ -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){ diff --git a/lib/controller/mine/user_info_controller.dart b/lib/controller/mine/user_info_controller.dart index 358398b..e5a6458 100644 --- a/lib/controller/mine/user_info_controller.dart +++ b/lib/controller/mine/user_info_controller.dart @@ -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 educationCodeMap = { + '大专以下': '0', + '大专': '1', + '本科': '2', + '硕士及以上': '3', + }; // UserApi实例 late UserApi _userApi; @@ -221,12 +228,7 @@ class UserInfoController extends GetxController { } // 学历代码映射 - Map 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) { - 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()); }); diff --git a/lib/controller/setting/notification_controller.dart b/lib/controller/setting/notification_controller.dart new file mode 100644 index 0000000..057111c --- /dev/null +++ b/lib/controller/setting/notification_controller.dart @@ -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 notificationStatus = PermissionStatus.denied.obs; + final RxBool checking = false.obs; + + // 初始化时检查权限 + @override + void onInit() { + super.onInit(); + // 延迟检查，确保服务已初始化 + checkPermission(); + } + + // 检查通知权限状态 + Future 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 requestNotificationPermission() async { + try { + final status = await Permission.notification.request(); + notificationStatus.value = status; + + print('请求通知权限结果: $status'); + return status; + } catch (e) { + print('请求通知权限失败: $e'); + return PermissionStatus.denied; + } + } + + // 打开应用设置页面（让用户手动开启权限） + Future openSettings() async { + try { + AppSettings.openAppSettings( + type: AppSettingsType.notification, + ); + } catch (e) { + print('打开设置页面失败: $e'); + } + } + + // 检查是否有通知权限的便捷方法 + // Future 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 '黄色'; + } + } +} \ No newline at end of file diff --git a/lib/controller/setting/setting_controller.dart b/lib/controller/setting/setting_controller.dart new file mode 100644 index 0000000..6e2dd9b --- /dev/null +++ b/lib/controller/setting/setting_controller.dart @@ -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 onInit() async { + super.onInit(); + // 从全局依赖中获取UserApi + await getAppInfo(); + } + // 获取验证码 + Future 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 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, + ), + ) + ], + ), + ), + ); + })); + } + +} + diff --git a/lib/main.dart b/lib/main.dart index 265b61e..a89fe82 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -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('token'); + final userId = storage.read('userId'); // 如果token不为空，显示主页；如果token为空，显示登录页面 - if (token != null && token.isNotEmpty) { + if (userId != null && userId.isNotEmpty) { return MainPage(); } else { return LoginPage(); diff --git a/lib/model/mine/user_data.dart b/lib/model/mine/user_data.dart index 65b50f3..d0cdd1c 100644 --- a/lib/model/mine/user_data.dart +++ b/lib/model/mine/user_data.dart @@ -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; diff --git a/lib/model/rtc/rtc_channel_data.dart b/lib/model/rtc/rtc_channel_data.dart index 05c65e0..b5795c4 100644 --- a/lib/model/rtc/rtc_channel_data.dart +++ b/lib/model/rtc/rtc_channel_data.dart @@ -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 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, }; } diff --git a/lib/network/api_urls.dart b/lib/network/api_urls.dart index d5336df..ea4e69b 100644 --- a/lib/network/api_urls.dart +++ b/lib/network/api_urls.dart @@ -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'; diff --git a/lib/network/network_config.dart b/lib/network/network_config.dart index 58f0e53..c892bf5 100644 --- a/lib/network/network_config.dart +++ b/lib/network/network_config.dart @@ -83,7 +83,6 @@ class ResponseInterceptor extends Interceptor { ) { // 统一处理响应数据 final data = response.data; - // 检查响应状态码 if (response.statusCode == 200) { // 假设后端返回的数据格式为 {"code": 0, "message": "success", "data": {...}} diff --git a/lib/network/rtc_api.dart b/lib/network/rtc_api.dart index c298e3c..7e4c4e8 100644 --- a/lib/network/rtc_api.dart +++ b/lib/network/rtc_api.dart @@ -12,6 +12,14 @@ abstract class RtcApi { factory RtcApi(Dio dio) = _RtcApi; /// 创建实时音视频频道 + @GET(ApiUrls.getSwRtcToken) + Future>> getSwRtcToken(); + + /// 获取声网 RTM Token + @GET(ApiUrls.getSwRtmToken) + Future>> getSwRtmToken(); + + /// 创建实时音视频频道（返回字符串） @POST(ApiUrls.createRtcChannel) Future>> createRtcChannel(); } diff --git a/lib/network/rtc_api.g.dart b/lib/network/rtc_api.g.dart index 528db3a..2cbdf56 100644 --- a/lib/network/rtc_api.g.dart +++ b/lib/network/rtc_api.g.dart @@ -19,6 +19,68 @@ class _RtcApi implements RtcApi { final ParseErrorLogger? errorLogger; + @override + Future>> getSwRtcToken() async { + final _extra = {}; + final queryParameters = {}; + final _headers = {}; + const Map? _data = null; + final _options = _setStreamType>>( + 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>(_options); + late BaseResponse _value; + try { + _value = BaseResponse.fromJson( + _result.data!, + (json) => RtcChannelData.fromJson(json as Map), + ); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } + final httpResponse = HttpResponse(_value, _result); + return httpResponse; + } + + @override + Future>> getSwRtmToken() async { + final _extra = {}; + final queryParameters = {}; + final _headers = {}; + const Map? _data = null; + final _options = _setStreamType>>( + 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>(_options); + late BaseResponse _value; + try { + _value = BaseResponse.fromJson( + _result.data!, + (json) => RtcChannelData.fromJson(json as Map), + ); + } on Object catch (e, s) { + errorLogger?.logError(e, s, _options); + rethrow; + } + final httpResponse = HttpResponse(_value, _result); + return httpResponse; + } + @override Future>> createRtcChannel() async { final _extra = {}; diff --git a/lib/network/user_api.dart b/lib/network/user_api.dart index 30d98ad..c697833 100644 --- a/lib/network/user_api.dart +++ b/lib/network/user_api.dart @@ -111,4 +111,9 @@ abstract class UserApi { Future>>> getOccupationList( @Body() Map data, ); + + @POST(ApiUrls.editOwnMarriageInformation) + Future>> editOwnMarriageInformation( + @Body() Map data, + ); } diff --git a/lib/network/user_api.g.dart b/lib/network/user_api.g.dart index 0061c0f..c3b10f7 100644 --- a/lib/network/user_api.g.dart +++ b/lib/network/user_api.g.dart @@ -188,8 +188,8 @@ class _UserApi implements UserApi { @override Future>> saveCertificationAudit( - Map data, - ) async { + Map data, + ) async { final _extra = {}; final queryParameters = {}; final _headers = {}; @@ -198,11 +198,11 @@ class _UserApi implements UserApi { final _options = _setStreamType>>( 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>(_options); @@ -210,7 +210,7 @@ class _UserApi implements UserApi { try { _value = BaseResponse.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>> editOwnMarriageInformation( + Map data, + ) async { + final _extra = {}; + final queryParameters = {}; + final _headers = {}; + final _data = {}; + _data.addAll(data); + final _options = _setStreamType>>( + 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>(_options); + late BaseResponse _value; + try { + _value = BaseResponse.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(RequestOptions requestOptions) { if (T != dynamic && !(requestOptions.responseType == ResponseType.bytes || diff --git a/lib/pages/home/report_page.dart b/lib/pages/home/report_page.dart index 6a19b8a..9403d74 100644 --- a/lib/pages/home/report_page.dart +++ b/lib/pages/home/report_page.dart @@ -23,7 +23,7 @@ class _ReportPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: PageAppbar(title: "举报中心",), + appBar: PageAppbar(title: "举报中心"), body: SingleChildScrollView( child: Container( padding: EdgeInsets.only( diff --git a/lib/pages/main/main_page.dart b/lib/pages/main/main_page.dart index ef427f8..174e049 100644 --- a/lib/pages/main/main_page.dart +++ b/lib/pages/main/main_page.dart @@ -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 { Get.put(RouteGuardService()); // 检查token并调用获取婚姻信息详情的方法 checkTokenAndFetchMarriageInfo(); + initRTM(); } // 检查token并获取婚姻信息详情 @@ -58,6 +60,11 @@ class _MainPageState extends State { await userController.getBaseUserInfo(userId, true); } } + + initRTM() async { + String? userId = storage.read('userId'); + await RTMManager.instance.initialize(appId: '4c2ea9dcb4c5440593a418df0fdd512d', userId: userId ?? ''); + } @override Widget build(BuildContext context) { diff --git a/lib/pages/mine/auth_center_page.dart b/lib/pages/mine/auth_center_page.dart index 188a73b..7b59cb0 100644 --- a/lib/pages/mine/auth_center_page.dart +++ b/lib/pages/mine/auth_center_page.dart @@ -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,)); diff --git a/lib/pages/mine/edit_info_page.dart b/lib/pages/mine/edit_info_page.dart index afed1e0..4dbeaff 100644 --- a/lib/pages/mine/edit_info_page.dart +++ b/lib/pages/mine/edit_info_page.dart @@ -1,11 +1,18 @@ +import 'dart:io'; + import 'package:dating_touchme_app/components/page_appbar.dart'; import 'package:dating_touchme_app/controller/mine/edit_info_controller.dart'; +import 'package:dating_touchme_app/extension/ex_widget.dart'; import 'package:dating_touchme_app/generated/assets.dart'; +import 'package:dating_touchme_app/model/mine/address_data.dart'; +import 'package:dating_touchme_app/model/mine/occupation_data.dart'; import 'package:dating_touchme_app/pages/mine/signature_page.dart'; import 'package:dating_touchme_app/pages/mine/tag_setting_page.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:get_storage/get_storage.dart'; import 'package:tdesign_flutter/tdesign_flutter.dart'; class EditInfoPage extends StatefulWidget { @@ -28,9 +35,44 @@ class _EditInfoPageState extends State { } + + // 显示头像选择选项 + void _showAvatarOptions(EditInfoController controller, int type) { + showCupertinoModalPopup( + context: Get.context!, + builder: (context) => CupertinoActionSheet( + title: const Text('选择头像'), + actions: [ + 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( + return GetX( + init: EditInfoController(), builder: (controller) { return Scaffold( appBar: PageAppbar(title: "编辑资料"), @@ -106,10 +148,15 @@ class _EditInfoPageState extends State { 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 { ), ) ], - ), + ).onTap(() { + _showAvatarOptions(controller, 1); + }), SizedBox(height: 20.w,), Container( width: 375.w, @@ -156,30 +205,18 @@ class _EditInfoPageState extends State { 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 { color: const Color.fromRGBO(144, 144, 144, 1), ), ), - ) + ).onTap(() { + _showAvatarOptions(controller, 2); + }) ], ), ), @@ -361,6 +400,27 @@ class _EditInfoPageState extends State { TDPicker.showMultiLinkedPicker(context, title: '', onConfirm: (selected) { print(selected); + controller.location.value = selected.join("-"); + Map province = address.firstWhere( + (e) => e["label"] == selected[0], + orElse: () => {}, + ); + if(province.isNotEmpty){ + Map city = province["children"].firstWhere( + (e) => e["label"] == selected[1], + orElse: () => {}, + ); + if(city.isNotEmpty){ + Map district = city["children"].firstWhere( + (e) => e["label"] == selected[2], + orElse: () => {}, + ); + 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 { 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 { TDPicker.showMultiLinkedPicker(context, title: '', onConfirm: (selected) { print(selected); + controller.homeLocation.value = selected.join("-"); + Map province = address.firstWhere( + (e) => e["label"] == selected[0], + orElse: () => {}, + ); + if(province.isNotEmpty){ + Map city = province["children"].firstWhere( + (e) => e["label"] == selected[1], + orElse: () => {}, + ); + if(city.isNotEmpty){ + Map district = city["children"].firstWhere( + (e) => e["label"] == selected[2], + orElse: () => {}, + ); + 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 { 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 { onConfirm: (selected) { print(selected); print(controller.educationList[selected[0]]); + controller.educationSelect.value = selected[0]; setState(() { }); @@ -413,10 +497,11 @@ class _EditInfoPageState extends State { }, 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 { 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 { 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 { onConfirm: (selected) { print(selected); print(controller.incomeList[selected[0]]); + controller.incomeSelect.value = selected[0]; setState(() { }); @@ -456,10 +552,11 @@ class _EditInfoPageState extends State { }, 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 { onConfirm: (selected) { print(selected); print(controller.maritalList[selected[0]]); + controller.maritalSelect.value = selected[0]; setState(() { }); @@ -476,10 +574,11 @@ class _EditInfoPageState extends State { }, 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 { onConfirm: (selected) { print(selected); print(controller.propertyList[selected[0]]); + controller.propertySelect.value = selected[0]; setState(() { }); @@ -496,13 +596,41 @@ class _EditInfoPageState extends State { }, 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 { 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 { ), ), ), - Positioned( + if(controller.imgList.length > 0) Positioned( left: 15.w, top: 313.w, child: Row( diff --git a/lib/pages/mine/login_controller.dart b/lib/pages/mine/login_controller.dart deleted file mode 100644 index ba34f49..0000000 --- a/lib/pages/mine/login_controller.dart +++ /dev/null @@ -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(); -// } -// -// // 获取验证码 -// Future 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 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 _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 _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'); -// } -// } -// } \ No newline at end of file diff --git a/lib/pages/mine/mine_page.dart b/lib/pages/mine/mine_page.dart index 374837b..4c59793 100644 --- a/lib/pages/mine/mine_page.dart +++ b/lib/pages/mine/mine_page.dart @@ -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 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( diff --git a/lib/pages/mine/phone_page.dart b/lib/pages/mine/phone_page.dart index e602a6c..117c3fa 100644 --- a/lib/pages/mine/phone_page.dart +++ b/lib/pages/mine/phone_page.dart @@ -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, diff --git a/lib/pages/mine/real_name_page.dart b/lib/pages/mine/real_name_page.dart index a45e396..9aa3bd2 100644 --- a/lib/pages/mine/real_name_page.dart +++ b/lib/pages/mine/real_name_page.dart @@ -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( diff --git a/lib/pages/mine/setting_page.dart b/lib/pages/mine/setting_page.dart deleted file mode 100644 index fb22e17..0000000 --- a/lib/pages/mine/setting_page.dart +++ /dev/null @@ -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 createState() => _SettingPageState(); -} - -class _SettingPageState extends State { - - - 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 children; - const BlockItem({super.key, required this.children}); - - @override - State createState() => _BlockItemState(); -} - -class _BlockItemState extends State { - @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 createState() => _ItemState(); -} - -class _ItemState extends State { - @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), - ); - } -} diff --git a/lib/pages/mine/user_info_page.dart b/lib/pages/mine/user_info_page.dart index 50ed079..cbb7903 100644 --- a/lib/pages/mine/user_info_page.dart +++ b/lib/pages/mine/user_info_page.dart @@ -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: [ - 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), ], ), ), diff --git a/lib/pages/mine/blacklist_page.dart b/lib/pages/setting/blacklist_page.dart similarity index 100% rename from lib/pages/mine/blacklist_page.dart rename to lib/pages/setting/blacklist_page.dart diff --git a/lib/pages/setting/notice_page.dart b/lib/pages/setting/notice_page.dart new file mode 100644 index 0000000..0e68bb6 --- /dev/null +++ b/lib/pages/setting/notice_page.dart @@ -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; + }, + ) + ), + ], + ), + ], + ); + }), + ), + ), + ); + } + +} + diff --git a/lib/pages/setting/setting_page.dart b/lib/pages/setting/setting_page.dart new file mode 100644 index 0000000..27c03e6 --- /dev/null +++ b/lib/pages/setting/setting_page.dart @@ -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 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), + ], + ); + }), + ), + ), + ); + } + +} + diff --git a/lib/rtc/rtc_manager.dart b/lib/rtc/rtc_manager.dart index c89abe9..6f70add 100644 --- a/lib/rtc/rtc_manager.dart +++ b/lib/rtc/rtc_manager.dart @@ -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 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); } diff --git a/lib/rtc/rtm_manager.dart b/lib/rtc/rtm_manager.dart index d7c159f..99a463b 100644 --- a/lib/rtc/rtm_manager.dart +++ b/lib/rtc/rtm_manager.dart @@ -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 _streamChannels = {}; @@ -52,39 +61,73 @@ class RTMManager { _currentUserId == userId) { return true; } - + _networkService = Get.find(); 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 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 subscribe(String channelName) async { + _ensureInitialized(); + final (status, _) = await _client!.subscribe(channelName); + print(!status.error ? 'RTM 订阅成功' : 'RTM 订阅失败'); + return _handleStatus(status); + } + + /// 取消订阅频道 + Future unsubscribe(String channelName) async { + _ensureInitialized(); + final (status, _) = await _client!.unsubscribe(channelName); + return _handleStatus(status); + } + /// 登出 RTM Future 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 setParameters(String paramsJson) async { - _ensureInitialized(); - final status = await _client!.setParameters(paramsJson); - return _handleStatus(status); - } - /// 发布频道文本消息 Future publishChannelMessage({ required String channelName, @@ -123,99 +159,8 @@ class RTMManager { return _handleStatus(status); } - /// 创建/加入 StreamChannel - Future 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 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 leaveAllStreamChannels() async { - final names = _streamChannels.keys.toList(); - for (final name in names) { - await leaveStreamChannel(name); - } - } - - /// 加入主题 - Future 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 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 dispose() async { - await leaveAllStreamChannels(); if (_client != null && _isLoggedIn) { final (status, _) = await _client!.logout(); _handleStatus(status); @@ -248,20 +193,6 @@ class RTMManager { ); } - Future _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); diff --git a/pubspec.lock b/pubspec.lock index c07ceb2..1886d6d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -6,7 +6,7 @@ packages: description: name: _fe_analyzer_shared sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "88.0.0" agora_rtc_engine: @@ -14,7 +14,7 @@ packages: description: name: agora_rtc_engine sha256: "6559294d18ce4445420e19dbdba10fb58cac955cd8f22dbceae26716e194d70e" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.5.3" agora_rtm: @@ -22,15 +22,23 @@ packages: description: name: agora_rtm sha256: "3cd8e25ecfccbb2e8ca5a70b173bff080dab782e233f9b40f483adbd31dd38fb" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.5" + agora_token_generator: + dependency: "direct main" + description: + name: agora_token_generator + sha256: eeb53d753430b6d6227b05ace89655cd7990b3137a236937825699d528377904 + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.0.0" analyzer: dependency: transitive description: name: analyzer sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "8.1.1" ansicolor: @@ -38,7 +46,7 @@ packages: description: name: ansicolor sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.3" archive: @@ -46,7 +54,7 @@ packages: description: name: archive sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.0.7" args: @@ -54,7 +62,7 @@ packages: description: name: args sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.7.0" async: @@ -62,7 +70,7 @@ packages: description: name: async sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.13.0" audioplayers: @@ -70,7 +78,7 @@ packages: description: name: audioplayers sha256: "5441fa0ceb8807a5ad701199806510e56afde2b4913d9d17c2f19f2902cf0ae4" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.5.1" audioplayers_android: @@ -78,7 +86,7 @@ packages: description: name: audioplayers_android sha256: "60a6728277228413a85755bd3ffd6fab98f6555608923813ce383b190a360605" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.2.1" audioplayers_darwin: @@ -86,7 +94,7 @@ packages: description: name: audioplayers_darwin sha256: "0811d6924904ca13f9ef90d19081e4a87f7297ddc19fc3d31f60af1aaafee333" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.3.0" audioplayers_linux: @@ -94,7 +102,7 @@ packages: description: name: audioplayers_linux sha256: f75bce1ce864170ef5e6a2c6a61cd3339e1a17ce11e99a25bae4474ea491d001 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.2.1" audioplayers_platform_interface: @@ -102,7 +110,7 @@ packages: description: name: audioplayers_platform_interface sha256: "0e2f6a919ab56d0fec272e801abc07b26ae7f31980f912f24af4748763e5a656" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "7.1.1" audioplayers_web: @@ -110,7 +118,7 @@ packages: description: name: audioplayers_web sha256: "1c0f17cec68455556775f1e50ca85c40c05c714a99c5eb1d2d57cc17ba5522d7" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.1" audioplayers_windows: @@ -118,7 +126,7 @@ packages: description: name: audioplayers_windows sha256: "4048797865105b26d47628e6abb49231ea5de84884160229251f37dfcbe52fd7" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.2.1" boolean_selector: @@ -126,7 +134,7 @@ packages: description: name: boolean_selector sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.2" build: @@ -134,7 +142,7 @@ packages: description: name: build sha256: dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.0.2" build_config: @@ -142,7 +150,7 @@ packages: description: name: build_config sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" build_daemon: @@ -150,7 +158,7 @@ packages: description: name: build_daemon sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.1.1" build_runner: @@ -158,7 +166,7 @@ packages: description: name: build_runner sha256: "7b5b569f3df370590a85029148d6fc66c7d0201fc6f1847c07dd85d365ae9fcd" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.10.3" built_collection: @@ -166,7 +174,7 @@ packages: description: name: built_collection sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.1" built_value: @@ -174,7 +182,7 @@ packages: description: name: built_value sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "8.12.0" cached_network_image: @@ -182,7 +190,7 @@ packages: description: name: cached_network_image sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.4.1" cached_network_image_platform_interface: @@ -190,7 +198,7 @@ packages: description: name: cached_network_image_platform_interface sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.1.1" cached_network_image_web: @@ -198,7 +206,7 @@ packages: description: name: cached_network_image_web sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" camera: @@ -206,31 +214,31 @@ packages: description: name: camera sha256: dfa8fc5a1adaeb95e7a54d86a5bd56f4bb0e035515354c8ac6d262e35cec2ec8 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.10.6" camera_android: dependency: transitive description: name: camera_android - sha256: "8397c4fcec4f4dbafdeff994adc6ed16dcaa4a25f02e70e3b8fbe59c9a88807f" - url: "https://pub.dev" + sha256: "292c96d986feda7ae5882abe633423c6e70ab4579c038ab78711010f5d7ecf5c" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.10.10+11" + version: "0.10.10+13" camera_avfoundation: dependency: transitive description: name: camera_avfoundation - sha256: "1a98138e44451c258aea84600135bd5975031382b609752d76a4f5e1b117e5e0" - url: "https://pub.dev" + sha256: "035b90c1e33c2efad7548f402572078f6e514d4f82be0a315cd6c6af7e855aa8" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.22+5" + version: "0.9.22+6" camera_platform_interface: dependency: transitive description: name: camera_platform_interface sha256: "98cfc9357e04bad617671b4c1f78a597f25f08003089dd94050709ae54effc63" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.12.0" camera_web: @@ -238,7 +246,7 @@ packages: description: name: camera_web sha256: "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.5" characters: @@ -246,7 +254,7 @@ packages: description: name: characters sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" checked_yaml: @@ -254,7 +262,7 @@ packages: description: name: checked_yaml sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.4" chewie: @@ -262,7 +270,7 @@ packages: description: name: chewie sha256: "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.13.0" clock: @@ -270,7 +278,7 @@ packages: description: name: clock sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" code_builder: @@ -278,7 +286,7 @@ packages: description: name: code_builder sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.11.0" collection: @@ -286,7 +294,7 @@ packages: description: name: collection sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.19.1" common_utils: @@ -294,7 +302,7 @@ packages: description: name: common_utils sha256: c26884339b13ff99b0739e56f4b02090c84054ed9dd3a045435cd24e7b99c2c1 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" convert: @@ -302,7 +310,7 @@ packages: description: name: convert sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.2" cross_file: @@ -310,7 +318,7 @@ packages: description: name: cross_file sha256: "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.5" crypto: @@ -318,7 +326,7 @@ packages: description: name: crypto sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.7" csslib: @@ -326,7 +334,7 @@ packages: description: name: csslib sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" cupertino_icons: @@ -334,7 +342,7 @@ packages: description: name: cupertino_icons sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.8" dart_style: @@ -342,7 +350,7 @@ packages: description: name: dart_style sha256: c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.2" dbus: @@ -350,7 +358,7 @@ packages: description: name: dbus sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.7.11" decimal: @@ -358,7 +366,7 @@ packages: description: name: decimal sha256: fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.2.4" dio: @@ -366,7 +374,7 @@ packages: description: name: dio sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.9.0" dio_web_adapter: @@ -374,7 +382,7 @@ packages: description: name: dio_web_adapter sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" easy_localization: @@ -382,7 +390,7 @@ packages: description: name: easy_localization sha256: "2ccdf9db8fe4d9c5a75c122e6275674508fd0f0d49c827354967b8afcc56bbed" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.8" easy_logger: @@ -390,7 +398,7 @@ packages: description: name: easy_logger sha256: c764a6e024846f33405a2342caf91c62e357c24b02c04dbc712ef232bf30ffb7 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.0.2" easy_refresh: @@ -398,7 +406,7 @@ packages: description: name: easy_refresh sha256: "486e30abfcaae66c0f2c2798a10de2298eb9dc5e0bb7e1dba9328308968cae0c" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.4.0" event_bus: @@ -406,7 +414,7 @@ packages: description: name: event_bus sha256: "1a55e97923769c286d295240048fc180e7b0768902c3c2e869fe059aafa15304" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" extended_image: @@ -414,7 +422,7 @@ packages: description: name: extended_image sha256: "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "9.1.0" extended_image_library: @@ -422,7 +430,7 @@ packages: description: name: extended_image_library sha256: e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.0.6" fake_async: @@ -430,7 +438,7 @@ packages: description: name: fake_async sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.3" ffi: @@ -438,7 +446,7 @@ packages: description: name: ffi sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" file: @@ -446,47 +454,47 @@ packages: description: name: file sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "7.0.1" file_selector_linux: dependency: transitive description: name: file_selector_linux - sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33" - url: "https://pub.dev" + sha256: "80a877f5ec570c4fb3b40720a70b6f31e8bb1315a464b4d3e92fe82754d4b21a" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.3+2" + version: "0.9.3+3" file_selector_macos: dependency: transitive description: name: file_selector_macos - sha256: "88707a3bec4b988aaed3b4df5d7441ee4e987f20b286cddca5d6a8270cab23f2" - url: "https://pub.dev" + sha256: "44f24d102e368370951b98ffe86c7325b38349e634578312976607d28cc6d747" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.4+5" + version: "0.9.4+6" file_selector_platform_interface: dependency: transitive description: name: file_selector_platform_interface sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.7.0" file_selector_windows: dependency: transitive description: name: file_selector_windows - sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b" - url: "https://pub.dev" + sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.3+4" + version: "0.9.3+5" fixnum: dependency: transitive description: name: fixnum sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" flustars: @@ -494,7 +502,7 @@ packages: description: name: flustars sha256: "7019ab8d68c0d4759ee122644d91a165d450b0492717f9e7e9d0ce277dcf664b" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" flutter: @@ -507,7 +515,7 @@ packages: description: name: flutter_cache_manager sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.4.1" flutter_lints: @@ -515,7 +523,7 @@ packages: description: name: flutter_lints sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.0.0" flutter_localizations: @@ -528,7 +536,7 @@ packages: description: name: flutter_native_splash sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.7" flutter_oss_aliyun: @@ -536,7 +544,7 @@ packages: description: name: flutter_oss_aliyun sha256: "8280c1e8dfb792dec6449d1e6052e1d3492b3b3a1dfee456cc41d3f31b4cbc26" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.4.2" flutter_plugin_android_lifecycle: @@ -544,7 +552,7 @@ packages: description: name: flutter_plugin_android_lifecycle sha256: "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.32" flutter_screenutil: @@ -552,7 +560,7 @@ packages: description: name: flutter_screenutil sha256: "8239210dd68bee6b0577aa4a090890342d04a136ce1c81f98ee513fc0ce891de" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.9.3" flutter_slidable: @@ -560,7 +568,7 @@ packages: description: name: flutter_slidable sha256: a857de7ea701f276fd6a6c4c67ae885b60729a3449e42766bb0e655171042801 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.2" flutter_smart_dialog: @@ -568,7 +576,7 @@ packages: description: name: flutter_smart_dialog sha256: "0852df132cb03fd8fc5144eb404c31eb7eb50c22aecb1cc2504f2f598090d756" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.9.8+9" flutter_swiper_null_safety: @@ -576,7 +584,7 @@ packages: description: name: flutter_swiper_null_safety sha256: "5a855e0080d035c08e82f8b7fd2f106344943a30c9ab483b2584860a2f22eaaf" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" flutter_test: @@ -594,7 +602,7 @@ packages: description: name: frontend_server_client sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.0.0" get: @@ -602,7 +610,7 @@ packages: description: name: get sha256: c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.7.2" get_storage: @@ -610,7 +618,7 @@ packages: description: name: get_storage sha256: "39db1fffe779d0c22b3a744376e86febe4ade43bf65e06eab5af707dc84185a2" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" glob: @@ -618,7 +626,7 @@ packages: description: name: glob sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.3" graphs: @@ -626,7 +634,7 @@ packages: description: name: graphs sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.2" hotreloader: @@ -634,7 +642,7 @@ packages: description: name: hotreloader sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.3.0" html: @@ -642,7 +650,7 @@ packages: description: name: html sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.15.6" http: @@ -650,7 +658,7 @@ packages: description: name: http sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.6.0" http_client_helper: @@ -658,7 +666,7 @@ packages: description: name: http_client_helper sha256: "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.0" http_multi_server: @@ -666,7 +674,7 @@ packages: description: name: http_multi_server sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.2.2" http_parser: @@ -674,7 +682,7 @@ packages: description: name: http_parser sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.1.2" im_flutter_sdk: @@ -682,7 +690,7 @@ packages: description: name: im_flutter_sdk sha256: "5f81988c5edf14a4e3868b9c47f01de2ee355e2203ae5bd95d7cacfe30e15d97" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.15.2" im_flutter_sdk_android: @@ -690,7 +698,7 @@ packages: description: name: im_flutter_sdk_android sha256: ce4e01f1374a6cf20bb46f6774e1effbde5c014fd1cd3003b6604813e4fe9e71 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.15.2" im_flutter_sdk_interface: @@ -698,7 +706,7 @@ packages: description: name: im_flutter_sdk_interface sha256: "08ad3ce9fc935e24272bce34aebfd9b3c3c30aab2b9e7d4b2e759acf4a4874f5" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.15.2" im_flutter_sdk_ios: @@ -706,7 +714,7 @@ packages: description: name: im_flutter_sdk_ios sha256: "11300c086f5821730224932c28860198ef5d879f7941f9158dddee499f7bb60e" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.15.2" image: @@ -714,7 +722,7 @@ packages: description: name: image sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.5.4" image_picker: @@ -722,7 +730,7 @@ packages: description: name: image_picker sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" image_picker_android: @@ -730,7 +738,7 @@ packages: description: name: image_picker_android sha256: "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.8.12+23" image_picker_for_web: @@ -738,23 +746,23 @@ packages: description: name: image_picker_for_web sha256: "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.0" image_picker_ios: dependency: transitive description: name: image_picker_ios - sha256: e675c22790bcc24e9abd455deead2b7a88de4b79f7327a281812f14de1a56f58 - url: "https://pub.dev" + sha256: "997d100ce1dda5b1ba4085194c5e36c9f8a1fb7987f6a36ab677a344cd2dc986" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.8.13+1" + version: "0.8.13+2" image_picker_linux: dependency: transitive description: name: image_picker_linux sha256: "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.2" image_picker_macos: @@ -762,7 +770,7 @@ packages: description: name: image_picker_macos sha256: "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.2+1" image_picker_platform_interface: @@ -770,7 +778,7 @@ packages: description: name: image_picker_platform_interface sha256: "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.11.1" image_picker_windows: @@ -778,7 +786,7 @@ packages: description: name: image_picker_windows sha256: d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.2" intl: @@ -786,7 +794,7 @@ packages: description: name: intl sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.20.2" io: @@ -794,7 +802,7 @@ packages: description: name: io sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" iris_method_channel: @@ -802,7 +810,7 @@ packages: description: name: iris_method_channel sha256: bfb5cfc6c6eae42da8cd1b35977a72d8b8881848a5dfc3d672e4760a907d11a0 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.4" js: @@ -810,7 +818,7 @@ packages: description: name: js sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.7.2" json_annotation: @@ -818,7 +826,7 @@ packages: description: name: json_annotation sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.9.0" json_serializable: @@ -826,7 +834,7 @@ packages: description: name: json_serializable sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.11.1" leak_tracker: @@ -834,7 +842,7 @@ packages: description: name: leak_tracker sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "11.0.2" leak_tracker_flutter_testing: @@ -842,7 +850,7 @@ packages: description: name: leak_tracker_flutter_testing sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.10" leak_tracker_testing: @@ -850,7 +858,7 @@ packages: description: name: leak_tracker_testing sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.2" lean_builder: @@ -858,7 +866,7 @@ packages: description: name: lean_builder sha256: ef5cd5f907157eb7aa87d1704504b5a6386d2cbff88a3c2b3344477bab323ee9 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.2" lints: @@ -866,7 +874,7 @@ packages: description: name: lints sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.1" location_plugin: @@ -881,7 +889,7 @@ packages: description: name: logging sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" matcher: @@ -889,7 +897,7 @@ packages: description: name: matcher sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.17" material_color_utilities: @@ -897,7 +905,7 @@ packages: description: name: material_color_utilities sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.11.1" meta: @@ -905,7 +913,7 @@ packages: description: name: meta sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.16.0" mime: @@ -913,7 +921,7 @@ packages: description: name: mime sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.6" nested: @@ -921,7 +929,7 @@ packages: description: name: nested sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.0" octo_image: @@ -929,7 +937,7 @@ packages: description: name: octo_image sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" package_config: @@ -937,7 +945,7 @@ packages: description: name: package_config sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" package_info_plus: @@ -945,7 +953,7 @@ packages: description: name: package_info_plus sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "9.0.0" package_info_plus_platform_interface: @@ -953,7 +961,7 @@ packages: description: name: package_info_plus_platform_interface sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.2.1" path: @@ -961,7 +969,7 @@ packages: description: name: path sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.1" path_drawing: @@ -969,7 +977,7 @@ packages: description: name: path_drawing sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.1" path_parsing: @@ -977,7 +985,7 @@ packages: description: name: path_parsing sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" path_provider: @@ -985,31 +993,31 @@ packages: description: name: path_provider sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: e122c5ea805bb6773bb12ce667611265980940145be920cd09a4b0ec0285cb16 - url: "https://pub.dev" + sha256: "95c68a74d3cab950fd0ed8073d9fab15c1c06eb1f3eec68676e87aabc9ecee5a" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.20" + version: "2.2.21" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: efaec349ddfc181528345c56f8eda9d6cccd71c177511b132c6a0ddaefaa2738 - url: "https://pub.dev" + sha256: "97390a0719146c7c3e71b6866c34f1cde92685933165c1c671984390d2aca776" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.4.3" + version: "2.4.4" path_provider_linux: dependency: transitive description: name: path_provider_linux sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.1" path_provider_platform_interface: @@ -1017,7 +1025,7 @@ packages: description: name: path_provider_platform_interface sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.2" path_provider_windows: @@ -1025,7 +1033,7 @@ packages: description: name: path_provider_windows sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.0" permission_handler: @@ -1033,7 +1041,7 @@ packages: description: name: permission_handler sha256: bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "12.0.1" permission_handler_android: @@ -1041,7 +1049,7 @@ packages: description: name: permission_handler_android sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "13.0.1" permission_handler_apple: @@ -1049,7 +1057,7 @@ packages: description: name: permission_handler_apple sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "9.4.7" permission_handler_html: @@ -1057,7 +1065,7 @@ packages: description: name: permission_handler_html sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.3+5" permission_handler_platform_interface: @@ -1065,7 +1073,7 @@ packages: description: name: permission_handler_platform_interface sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.3.0" permission_handler_windows: @@ -1073,7 +1081,7 @@ packages: description: name: permission_handler_windows sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1" petitparser: @@ -1081,7 +1089,7 @@ packages: description: name: petitparser sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "7.0.1" photo_manager: @@ -1089,7 +1097,7 @@ packages: description: name: photo_manager sha256: a0d9a7a9bc35eda02d33766412bde6d883a8b0acb86bbe37dac5f691a0894e8a - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.7.1" photo_manager_image_provider: @@ -1097,7 +1105,7 @@ packages: description: name: photo_manager_image_provider sha256: b6015b67b32f345f57cf32c126f871bced2501236c405aafaefa885f7c821e4f - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" platform: @@ -1105,7 +1113,7 @@ packages: description: name: platform sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.6" plugin_platform_interface: @@ -1113,15 +1121,23 @@ packages: description: name: plugin_platform_interface sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.8" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5" + url: "https://pub.flutter-io.cn" + source: hosted + version: "4.0.0" pool: dependency: transitive description: name: pool sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.2" posix: @@ -1129,7 +1145,7 @@ packages: description: name: posix sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.0.3" protobuf: @@ -1137,7 +1153,7 @@ packages: description: name: protobuf sha256: "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.0" provider: @@ -1145,7 +1161,7 @@ packages: description: name: provider sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.5+1" pub_semver: @@ -1153,7 +1169,7 @@ packages: description: name: pub_semver sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" pubspec_parse: @@ -1161,7 +1177,7 @@ packages: description: name: pubspec_parse sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.0" pull_to_refresh: @@ -1169,7 +1185,7 @@ packages: description: name: pull_to_refresh sha256: bbadd5a931837b57739cf08736bea63167e284e71fb23b218c8c9a6e042aad12 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" rational: @@ -1177,7 +1193,7 @@ packages: description: name: rational sha256: cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.3" record: @@ -1185,7 +1201,7 @@ packages: description: name: record sha256: "6bad72fb3ea6708d724cf8b6c97c4e236cf9f43a52259b654efeb6fd9b737f1f" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.2" record_android: @@ -1193,7 +1209,7 @@ packages: description: name: record_android sha256: fb54ee4e28f6829b8c580252a9ef49d9c549cfd263b0660ad7eeac0908658e9f - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.4" record_ios: @@ -1201,7 +1217,7 @@ packages: description: name: record_ios sha256: "765b42ac1be019b1674ddd809b811fc721fe5a93f7bb1da7803f0d16772fd6d7" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.4" record_linux: @@ -1209,7 +1225,7 @@ packages: description: name: record_linux sha256: "235b1f1fb84e810f8149cc0c2c731d7d697f8d1c333b32cb820c449bf7bb72d8" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" record_macos: @@ -1217,7 +1233,7 @@ packages: description: name: record_macos sha256: "842ea4b7e95f4dd237aacffc686d1b0ff4277e3e5357865f8d28cd28bc18ed95" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" record_platform_interface: @@ -1225,7 +1241,7 @@ packages: description: name: record_platform_interface sha256: b0065fdf1ec28f5a634d676724d388a77e43ce7646fb049949f58c69f3fcb4ed - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" record_web: @@ -1233,7 +1249,7 @@ packages: description: name: record_web sha256: "20ac10d56514cb9f8cecc8f3579383084fdfb43b0d04e05a95244d0d76091d90" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" record_windows: @@ -1241,7 +1257,7 @@ packages: description: name: record_windows sha256: "223258060a1d25c62bae18282c16783f28581ec19401d17e56b5205b9f039d78" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.7" retrofit: @@ -1249,7 +1265,7 @@ packages: description: name: retrofit sha256: "7d78824afa6eeeaf6ac58220910ee7a97597b39e93360d4bda230b7c6df45089" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.9.0" retrofit_generator: @@ -1257,7 +1273,7 @@ packages: description: name: retrofit_generator sha256: "56df50afab95199dada9e1afbfe5ec228612d03859b250e5e4846c3ebfe50bf7" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "10.1.4" rxdart: @@ -1265,7 +1281,7 @@ packages: description: name: rxdart sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.28.0" sensors_plus: @@ -1273,7 +1289,7 @@ packages: description: name: sensors_plus sha256: "89e2bfc3d883743539ce5774a2b93df61effde40ff958ecad78cd66b1a8b8d52" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.2" sensors_plus_platform_interface: @@ -1281,7 +1297,7 @@ packages: description: name: sensors_plus_platform_interface sha256: "58815d2f5e46c0c41c40fb39375d3f127306f7742efe3b891c0b1c87e2b5cd5d" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" shared_preferences: @@ -1289,31 +1305,31 @@ packages: description: name: shared_preferences sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.5.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713" - url: "https://pub.dev" + sha256: "07d552dbe8e71ed720e5205e760438ff4ecfb76ec3b32ea664350e2ca4b0c43b" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.4.15" + version: "2.4.16" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b" - url: "https://pub.dev" + sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.5" + version: "2.5.6" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.1" shared_preferences_platform_interface: @@ -1321,7 +1337,7 @@ packages: description: name: shared_preferences_platform_interface sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.1" shared_preferences_web: @@ -1329,7 +1345,7 @@ packages: description: name: shared_preferences_web sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.3" shared_preferences_windows: @@ -1337,7 +1353,7 @@ packages: description: name: shared_preferences_windows sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.1" shelf: @@ -1345,7 +1361,7 @@ packages: description: name: shelf sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.2" shelf_web_socket: @@ -1353,7 +1369,7 @@ packages: description: name: shelf_web_socket sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.0" sky_engine: @@ -1366,7 +1382,7 @@ packages: description: name: source_gen sha256: "9098ab86015c4f1d8af6486b547b11100e73b193e1899015033cb3e14ad20243" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.0.2" source_helper: @@ -1374,7 +1390,7 @@ packages: description: name: source_helper sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.8" source_span: @@ -1382,7 +1398,7 @@ packages: description: name: source_span sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.10.1" sp_util: @@ -1390,7 +1406,7 @@ packages: description: name: sp_util sha256: "9da43dce5de79c17a787d0626bf01538d63090ca32521200d22a232171c495dc" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.3" sqflite: @@ -1398,7 +1414,7 @@ packages: description: name: sqflite sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.2" sqflite_android: @@ -1406,7 +1422,7 @@ packages: description: name: sqflite_android sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.2+2" sqflite_common: @@ -1414,7 +1430,7 @@ packages: description: name: sqflite_common sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.5.6" sqflite_darwin: @@ -1422,7 +1438,7 @@ packages: description: name: sqflite_darwin sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.2" sqflite_platform_interface: @@ -1430,7 +1446,7 @@ packages: description: name: sqflite_platform_interface sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" stack_trace: @@ -1438,7 +1454,7 @@ packages: description: name: stack_trace sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.12.1" stream_channel: @@ -1446,7 +1462,7 @@ packages: description: name: stream_channel sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" stream_transform: @@ -1454,7 +1470,7 @@ packages: description: name: stream_transform sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" string_scanner: @@ -1462,7 +1478,7 @@ packages: description: name: string_scanner sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.1" synchronized: @@ -1470,7 +1486,7 @@ packages: description: name: synchronized sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.4.0" tdesign_flutter: @@ -1478,7 +1494,7 @@ packages: description: name: tdesign_flutter sha256: cf166a5fdbbfd9129305d2c2906633c8d0151bbb2d0a6fbcf901bdd76726a555 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.6" tdesign_flutter_adaptation: @@ -1486,7 +1502,7 @@ packages: description: name: tdesign_flutter_adaptation sha256: "707bbc52ec8b5872ea808500200f402007acf24c03a1cc823a3be2113c1d813a" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.32.0" term_glyph: @@ -1494,7 +1510,7 @@ packages: description: name: term_glyph sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.2" test_api: @@ -1502,7 +1518,7 @@ packages: description: name: test_api sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.7.6" typed_data: @@ -1510,7 +1526,7 @@ packages: description: name: typed_data sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" universal_io: @@ -1518,7 +1534,7 @@ packages: description: name: universal_io sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.1" uuid: @@ -1526,7 +1542,7 @@ packages: description: name: uuid sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.5.2" vector_math: @@ -1534,7 +1550,7 @@ packages: description: name: vector_math sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" video_player: @@ -1542,31 +1558,31 @@ packages: description: name: video_player sha256: "096bc28ce10d131be80dfb00c223024eb0fba301315a406728ab43dd99c45bdf" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.10.1" video_player_android: dependency: transitive description: name: video_player_android - sha256: cf768d02924b91e333e2bc1ff928528f57d686445874f383bafab12d0bdfc340 - url: "https://pub.dev" + sha256: "36913f94430b474c4a9033d59b7552b800e736a8521e7166e84895ddcedd0b03" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.8.17" + version: "2.8.19" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - sha256: "03fc6d07dba2499588d30887329b399c1fe2d68ce4b7fcff0db79f44a2603f69" - url: "https://pub.dev" + sha256: "6bced1739cf1f96f03058118adb8ac0dd6f96aa1a1a6e526424ab92fd2a6a77d" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.8.6" + version: "2.8.7" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface sha256: "57c5d73173f76d801129d0531c2774052c5a7c11ccb962f1830630decd9f24ec" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.6.0" video_player_web: @@ -1574,7 +1590,7 @@ packages: description: name: video_player_web sha256: "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" video_thumbnail: @@ -1582,7 +1598,7 @@ packages: description: name: video_thumbnail sha256: "181a0c205b353918954a881f53a3441476b9e301641688a581e0c13f00dc588b" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.5.6" visibility_detector: @@ -1590,7 +1606,7 @@ packages: description: name: visibility_detector sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.0+2" vm_service: @@ -1598,7 +1614,7 @@ packages: description: name: vm_service sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "15.0.2" wakelock_plus: @@ -1606,7 +1622,7 @@ packages: description: name: wakelock_plus sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" wakelock_plus_platform_interface: @@ -1614,7 +1630,7 @@ packages: description: name: wakelock_plus_platform_interface sha256: "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" watcher: @@ -1622,7 +1638,7 @@ packages: description: name: watcher sha256: "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.4" web: @@ -1630,7 +1646,7 @@ packages: description: name: web sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" web_socket: @@ -1638,7 +1654,7 @@ packages: description: name: web_socket sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.1" web_socket_channel: @@ -1646,7 +1662,7 @@ packages: description: name: web_socket_channel sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.3" wechat_assets_picker: @@ -1654,7 +1670,7 @@ packages: description: name: wechat_assets_picker sha256: c307e50394c1e6dfcd5c4701e84efb549fce71444fedcf2e671c50d809b3e2a1 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "9.8.0" wechat_camera_picker: @@ -1662,7 +1678,7 @@ packages: description: name: wechat_camera_picker sha256: "776ce32feda72d84b63425533a27d3b822bfb93cc063d2aef3cc6d788769f36b" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "4.4.0" wechat_picker_library: @@ -1670,7 +1686,7 @@ packages: description: name: wechat_picker_library sha256: "5cb61b9aa935b60da5b043f8446fbb9c5077419f20ccc4856bf444aec4f44bc1" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.7" win32: @@ -1678,7 +1694,7 @@ packages: description: name: win32 sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "5.15.0" xdg_directories: @@ -1686,7 +1702,7 @@ packages: description: name: xdg_directories sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" xml: @@ -1694,7 +1710,7 @@ packages: description: name: xml sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "6.6.1" xxh3: @@ -1702,7 +1718,7 @@ packages: description: name: xxh3 sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" yaml: @@ -1710,7 +1726,7 @@ packages: description: name: yaml sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.3" sdks: diff --git a/pubspec.yaml b/pubspec.yaml index 1a5d398..a0b33f7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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