Merge remote-tracking branch 'refs/remotes/origin/chen'

# Conflicts:
#	android/app/build/intermediates/assets/debug/flutter_assets/kernel_blob.bin
#	android/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
#	android/app/build/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
#	android/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
#	android/app/build/intermediates/dex/debug/mergeLibDexDebug/0/classes.dex
#	android/app/build/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
#	android/app/build/intermediates/flutter/debug/flutter_build.d
#	android/app/build/intermediates/flutter/debug/libs.jar
#	android/app/build/intermediates/flutter/release/arm64-v8a/app.so
#	android/app/build/intermediates/flutter/release/armeabi-v7a/app.so
#	android/app/build/intermediates/flutter/release/flutter_assets/NOTICES.Z
#	android/app/build/intermediates/flutter/release/flutter_assets/fonts/MaterialIcons-Regular.otf
#	android/app/build/intermediates/flutter/release/flutter_build.d
#	android/app/build/intermediates/flutter/release/libs.jar
#	android/app/build/intermediates/flutter/release/x86_64/app.so
#	android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	android/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	android/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	android/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
#	android/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	android/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	android/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin
#	android/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin
#	android/app/build/outputs/logs/manifest-merger-debug-report.txt
#	lib/view/user/user_view.dart
#	pubspec.lock

android/app/build/intermediates/flutter/debug/.last_build_id

@@ -1 +1 @@
-f649f7b73ed118947e70d0b9aa9e6a1f
+d1b13d2690838e4bbcb8a4bdf95ce8b4

android/app/build/intermediates/flutter/release/.last_build_id

@@ -1 +0,0 @@
-209cd9ce0343d40d302fafaf8ed690ff

android/app/build/intermediates/flutter/release/flutter_assets/FontManifest.json

@@ -1 +0,0 @@
-[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]}]

android/app/build/intermediates/flutter/release/flutter_assets/assets/img/pause.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1732959325948" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2134" width="256" height="256" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 1024C228.266667 1024 0 795.733333 0 512S228.266667 0 512 0s512 228.266667 512 512-228.266667 512-512 512z m0-42.666667c260.266667 0 469.333333-209.066667 469.333333-469.333333S772.266667 42.666667 512 42.666667 42.666667 251.733333 42.666667 512s209.066667 469.333333 469.333333 469.333333z m-106.666667-682.666666c12.8 0 21.333333 8.533333 21.333334 21.333333v384c0 12.8-8.533333 21.333333-21.333334 21.333333s-21.333333-8.533333-21.333333-21.333333V320c0-12.8 8.533333-21.333333 21.333333-21.333333z m213.333334 0c12.8 0 21.333333 8.533333 21.333333 21.333333v384c0 12.8-8.533333 21.333333-21.333333 21.333333s-21.333333-8.533333-21.333334-21.333333V320c0-12.8 8.533333-21.333333 21.333334-21.333333z" fill="#ffffff" fill-opacity=".9" p-id="2135"></path></svg>

android/app/build/intermediates/flutter/release/flutter_assets/assets/img/play.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1732959346135" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2584" width="256" height="256" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 0C230.4 0 0 230.4 0 512s230.4 512 512 512 512-230.4 512-512S793.6 0 512 0z m0 981.333333C253.866667 981.333333 42.666667 770.133333 42.666667 512S253.866667 42.666667 512 42.666667s469.333333 211.2 469.333333 469.333333-211.2 469.333333-469.333333 469.333333z" fill="#ffffff" p-id="2585"></path><path d="M672 441.6l-170.666667-113.066667c-57.6-38.4-106.666667-12.8-106.666666 57.6v256c0 70.4 46.933333 96 106.666666 57.6l170.666667-113.066666c57.6-42.666667 57.6-106.666667 0-145.066667z" fill="#ffffff" p-id="2586"></path></svg>