diff --git a/.gitignore b/.gitignore
index 29a3a50..864e346 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ migrate_working_dir/
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+# .vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 93944bf..6960768 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!-- New  permissions in Android 13 -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -34,6 +38,7 @@
 <!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
     <!--相机权限-->
     <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
 
     <application
         android:usesCleartextTraffic="true"
@@ -43,7 +48,7 @@
         android:enableOnBackInvokedCallback="true"
         >
         <activity
-            android:name=".MainActivity"
+            android:name="com.taihe.mh_app.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:screenOrientation="portrait"
             android:exported="true"
diff --git a/android/gradle.properties b/android/gradle.properties
index 1600540..1834b3a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -2,3 +2,7 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
 
+systemProp.http.proxyHost=pp.it.real.he-info.cn
+systemProp.http.proxyPort=7897
+systemProp.https.proxyHost=pp.it.real.he-info.cn
+systemProp.https.proxyPort=7897
\ No newline at end of file
diff --git a/android/key.properties b/android/key.properties
index b179b9a..b8aa9c7 100644
--- a/android/key.properties
+++ b/android/key.properties
@@ -1,4 +1,4 @@
-storePassword=taihe601
-keyPassword=taihe601
-keyAlias=testalias
+storePassword=mh1234
+keyPassword=mh1234
+keyAlias=Key
 storeFile=test.keystore
\ No newline at end of file
diff --git a/android/local.properties b/android/local.properties
index ebcdb0b..e85ddb3 100644
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
+sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk
+flutter.sdk=C:\\dev\\flutter
+=======
 sdk.dir=C:\\Users\\wyf\\AppData\\Local\\Android\\sdk
 flutter.sdk=D:\\flutter_res\\flutter
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
 flutter.buildMode=debug
 flutter.versionName=1.0.0
 flutter.versionCode=1
diff --git a/assets/img/icon/xiaoe.svg b/assets/img/icon/xiaoe.svg
deleted file mode 100644
index 49bf9f9..0000000
--- a/assets/img/icon/xiaoe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60.000244140625" viewBox="0 0 60 60.000244140625"><defs><radialGradient cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" id="master_svg0_0_27437" gradientTransform="translate(22.769785523414612 21.4565509557724) rotate(0) scale(34.40628468990326 34.40628468990326)"><stop offset="31.564244627952576%" stop-color="#004430" stop-opacity="1"/><stop offset="46.56067490577698%" stop-color="#00402D" stop-opacity="1"/><stop offset="61.42193078994751%" stop-color="#003424" stop-opacity="1"/><stop offset="76.23741030693054%" stop-color="#002016" stop-opacity="1"/><stop offset="90.94374179840088%" stop-color="#000403" stop-opacity="1"/><stop offset="93.01676154136658%" stop-color="#000000" stop-opacity="1"/></radialGradient><linearGradient x1="0.000009244539796782192" y1="0.49999353289604187" x2="1.0000025033950806" y2="0.49999353289604187" id="master_svg1_0_27439"><stop offset="0%" stop-color="#45D989" stop-opacity="1"/><stop offset="96.92737460136414%" stop-color="#00C1AA" stop-opacity="1"/></linearGradient></defs><g><g><rect x="0" y="0" width="60" height="60" rx="29.999969482421875" fill="url(#master_svg0_0_27437)" fill-opacity="1"/></g><g><path d="M41.61617066345215,13.10839842010498C34.88427066345215,8.48046842010498,24.81297066345215,10.844482420104981,18.18994066345215,18.61156842010498C17.86914066345215,18.98852842010498,17.55420066345215,19.37548842010498,17.21289066345215,19.82543842010498C17.21289066345215,19.82543842010498,17.137210663452148,19.925538420104978,17.137210663452148,19.925538420104978C16.99707066345215,20.11254842010498,16.860840663452148,20.305418420104978,16.727050663452147,20.49657842010498C16.727050663452147,20.49657842010498,16.553220663452148,20.74145842010498,16.553220663452148,20.74145842010498C13.474120663452148,25.21658842010498,11.954101663452148,30.37938842010498,12.270019763452149,35.27958842010498C12.593261663452148,40.26248842010498,14.769040663452149,44.38058842010498,18.399900663452147,46.87668842010498C18.399900663452147,46.87668842010498,18.483890663452147,46.93038842010498,18.483890663452147,46.93038842010498C20.14307066345215,48.13448842010498,22.075190663452148,48.86648842010498,24.19917066345215,49.10328842010498C24.89207066345215,49.20138842010498,25.59617066345215,49.25068842010498,26.309070663452147,49.25068842010498C27.43697066345215,49.25068842010498,28.584970663452147,49.12768842010498,29.74117066345215,48.88358842010498C33.20897066345215,48.15258842010498,36.585970663452144,46.38058842010498,39.50687066345215,43.75858842010498C40.98487066345215,42.43138842010498,42.314970663452144,40.91238842010498,43.461870663452146,39.24438842010498C49.864270663452146,29.93558842010498,49.03517066345215,18.21044842010498,41.61617066345215,13.10839842010498C41.61617066345215,13.10839842010498,41.61617066345215,13.10839842010498,41.61617066345215,13.10839842010498ZM39.55807066345215,25.56538842010498C37.163070663452146,31.69558842010498,27.01317066345215,34.643588420104976,23.635270663452147,35.467488420104985C22.842270663452148,33.93848842010498,22.459970663452147,32.14748842010498,22.49217066345215,30.25948842010498C24.41407066345215,29.99948842010498,32.86817066345215,28.53958842010498,33.54297066345215,22.90548842010498C33.68507066345215,21.71658842010498,33.41597066345215,20.70043842010498,32.76517066345215,19.966548420104978C32.12597066345215,19.24657842010498,31.15287066345215,18.85155842010498,30.02487066345215,18.85155842010498C29.210970663452148,18.85155842010498,28.24417066345215,19.08959842010498,27.25777066345215,19.58959842010498C25.297870663452148,20.56249842010498,23.92727066345215,22.48758842010498,23.92727066345215,22.48758842010498C23.88917066345215,22.540488420104978,23.84917066345215,22.59158842010498,23.81197066345215,22.645488420104982C20.789060663452148,26.98438842010498,20.22314066345215,32.09958842010498,21.94482066345215,35.83058842010498C22.60307066345215,37.25758842010498,23.584970663452147,38.487588420104984,24.909170663452148,39.38648842010498C24.932170663452148,39.402588420104976,24.95707066345215,39.415288420104986,24.980970663452148,39.43138842010498C26.01417066345215,40.17158842010498,27.232870663452147,40.63258842010498,28.598170663452148,40.78348842010498C29.57907066345215,40.919688420104976,30.59617066345215,40.894288420104985,31.620070663452147,40.73268842010498C31.799770663452147,40.704388420104976,31.980970663452148,40.680388420104975,32.16207066345215,40.642288420104975C33.468270663452145,40.37038842010498,34.77397066345215,39.859588420104984,36.02397066345215,39.14138842010498C36.89597066345215,38.63938842010498,37.74117066345215,38.03958842010498,38.53617066345215,37.33548842010498C38.69827066345215,37.191388420104985,38.84517066345215,37.02048842010498,39.00197066345215,36.86938842010498C39.04587066345215,36.83548842010498,39.08887066345215,36.807388420104985,39.13187066345215,36.77348842010498C39.13187066345215,36.77348842010498,39.10987066345215,37.34058842010498,39.10987066345215,37.34058842010498C39.10987066345215,37.34058842010498,38.88717066345215,43.06758842010498,38.88717066345215,43.06758842010498C36.05717066345215,45.60868842010498,32.79887066345215,47.29028842010498,29.549770663452147,47.97628842010498C27.783170663452147,48.34838842010498,26.01997066345215,48.42258842010498,24.32817066345215,48.18528842010498C22.32817066345215,47.96168842010498,20.541990663452147,47.27758842010498,19.02881066345215,46.17948842010498C18.99414066345215,46.15548842010498,18.95801066345215,46.13548842010498,18.92285066345215,46.11158842010498C11.915039663452148,41.291288420104976,11.194820663452148,30.168488420104982,17.315920663452147,21.26538842010498C17.37207066345215,21.18648842010498,17.42920066345215,21.110588420104982,17.48486066345215,21.031488420104978C17.61523066345215,20.84638842010498,17.746090663452147,20.660398420104983,17.87988066345215,20.48046842010498C17.916020663452148,20.43139842010498,17.95410066345215,20.384518420104982,17.991210663452147,20.33544842010498C18.28320066345215,19.94848842010498,18.58594066345215,19.57641842010498,18.89600066345215,19.212398420104982C19.89893066345215,18.06860842010498,21.039060663452148,17.03442842010498,22.34327066345215,16.17358842010498C25.17387066345215,14.30443842010498,28.107870663452147,13.316408420104981,30.827170663452147,13.316408420104981C33.207970663452144,13.316408420104981,35.35497066345215,14.07543842010498,37.01517066345215,15.43139842010498C37.50587066345215,15.83251842010498,37.960970663452144,16.28149842010498,38.35887066345215,16.78442842010498C38.48587066345215,16.94555842010498,38.621070663452144,17.098388420104982,38.73827066345215,17.26952842010498C40.37987066345215,19.67358842010498,40.67917066345215,22.697488420104982,39.55807066345215,25.56538842010498C39.55807066345215,25.56538842010498,39.55807066345215,25.56538842010498,39.55807066345215,25.56538842010498Z" fill="url(#master_svg1_0_27439)" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/img/icon/xiaoyi.svg b/assets/img/icon/xiaoyi.svg
index 1f4d468..66738d1 100644
--- a/assets/img/icon/xiaoyi.svg
+++ b/assets/img/icon/xiaoyi.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60.000244140625" viewBox="0 0 60 60.000244140625"><defs><radialGradient cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" id="master_svg0_0_29378" gradientTransform="translate(23.68282914161682 15.754256844520569) rotate(0) scale(38.13055157661438 38.13055157661438)"><stop offset="20.670391619205475%" stop-color="#84F5FF" stop-opacity="1"/><stop offset="100%" stop-color="#001236" stop-opacity="1"/></radialGradient></defs><g><g><rect x="0" y="0" width="60" height="60" rx="29.999969482421875" fill="url(#master_svg0_0_29378)" fill-opacity="1"/></g><g><g><path d="M27.98095921875,40.376676171875005C27.98095921875,40.376676171875005,27.98095921875,45.981676171875,27.98095921875,45.981676171875C27.98095921875,45.981676171875,23.89794921875,45.981676171875,23.89794921875,45.981676171875C23.89794921875,45.981676171875,23.89794921875,40.797576171875,23.89794921875,40.797576171875C23.89794921875,40.797576171875,31.01514921875,32.665576171875,31.01514921875,32.665576171875C31.79294921875,31.887476171875,32.06294921875,31.190476171874998,32.06294921875,30.189476171875C32.06294921875,30.189476171875,32.06294921875,19.215576171875,32.06294921875,19.215576171875C32.06294921875,19.215576171875,22.61425921875,19.215576171875,22.61425921875,19.215576171875C21.06396921875,19.215576171875,19.77294921875,20.472416171875,19.77294921875,22.022456171875C19.77294921875,22.022456171875,19.77294921875,32.997576171875,19.77294921875,32.997576171875C19.77294921875,33.423576171875,20.24316421875,33.675576171875,20.60986321875,33.332476171875C20.60986321875,33.332476171875,23.89013921875,29.612576171875,23.89013921875,29.612576171875C23.89013921875,29.612576171875,23.89013921875,23.109376171875,23.89013921875,23.109376171875C23.89013921875,23.109376171875,27.97118921875,23.109376171875,27.97118921875,23.109376171875C27.97118921875,23.109376171875,27.97118921875,29.274376171874998,27.97118921875,29.274376171874998C27.97118921875,29.274376171874998,20.61523421875,37.622576171875,20.61523421875,37.622576171875C20.12890621875,38.118376171875,19.72705081875,38.977276171875005,19.78613281875,39.926476171874995C19.78613281875,39.926476171874995,19.78613281875,47.027576171875,19.78613281875,47.027576171875C19.78613281875,48.763476171875,21.34325921875,49.875776171875,22.61425921875,49.875776171875C22.61425921875,49.875776171875,29.28222921875,49.875776171875,29.28222921875,49.875776171875C30.57324921875,49.875776171875,31.97604921875,48.779576171875,32.06884921875,47.049576171875C32.06884921875,47.049576171875,32.06884921875,42.703376171875,32.06884921875,42.703376171875C32.06884921875,42.703376171875,30.773949218749998,42.703376171875,30.773949218749998,42.703376171875C28.91698921875,42.703376171875,27.98095921875,42.260476171875,27.98095921875,40.376676171875005C27.98095921875,40.376676171875005,27.98095921875,40.376676171875005,27.98095921875,40.376676171875005Z" fill="#005EAC" fill-opacity="1"/></g><g><path d="M39.339890625,25.280551171875C39.640090625,25.620651171875,40.208990625,25.567351171875,40.226090625,24.891651171875C40.226090625,24.891651171875,40.226090625,14.569581171875,40.226090625,14.569581171875C40.226090625,13.714601171875,39.584990625,11.762451171875,37.103030625,11.762451171875C37.103030625,11.762451171875,30.710940625,11.762451171875,30.710940625,11.762451171875C29.183100625,11.762451171875,27.962890625,13.178471171875,27.962890625,14.608401171875C27.962890625,14.608401171875,27.962890625,19.206541171875,27.962890625,19.206541171875C27.962890625,19.206541171875,27.962890625,21.486571171875,27.962890625,21.486571171875C27.962890625,22.488551171875002,27.989257825,23.307351171875,28.614257625,24.233351171875C28.614257625,24.233351171875,36.139160625,32.814451171875,36.139160625,32.814451171875C36.139160625,32.814451171875,36.139160625,38.758551171875,36.139160625,38.758551171875C36.139160625,38.758551171875,32.068850624999996,38.800551171875,32.068850624999996,38.800551171875C32.068850624999996,38.800551171875,32.068850624999996,35.197551171875,32.068850624999996,35.197551171875C32.094240625,34.772451171875005,31.590820625,34.479451171875,31.225100625,34.855451171875C31.225100625,34.855451171875,27.980957025,38.542751171875,27.980957025,38.542751171875C27.980957025,38.542751171875,27.980957025,42.693651171875004,27.980957025,42.693651171875004C27.980957025,42.693651171875004,32.068850624999996,42.709751171875,32.068850624999996,42.709751171875C32.068850624999996,42.709751171875,37.437010625,42.709751171875,37.437010625,42.709751171875C38.914090625,42.701451171875,40.224090625,41.372351171874996,40.227090625,39.867451171875004C40.227090625,39.867451171875004,40.227090625,31.941451171875,40.227090625,31.941451171875C40.227090625,30.901651171875,39.896990625,30.187451171875,39.214890625,29.430451171875C39.214890625,29.430451171875,32.065920625000004,21.249511171875,32.065920625000004,21.249511171875C32.065920625000004,21.249511171875,32.065920625000004,15.656491171875,32.065920625000004,15.656491171875C32.065920625000004,15.656491171875,36.143070625,15.656491171875,36.143070625,15.656491171875C36.143070625,15.656491171875,36.143070625,21.638431171875,36.143070625,21.638431171875C36.143070625,21.638431171875,39.339890625,25.280551171875,39.339890625,25.280551171875C39.339890625,25.280551171875,39.339890625,25.280551171875,39.339890625,25.280551171875Z" fill="#DB3B7B" fill-opacity="1"/></g><g><path d="M27.98095703125,40.971434396972654C27.98095703125,40.971434396972654,27.98095703125,43.06567439697265,27.98095703125,43.06567439697265C27.98095703125,43.06567439697265,32.06884703125,43.06567439697265,32.06884703125,43.06567439697265C32.06884703125,43.06567439697265,32.06884703125,37.661376396972656,32.06884703125,37.661376396972656C32.11425703125,37.10839839697265,31.49023703125,36.91455039697266,31.19628703125,37.29638639697266C31.19628703125,37.29638639697266,27.98095703125,40.971434396972654,27.98095703125,40.971434396972654C27.98095703125,40.971434396972654,27.98095703125,40.971434396972654,27.98095703125,40.971434396972654Z" fill="#005EAC" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
+<<<<<<< HEAD
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60.000244140625" viewBox="0 0 60 60.000244140625"><defs><radialGradient cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" id="master_svg0_0_27437" gradientTransform="translate(22.769785523414612 21.4565509557724) rotate(0) scale(34.40628468990326 34.40628468990326)"><stop offset="31.564244627952576%" stop-color="#004430" stop-opacity="1"/><stop offset="46.56067490577698%" stop-color="#00402D" stop-opacity="1"/><stop offset="61.42193078994751%" stop-color="#003424" stop-opacity="1"/><stop offset="76.23741030693054%" stop-color="#002016" stop-opacity="1"/><stop offset="90.94374179840088%" stop-color="#000403" stop-opacity="1"/><stop offset="93.01676154136658%" stop-color="#000000" stop-opacity="1"/></radialGradient><linearGradient x1="0.000009244539796782192" y1="0.49999353289604187" x2="1.0000025033950806" y2="0.49999353289604187" id="master_svg1_0_27439"><stop offset="0%" stop-color="#45D989" stop-opacity="1"/><stop offset="96.92737460136414%" stop-color="#00C1AA" stop-opacity="1"/></linearGradient></defs><g><g><rect x="0" y="0" width="60" height="60" rx="29.999969482421875" fill="url(#master_svg0_0_27437)" fill-opacity="1"/></g><g><path d="M41.61617066345215,13.10839842010498C34.88427066345215,8.48046842010498,24.81297066345215,10.844482420104981,18.18994066345215,18.61156842010498C17.86914066345215,18.98852842010498,17.55420066345215,19.37548842010498,17.21289066345215,19.82543842010498C17.21289066345215,19.82543842010498,17.137210663452148,19.925538420104978,17.137210663452148,19.925538420104978C16.99707066345215,20.11254842010498,16.860840663452148,20.305418420104978,16.727050663452147,20.49657842010498C16.727050663452147,20.49657842010498,16.553220663452148,20.74145842010498,16.553220663452148,20.74145842010498C13.474120663452148,25.21658842010498,11.954101663452148,30.37938842010498,12.270019763452149,35.27958842010498C12.593261663452148,40.26248842010498,14.769040663452149,44.38058842010498,18.399900663452147,46.87668842010498C18.399900663452147,46.87668842010498,18.483890663452147,46.93038842010498,18.483890663452147,46.93038842010498C20.14307066345215,48.13448842010498,22.075190663452148,48.86648842010498,24.19917066345215,49.10328842010498C24.89207066345215,49.20138842010498,25.59617066345215,49.25068842010498,26.309070663452147,49.25068842010498C27.43697066345215,49.25068842010498,28.584970663452147,49.12768842010498,29.74117066345215,48.88358842010498C33.20897066345215,48.15258842010498,36.585970663452144,46.38058842010498,39.50687066345215,43.75858842010498C40.98487066345215,42.43138842010498,42.314970663452144,40.91238842010498,43.461870663452146,39.24438842010498C49.864270663452146,29.93558842010498,49.03517066345215,18.21044842010498,41.61617066345215,13.10839842010498C41.61617066345215,13.10839842010498,41.61617066345215,13.10839842010498,41.61617066345215,13.10839842010498ZM39.55807066345215,25.56538842010498C37.163070663452146,31.69558842010498,27.01317066345215,34.643588420104976,23.635270663452147,35.467488420104985C22.842270663452148,33.93848842010498,22.459970663452147,32.14748842010498,22.49217066345215,30.25948842010498C24.41407066345215,29.99948842010498,32.86817066345215,28.53958842010498,33.54297066345215,22.90548842010498C33.68507066345215,21.71658842010498,33.41597066345215,20.70043842010498,32.76517066345215,19.966548420104978C32.12597066345215,19.24657842010498,31.15287066345215,18.85155842010498,30.02487066345215,18.85155842010498C29.210970663452148,18.85155842010498,28.24417066345215,19.08959842010498,27.25777066345215,19.58959842010498C25.297870663452148,20.56249842010498,23.92727066345215,22.48758842010498,23.92727066345215,22.48758842010498C23.88917066345215,22.540488420104978,23.84917066345215,22.59158842010498,23.81197066345215,22.645488420104982C20.789060663452148,26.98438842010498,20.22314066345215,32.09958842010498,21.94482066345215,35.83058842010498C22.60307066345215,37.25758842010498,23.584970663452147,38.487588420104984,24.909170663452148,39.38648842010498C24.932170663452148,39.402588420104976,24.95707066345215,39.415288420104986,24.980970663452148,39.43138842010498C26.01417066345215,40.17158842010498,27.232870663452147,40.63258842010498,28.598170663452148,40.78348842010498C29.57907066345215,40.919688420104976,30.59617066345215,40.894288420104985,31.620070663452147,40.73268842010498C31.799770663452147,40.704388420104976,31.980970663452148,40.680388420104975,32.16207066345215,40.642288420104975C33.468270663452145,40.37038842010498,34.77397066345215,39.859588420104984,36.02397066345215,39.14138842010498C36.89597066345215,38.63938842010498,37.74117066345215,38.03958842010498,38.53617066345215,37.33548842010498C38.69827066345215,37.191388420104985,38.84517066345215,37.02048842010498,39.00197066345215,36.86938842010498C39.04587066345215,36.83548842010498,39.08887066345215,36.807388420104985,39.13187066345215,36.77348842010498C39.13187066345215,36.77348842010498,39.10987066345215,37.34058842010498,39.10987066345215,37.34058842010498C39.10987066345215,37.34058842010498,38.88717066345215,43.06758842010498,38.88717066345215,43.06758842010498C36.05717066345215,45.60868842010498,32.79887066345215,47.29028842010498,29.549770663452147,47.97628842010498C27.783170663452147,48.34838842010498,26.01997066345215,48.42258842010498,24.32817066345215,48.18528842010498C22.32817066345215,47.96168842010498,20.541990663452147,47.27758842010498,19.02881066345215,46.17948842010498C18.99414066345215,46.15548842010498,18.95801066345215,46.13548842010498,18.92285066345215,46.11158842010498C11.915039663452148,41.291288420104976,11.194820663452148,30.168488420104982,17.315920663452147,21.26538842010498C17.37207066345215,21.18648842010498,17.42920066345215,21.110588420104982,17.48486066345215,21.031488420104978C17.61523066345215,20.84638842010498,17.746090663452147,20.660398420104983,17.87988066345215,20.48046842010498C17.916020663452148,20.43139842010498,17.95410066345215,20.384518420104982,17.991210663452147,20.33544842010498C18.28320066345215,19.94848842010498,18.58594066345215,19.57641842010498,18.89600066345215,19.212398420104982C19.89893066345215,18.06860842010498,21.039060663452148,17.03442842010498,22.34327066345215,16.17358842010498C25.17387066345215,14.30443842010498,28.107870663452147,13.316408420104981,30.827170663452147,13.316408420104981C33.207970663452144,13.316408420104981,35.35497066345215,14.07543842010498,37.01517066345215,15.43139842010498C37.50587066345215,15.83251842010498,37.960970663452144,16.28149842010498,38.35887066345215,16.78442842010498C38.48587066345215,16.94555842010498,38.621070663452144,17.098388420104982,38.73827066345215,17.26952842010498C40.37987066345215,19.67358842010498,40.67917066345215,22.697488420104982,39.55807066345215,25.56538842010498C39.55807066345215,25.56538842010498,39.55807066345215,25.56538842010498,39.55807066345215,25.56538842010498Z" fill="url(#master_svg1_0_27439)" fill-opacity="1"/></g></g></svg>
+=======
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="60" height="60.000244140625" viewBox="0 0 60 60.000244140625"><defs><radialGradient cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" id="master_svg0_0_29378" gradientTransform="translate(23.68282914161682 15.754256844520569) rotate(0) scale(38.13055157661438 38.13055157661438)"><stop offset="20.670391619205475%" stop-color="#84F5FF" stop-opacity="1"/><stop offset="100%" stop-color="#001236" stop-opacity="1"/></radialGradient></defs><g><g><rect x="0" y="0" width="60" height="60" rx="29.999969482421875" fill="url(#master_svg0_0_29378)" fill-opacity="1"/></g><g><g><path d="M27.98095921875,40.376676171875005C27.98095921875,40.376676171875005,27.98095921875,45.981676171875,27.98095921875,45.981676171875C27.98095921875,45.981676171875,23.89794921875,45.981676171875,23.89794921875,45.981676171875C23.89794921875,45.981676171875,23.89794921875,40.797576171875,23.89794921875,40.797576171875C23.89794921875,40.797576171875,31.01514921875,32.665576171875,31.01514921875,32.665576171875C31.79294921875,31.887476171875,32.06294921875,31.190476171874998,32.06294921875,30.189476171875C32.06294921875,30.189476171875,32.06294921875,19.215576171875,32.06294921875,19.215576171875C32.06294921875,19.215576171875,22.61425921875,19.215576171875,22.61425921875,19.215576171875C21.06396921875,19.215576171875,19.77294921875,20.472416171875,19.77294921875,22.022456171875C19.77294921875,22.022456171875,19.77294921875,32.997576171875,19.77294921875,32.997576171875C19.77294921875,33.423576171875,20.24316421875,33.675576171875,20.60986321875,33.332476171875C20.60986321875,33.332476171875,23.89013921875,29.612576171875,23.89013921875,29.612576171875C23.89013921875,29.612576171875,23.89013921875,23.109376171875,23.89013921875,23.109376171875C23.89013921875,23.109376171875,27.97118921875,23.109376171875,27.97118921875,23.109376171875C27.97118921875,23.109376171875,27.97118921875,29.274376171874998,27.97118921875,29.274376171874998C27.97118921875,29.274376171874998,20.61523421875,37.622576171875,20.61523421875,37.622576171875C20.12890621875,38.118376171875,19.72705081875,38.977276171875005,19.78613281875,39.926476171874995C19.78613281875,39.926476171874995,19.78613281875,47.027576171875,19.78613281875,47.027576171875C19.78613281875,48.763476171875,21.34325921875,49.875776171875,22.61425921875,49.875776171875C22.61425921875,49.875776171875,29.28222921875,49.875776171875,29.28222921875,49.875776171875C30.57324921875,49.875776171875,31.97604921875,48.779576171875,32.06884921875,47.049576171875C32.06884921875,47.049576171875,32.06884921875,42.703376171875,32.06884921875,42.703376171875C32.06884921875,42.703376171875,30.773949218749998,42.703376171875,30.773949218749998,42.703376171875C28.91698921875,42.703376171875,27.98095921875,42.260476171875,27.98095921875,40.376676171875005C27.98095921875,40.376676171875005,27.98095921875,40.376676171875005,27.98095921875,40.376676171875005Z" fill="#005EAC" fill-opacity="1"/></g><g><path d="M39.339890625,25.280551171875C39.640090625,25.620651171875,40.208990625,25.567351171875,40.226090625,24.891651171875C40.226090625,24.891651171875,40.226090625,14.569581171875,40.226090625,14.569581171875C40.226090625,13.714601171875,39.584990625,11.762451171875,37.103030625,11.762451171875C37.103030625,11.762451171875,30.710940625,11.762451171875,30.710940625,11.762451171875C29.183100625,11.762451171875,27.962890625,13.178471171875,27.962890625,14.608401171875C27.962890625,14.608401171875,27.962890625,19.206541171875,27.962890625,19.206541171875C27.962890625,19.206541171875,27.962890625,21.486571171875,27.962890625,21.486571171875C27.962890625,22.488551171875002,27.989257825,23.307351171875,28.614257625,24.233351171875C28.614257625,24.233351171875,36.139160625,32.814451171875,36.139160625,32.814451171875C36.139160625,32.814451171875,36.139160625,38.758551171875,36.139160625,38.758551171875C36.139160625,38.758551171875,32.068850624999996,38.800551171875,32.068850624999996,38.800551171875C32.068850624999996,38.800551171875,32.068850624999996,35.197551171875,32.068850624999996,35.197551171875C32.094240625,34.772451171875005,31.590820625,34.479451171875,31.225100625,34.855451171875C31.225100625,34.855451171875,27.980957025,38.542751171875,27.980957025,38.542751171875C27.980957025,38.542751171875,27.980957025,42.693651171875004,27.980957025,42.693651171875004C27.980957025,42.693651171875004,32.068850624999996,42.709751171875,32.068850624999996,42.709751171875C32.068850624999996,42.709751171875,37.437010625,42.709751171875,37.437010625,42.709751171875C38.914090625,42.701451171875,40.224090625,41.372351171874996,40.227090625,39.867451171875004C40.227090625,39.867451171875004,40.227090625,31.941451171875,40.227090625,31.941451171875C40.227090625,30.901651171875,39.896990625,30.187451171875,39.214890625,29.430451171875C39.214890625,29.430451171875,32.065920625000004,21.249511171875,32.065920625000004,21.249511171875C32.065920625000004,21.249511171875,32.065920625000004,15.656491171875,32.065920625000004,15.656491171875C32.065920625000004,15.656491171875,36.143070625,15.656491171875,36.143070625,15.656491171875C36.143070625,15.656491171875,36.143070625,21.638431171875,36.143070625,21.638431171875C36.143070625,21.638431171875,39.339890625,25.280551171875,39.339890625,25.280551171875C39.339890625,25.280551171875,39.339890625,25.280551171875,39.339890625,25.280551171875Z" fill="#DB3B7B" fill-opacity="1"/></g><g><path d="M27.98095703125,40.971434396972654C27.98095703125,40.971434396972654,27.98095703125,43.06567439697265,27.98095703125,43.06567439697265C27.98095703125,43.06567439697265,32.06884703125,43.06567439697265,32.06884703125,43.06567439697265C32.06884703125,43.06567439697265,32.06884703125,37.661376396972656,32.06884703125,37.661376396972656C32.11425703125,37.10839839697265,31.49023703125,36.91455039697266,31.19628703125,37.29638639697266C31.19628703125,37.29638639697266,27.98095703125,40.971434396972654,27.98095703125,40.971434396972654C27.98095703125,40.971434396972654,27.98095703125,40.971434396972654,27.98095703125,40.971434396972654Z" fill="#005EAC" fill-opacity="1"/></g></g></g></svg>
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
diff --git a/lib/controller/mh_controller/address_controller.dart b/lib/controller/mh_controller/address_controller.dart
index 8805d68..cf48d39 100644
--- a/lib/controller/mh_controller/address_controller.dart
+++ b/lib/controller/mh_controller/address_controller.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_city_picker/model/address.dart';
 import 'package:flutterflow_ui/flutterflow_ui.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:lpinyin/lpinyin.dart';
 import 'package:vbvs_app/common/color/ServiceConstant.dart';
 import 'package:vbvs_app/common/util/MyUtils.dart';
 import 'package:vbvs_app/common/util/requestWithLog.dart';
@@ -209,11 +210,11 @@ class AddressController extends GetControllerEx<AddressModel> {
 
 // 工具：中文首字母转大写英文（你也可以用更专业的拼音库）
   String _getLetter(String name) {
-    return name;
-    // if (name.isEmpty) return "#";
-    // String pinyin = PinyinHelper.getPinyinE(name,
-    //     separator: '', defPinyin: '', format: PinyinFormat.WITHOUT_TONE);
-    // if (pinyin.isEmpty) return "#";
-    // return pinyin[0].toUpperCase();
+    // return name;
+    if (name.isEmpty) return "#";
+    String pinyin = PinyinHelper.getPinyinE(name,
+        separator: '', defPinyin: '', format: PinyinFormat.WITHOUT_TONE);
+    if (pinyin.isEmpty) return "#";
+    return pinyin[0].toUpperCase();
   }
 }
diff --git a/lib/controller/weather/weather_controller.dart b/lib/controller/weather/weather_controller.dart
index 4ab04e5..d3109ab 100644
--- a/lib/controller/weather/weather_controller.dart
+++ b/lib/controller/weather/weather_controller.dart
@@ -78,9 +78,9 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
       if (languageController.selectLanguage != null) {
         language = languageController.selectLanguage.value!.language_code;
       }
-      List<Placemark> placemarks = await placemarkFromCoordinates(
-          position.latitude, position.longitude,
-          localeIdentifier: language);
+      List<Placemark> placemarks = [];
+      // placemarks = await placemarkFromCoordinates(position.latitude, position.longitude,
+      //     localeIdentifier: language);
 
       if (placemarks.isNotEmpty) {
         model.cityName = placemarks[0].locality ?? "未知数据".tr;
@@ -131,9 +131,9 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
     if (languageController.selectLanguage != null) {
       language = languageController.selectLanguage.value!.language_code;
     }
-    List<Placemark> placemarks = await placemarkFromCoordinates(
-        model.latitude!, model.longitude!,
-        localeIdentifier: language);
+    List<Placemark> placemarks = [];
+    // placemarks = await placemarkFromCoordinates(model.latitude!, model.longitude!,
+    //     localeIdentifier: language);
 
     if (placemarks.isNotEmpty) {
       model.cityName = placemarks[0].locality ?? "未知数据".tr;
diff --git a/lib/pages/device/BodyDeviceWidget.dart b/lib/pages/device/BodyDeviceWidget.dart
index f21d94a..dde45a0 100644
--- a/lib/pages/device/BodyDeviceWidget.dart
+++ b/lib/pages/device/BodyDeviceWidget.dart
@@ -543,8 +543,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
                                                   errorBorder:
                                                       OutlineInputBorder(
                                                     borderSide: BorderSide(
-                                                      color:
-                                                          Colors.red,
+                                                      color: Colors.red,
                                                       width: 1.rpx,
                                                     ),
                                                     borderRadius:
@@ -554,8 +553,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
                                                   focusedErrorBorder:
                                                       OutlineInputBorder(
                                                     borderSide: BorderSide(
-                                                      color:
-                                                          Colors.red,
+                                                      color: Colors.red,
                                                       width: 1.rpx,
                                                     ),
                                                     borderRadius:
@@ -563,8 +561,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
                                                             8.rpx),
                                                   ),
                                                   filled: false,
-                                                  fillColor:
-                                                      Colors.white,
+                                                  fillColor: Colors.white,
                                                 ),
                                                 style: TextStyle(
                                                   fontFamily: 'Inter',
diff --git a/lib/pages/mh_page/BackMovement.dart b/lib/pages/mh_page/BackMovement.dart
index 1c6432f..ef27e30 100644
--- a/lib/pages/mh_page/BackMovement.dart
+++ b/lib/pages/mh_page/BackMovement.dart
@@ -49,7 +49,7 @@ class _BackMovementPageState extends State<BackMovementPage> {
                     ),
                     // 左侧图标
                     Positioned(
-                      left: 20.rpx,
+                      left: 0.rpx,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/HomeDeviceType.dart b/lib/pages/mh_page/HomeDeviceType.dart
index 0164214..808458b 100644
--- a/lib/pages/mh_page/HomeDeviceType.dart
+++ b/lib/pages/mh_page/HomeDeviceType.dart
@@ -58,7 +58,7 @@ class _HomeDeviceTypeState extends State<HomeDeviceType> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtom,
                       ),
                     ],
diff --git a/lib/pages/mh_page/ShareDeviceDetailWidget.dart b/lib/pages/mh_page/ShareDeviceDetailWidget.dart
index 750d55b..86280e0 100644
--- a/lib/pages/mh_page/ShareDeviceDetailWidget.dart
+++ b/lib/pages/mh_page/ShareDeviceDetailWidget.dart
@@ -54,7 +54,7 @@ class ShareDeviceDetailWidget extends GetView {
                 ),
                 // 左侧图标
                 Positioned(
-                  left: 20.rpx,
+                  left: 0.rpx,
                   child: returnIconButtomNew,
                 ),
               ],
diff --git a/lib/pages/mh_page/about_us.dart b/lib/pages/mh_page/about_us.dart
index 643b37a..9b52795 100644
--- a/lib/pages/mh_page/about_us.dart
+++ b/lib/pages/mh_page/about_us.dart
@@ -67,7 +67,7 @@ class _MhAboutUsPageState extends State<MhAboutUsPage> {
 
                     /// 左边返回按钮
                     Positioned(
-                      left: 20,
+                      left: 0,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/address_list_page.dart b/lib/pages/mh_page/address_list_page.dart
index 0c07ab9..a6a3c35 100644
--- a/lib/pages/mh_page/address_list_page.dart
+++ b/lib/pages/mh_page/address_list_page.dart
@@ -56,7 +56,7 @@ class AddressListPage extends GetView<AddressListController> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/apply_repair_page.dart b/lib/pages/mh_page/apply_repair_page.dart
index 7cbe9cf..049c208 100644
--- a/lib/pages/mh_page/apply_repair_page.dart
+++ b/lib/pages/mh_page/apply_repair_page.dart
@@ -79,7 +79,7 @@ class ApplyRepairPage extends GetView<ApplyRepairController> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/bluetooth.dart b/lib/pages/mh_page/bluetooth.dart
index 14a223e..e22fd13 100644
--- a/lib/pages/mh_page/bluetooth.dart
+++ b/lib/pages/mh_page/bluetooth.dart
@@ -11,13 +11,23 @@ import 'package:vbvs_app/model/api_response.dart';
 import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
 import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart';
 
-class BluetoothPage extends GetView {
-  Map data;
-  BluetoothPage({required this.data});
+class BluetoothPage extends StatefulWidget {
+  final Map data;
+  BluetoothPage({Key? key, required this.data});
+  @override
+  _BluetoothPageState createState() => _BluetoothPageState();
+}
+
+class _BluetoothPageState extends State<BluetoothPage> {
+  late RxMap<String, dynamic> obsData;
+  @override
+  void initState() {
+    super.initState();
+    obsData = Map<String, dynamic>.from(widget.data).obs; // 复制成 obs
+  }
 
   BoxConstraints? bodysize;
   DeviceListController deviceListController = Get.find();
-
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(builder: (context, cc) {
@@ -55,7 +65,7 @@ class BluetoothPage extends GetView {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
@@ -77,7 +87,7 @@ class BluetoothPage extends GetView {
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 children: [
                                   Text(
-                                    data['name']?.toString() ?? '未命名',
+                                    obsData['name']?.toString() ?? '未命名',
                                     style: TextStyle(
                                       color: Colors.white,
                                       fontSize: 40.rpx,
@@ -88,9 +98,15 @@ class BluetoothPage extends GetView {
                                       backgroundColor: Colors.transparent,
                                       highlightColor: const Color(0xFF055466),
                                       padding: EdgeInsets.only(left: 0),
-                                      onTap: () {
-                                        Get.toNamed("/editBedPage",
-                                            arguments: data);
+                                      onTap: () async {
+                                        var x = await Get.toNamed(
+                                            "/editBedPage",
+                                            arguments: obsData);
+                                        if (x != null) {
+                                          setState(() {
+                                            obsData.addAll(x); // 值更新后主动刷新页面
+                                          });
+                                        }
                                       },
                                       child: Container(
                                           width: 42.rpx,
@@ -103,7 +119,7 @@ class BluetoothPage extends GetView {
                               ),
 
                               const SizedBox(height: 4),
-                              Text(data['mac']?.toString() ?? '未命名',
+                              Text(obsData['mac']?.toString() ?? '未命名',
                                   style: TextStyle(
                                       color: Colors.white70, fontSize: 26.rpx)),
 
@@ -112,7 +128,7 @@ class BluetoothPage extends GetView {
                               // 蓝牙连接状态
                               Column(
                                 children: [
-                                  data['blueToothStatus'] == 1
+                                  obsData['blueToothStatus'] == 1
                                       ? SvgPicture.asset(
                                           'assets/img/icon/blue_fail.svg',
                                           width: 68.rpx,
@@ -126,11 +142,11 @@ class BluetoothPage extends GetView {
                                   SizedBox(height: 4),
                                   //下面文字和颜色也根据上面变化
                                   Text(
-                                      data['blueToothStatus'] == 1
+                                      obsData['blueToothStatus'] == 1
                                           ? '未连接'
                                           : '已连接',
                                       style: TextStyle(
-                                          color: data['blueToothStatus'] == 1
+                                          color: obsData['blueToothStatus'] == 1
                                               ? Color(0xFFFF7159)
                                               : Color(0xFF6BFDAC),
                                           fontSize: 26.rpx)),
@@ -148,13 +164,13 @@ class BluetoothPage extends GetView {
                               children: [
                                 _buildMenuButton(
                                     context, '详情', "/devicePeopleInfo",
-                                    arguments: data),
+                                    arguments: obsData),
                                 _buildMenuButton(
                                     context, '人员资料', "/peopleInfoPage",
-                                    arguments: data),
+                                    arguments: obsData,),
                                 _buildMenuButton(
                                     context, '房间选择', "/roomPickerPage",
-                                    arguments: data),
+                                    arguments: obsData),
                                 _buildMenuButton(context, '设备校准', ""),
                                 _buildMenuButton(context, '体征传感器', ""),
                                 _buildMenuButton(context, 'WIFI配置', ""),
@@ -162,20 +178,20 @@ class BluetoothPage extends GetView {
                                     context, '睡眠习惯', "/sleepHabitPage"),
                                 _buildMenuButton(
                                     context, '分享设备', "/deviceSharePage",
-                                    arguments: data),
+                                    arguments: obsData),
                                 _buildMenuButton(
                                   context,
-                                  data['bind_type'] == 1 ? '解绑' : '删除',
+                                  obsData['bind_type'] == 1 ? '解绑' : '删除',
                                   "",
                                   onTap: () {
-                                    if (data['bind_type'] == 1) {
+                                    if (obsData['bind_type'] == 1) {
                                       // 解绑弹窗
                                       showUnbindConfirmDialog(
                                         context: context,
                                         title: "是否进行解绑?",
                                         onConfirm: () async {
                                           await deviceListController
-                                              .unbindDevice(data);
+                                              .unbindDevice(obsData);
                                           await deviceListController
                                               .getDeviceList();
                                           try {
@@ -195,7 +211,7 @@ class BluetoothPage extends GetView {
                                           // 点击取消后的逻辑
                                         },
                                       );
-                                    } else if (data['bind_type'] == 2) {
+                                    } else if (obsData['bind_type'] == 2) {
                                       // 删除弹窗
                                       showDeleteDeviceConfirmDialog(
                                         context: context,
@@ -203,7 +219,7 @@ class BluetoothPage extends GetView {
                                         onConfirm: () async {
                                           await deviceListController
                                               .unbindDevice(
-                                            data,
+                                            obsData,
                                           );
                                           await deviceListController
                                               .getDeviceList();
diff --git a/lib/pages/mh_page/book_info_page.dart b/lib/pages/mh_page/book_info_page.dart
index 2883737..4f1eabb 100644
--- a/lib/pages/mh_page/book_info_page.dart
+++ b/lib/pages/mh_page/book_info_page.dart
@@ -63,7 +63,7 @@ class BookInfoPage extends GetView<BookInfoController> {
                   ),
                   // 左侧图标
                   Positioned(
-                    left: 20.rpx,
+                    left: 0.rpx,
                     child: returnIconButtomNew,
                   ),
                 ],
diff --git a/lib/pages/mh_page/book_success_page.dart b/lib/pages/mh_page/book_success_page.dart
index be7d55b..df5c257 100644
--- a/lib/pages/mh_page/book_success_page.dart
+++ b/lib/pages/mh_page/book_success_page.dart
@@ -62,7 +62,7 @@ class BookSuccessPage extends GetView {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/delete_account.dart b/lib/pages/mh_page/delete_account.dart
index b5b9746..146bfac 100644
--- a/lib/pages/mh_page/delete_account.dart
+++ b/lib/pages/mh_page/delete_account.dart
@@ -49,7 +49,7 @@ class DeletedAccountPage extends GetView {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/device_list.dart b/lib/pages/mh_page/device_list.dart
index f200b5c..973be21 100644
--- a/lib/pages/mh_page/device_list.dart
+++ b/lib/pages/mh_page/device_list.dart
@@ -70,7 +70,7 @@ class _DeviceListPageState extends State<DeviceListPage> {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
diff --git a/lib/pages/mh_page/device_people_info.dart b/lib/pages/mh_page/device_people_info.dart
index 605b8e4..196a0a3 100644
--- a/lib/pages/mh_page/device_people_info.dart
+++ b/lib/pages/mh_page/device_people_info.dart
@@ -74,7 +74,7 @@ class DevicePeopleInfo extends GetView<PeopleInfoController> {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
diff --git a/lib/pages/mh_page/device_share_page.dart b/lib/pages/mh_page/device_share_page.dart
index e95a951..7b98052 100644
--- a/lib/pages/mh_page/device_share_page.dart
+++ b/lib/pages/mh_page/device_share_page.dart
@@ -60,7 +60,7 @@ class ShareDeviceWidget extends GetView<MHDeviceShareController> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/edit_address_page.dart b/lib/pages/mh_page/edit_address_page.dart
index 09a6e24..b891fbf 100644
--- a/lib/pages/mh_page/edit_address_page.dart
+++ b/lib/pages/mh_page/edit_address_page.dart
@@ -80,7 +80,7 @@ class EditAddressPage extends GetView<AddressController>
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
diff --git a/lib/pages/mh_page/edit_bed.dart b/lib/pages/mh_page/edit_bed.dart
index 1b8a36f..622d1c0 100644
--- a/lib/pages/mh_page/edit_bed.dart
+++ b/lib/pages/mh_page/edit_bed.dart
@@ -75,7 +75,7 @@ class _EditBedPageState extends State<EditBedPage> {
                     ),
                     // 左侧图标
                     Positioned(
-                      left: 20.rpx,
+                      left: 0.rpx,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/experience_store_page.dart b/lib/pages/mh_page/experience_store_page.dart
index a3bb28c..d9068be 100644
--- a/lib/pages/mh_page/experience_store_page.dart
+++ b/lib/pages/mh_page/experience_store_page.dart
@@ -95,7 +95,7 @@ class _ExperienceStorePageState extends State<ExperienceStorePage> {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                         Positioned(
diff --git a/lib/pages/mh_page/help/article.dart b/lib/pages/mh_page/help/article.dart
index 66e6bd6..1195661 100644
--- a/lib/pages/mh_page/help/article.dart
+++ b/lib/pages/mh_page/help/article.dart
@@ -50,7 +50,7 @@ class _HelpArticleState extends State<HelpArticle> {
                     ),
                     // 左侧图标
                     Positioned(
-                      left: 20.rpx,
+                      left: 0.rpx,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart
index 681bbe9..58ec9ca 100644
--- a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart
+++ b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart
@@ -37,11 +37,13 @@ class _MhtSleepReportPageState extends State<MhtSleepReportPage> {
   Widget build(BuildContext context) {
     deviceController.getDeviceList(group: 'room').then((apiResponse) {
       if (apiResponse.code != HttpStatusCodes.ok) {
-        TopSlideNotification.show(
-          Get.context!,
-          text: apiResponse.msg!,
-          textColor: themeController.currentColor.sc9,
-        );
+        if (context.mounted) {
+          TopSlideNotification.show(
+            context,
+            text: apiResponse.msg!,
+            textColor: themeController.currentColor.sc9,
+          );
+        }
       } else {
         //请求睡眠报告
         // deviceController.getSleepReport();
diff --git a/lib/pages/mh_page/homepage/new_Home_page.dart b/lib/pages/mh_page/homepage/new_Home_page.dart
index b601296..c72abe3 100644
--- a/lib/pages/mh_page/homepage/new_Home_page.dart
+++ b/lib/pages/mh_page/homepage/new_Home_page.dart
@@ -106,7 +106,7 @@ class _NewHomePageState extends State<NewHomePage> {
     deviceController.getDeviceList(group: 'room').then((apiResponse) {
       if (apiResponse.code != HttpStatusCodes.ok) {
         TopSlideNotification.show(
-          Get.context!,
+          context,
           text: apiResponse.msg!,
           textColor: themeController.currentColor.sc9,
         );
diff --git a/lib/pages/mh_page/issue_list_page.dart b/lib/pages/mh_page/issue_list_page.dart
index fd5278c..22fd649 100644
--- a/lib/pages/mh_page/issue_list_page.dart
+++ b/lib/pages/mh_page/issue_list_page.dart
@@ -64,7 +64,7 @@ class IssueListPage extends GetView<IssueListController> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/message/messageDetail.dart b/lib/pages/mh_page/message/messageDetail.dart
index f35b5a7..01fb5b4 100644
--- a/lib/pages/mh_page/message/messageDetail.dart
+++ b/lib/pages/mh_page/message/messageDetail.dart
@@ -60,7 +60,7 @@ class _MessageDetailPageState extends State<MessageDetailPage> {
                           ),
                           // 左侧图标
                           Positioned(
-                            left: 20.rpx,
+                            left: 0.rpx,
                             child: returnIconButtomNew,
                           ),
                         ],
diff --git a/lib/pages/mh_page/message_page.dart b/lib/pages/mh_page/message_page.dart
index 9513cfa..36b69b8 100644
--- a/lib/pages/mh_page/message_page.dart
+++ b/lib/pages/mh_page/message_page.dart
@@ -175,7 +175,7 @@ class _MessagePageState extends State<MessagePage> {
                     ),
                     // 左侧图标
                     Positioned(
-                      left: 20.rpx,
+                      left: 0.rpx,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/my_experience_page.dart b/lib/pages/mh_page/my_experience_page.dart
index 2e52625..9674f11 100644
--- a/lib/pages/mh_page/my_experience_page.dart
+++ b/lib/pages/mh_page/my_experience_page.dart
@@ -88,7 +88,7 @@ class _MyExperiencePageState extends State<MyExperiencePage> {
                     ),
                     // 左侧图标
                     Positioned(
-                      left: 20.rpx,
+                      left: 0.rpx,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/new_settingPage.dart b/lib/pages/mh_page/new_settingPage.dart
index f872789..fea8db7 100644
--- a/lib/pages/mh_page/new_settingPage.dart
+++ b/lib/pages/mh_page/new_settingPage.dart
@@ -63,7 +63,7 @@ class _SettingPageState extends State<SettingPage> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/people_info.dart b/lib/pages/mh_page/people_info.dart
index a2e5946..17969a4 100644
--- a/lib/pages/mh_page/people_info.dart
+++ b/lib/pages/mh_page/people_info.dart
@@ -69,7 +69,7 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                       Positioned(
diff --git a/lib/pages/mh_page/privacy_policy.dart b/lib/pages/mh_page/privacy_policy.dart
index e549f3b..1e859d1 100644
--- a/lib/pages/mh_page/privacy_policy.dart
+++ b/lib/pages/mh_page/privacy_policy.dart
@@ -74,7 +74,7 @@ class _PrivacyPolicyPageState extends State<PrivacyPolicyPage> {
 
                     /// 左边返回按钮
                     Positioned(
-                      left: 20,
+                      left: 0,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/repair_history_page.dart b/lib/pages/mh_page/repair_history_page.dart
index edada1c..211cd9e 100644
--- a/lib/pages/mh_page/repair_history_page.dart
+++ b/lib/pages/mh_page/repair_history_page.dart
@@ -106,7 +106,7 @@ class RepairHistoryListPage extends GetView<RepairInfoController> {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
diff --git a/lib/pages/mh_page/repair_list.dart b/lib/pages/mh_page/repair_list.dart
index c7a621a..81eb002 100644
--- a/lib/pages/mh_page/repair_list.dart
+++ b/lib/pages/mh_page/repair_list.dart
@@ -76,7 +76,7 @@ class DeviceRepairPage extends GetView<RepairListController> {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
diff --git a/lib/pages/mh_page/room_picker.dart b/lib/pages/mh_page/room_picker.dart
index 1165f08..4853cd7 100644
--- a/lib/pages/mh_page/room_picker.dart
+++ b/lib/pages/mh_page/room_picker.dart
@@ -82,7 +82,7 @@ class _RoomPickerPageState extends State<RoomPickerPage> {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
@@ -189,7 +189,7 @@ class _RoomPickerPageState extends State<RoomPickerPage> {
                                       "roomId": rooms[selectedIndex]['_id'],
                                     },
                                     onSuccess: (res) {
-                                      Get.back();
+                                  
                                       TopSlideNotification.show(context,
                                           text: "更新成功".tr,
                                           textColor: Color(0XFF00C1AA));
@@ -202,7 +202,7 @@ class _RoomPickerPageState extends State<RoomPickerPage> {
                                       } catch (e) {
                                         ef.log("[h5]通知列表更新错误：$e");
                                       }
-                                      Get.toNamed('bluetoothPage');
+                                  Get.back(result:editedData);
                                     },
                                     onFailure: (res) {
                                       TopSlideNotification.show(context,
diff --git a/lib/pages/mh_page/score_page.dart b/lib/pages/mh_page/score_page.dart
index 3b46bd4..0299a3d 100644
--- a/lib/pages/mh_page/score_page.dart
+++ b/lib/pages/mh_page/score_page.dart
@@ -51,7 +51,7 @@ class ScorePage extends GetView<mh.ScoreController> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/sleep_habit.dart b/lib/pages/mh_page/sleep_habit.dart
index c4f5c45..a4c3d3b 100644
--- a/lib/pages/mh_page/sleep_habit.dart
+++ b/lib/pages/mh_page/sleep_habit.dart
@@ -49,7 +49,7 @@ class _SleepHabitPageState extends State<SleepHabitPage> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/smys.dart b/lib/pages/mh_page/smys.dart
index 380f780..7369952 100644
--- a/lib/pages/mh_page/smys.dart
+++ b/lib/pages/mh_page/smys.dart
@@ -75,7 +75,7 @@ class Smys extends GetView<SleepingHabitController> {
                       ),
                       // 左侧图标
                       Positioned(
-                        left: 20.rpx,
+                        left: 0.rpx,
                         child: returnIconButtomNew,
                       ),
                     ],
diff --git a/lib/pages/mh_page/test/WebviewTestModel.dart b/lib/pages/mh_page/test/WebviewTestModel.dart
index 5a29b91..7646d81 100644
--- a/lib/pages/mh_page/test/WebviewTestModel.dart
+++ b/lib/pages/mh_page/test/WebviewTestModel.dart
@@ -61,6 +61,10 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
           return true;
         });
         bridge.sdk.selectDevice((args) async {
+<<<<<<< HEAD
+          ef.log('selectDevice: $args');
+          selectDevice = args[0];
+=======
           try {
             ef.log('selectDevice: $args');
             selectDevice = args[0];
@@ -78,6 +82,7 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
 
           //查询人员信息
 
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
           return true;
         });
         bridge.sdk.updateBlueToothStatus((args) async {
diff --git a/lib/pages/mh_page/user/page/edit_userinfo_page.dart b/lib/pages/mh_page/user/page/edit_userinfo_page.dart
index 7a1cc12..a0a64ce 100644
--- a/lib/pages/mh_page/user/page/edit_userinfo_page.dart
+++ b/lib/pages/mh_page/user/page/edit_userinfo_page.dart
@@ -82,7 +82,7 @@ class _UpdateUserPageState extends State<EditUserPage> {
                       ),
                     ),
                     Positioned(
-                      left: 20.rpx,
+                      left: 0.rpx,
                       child: returnIconButtomNew,
                     ),
                     Positioned(
diff --git a/lib/pages/mh_page/user/page/find_password_page.dart b/lib/pages/mh_page/user/page/find_password_page.dart
index 3642c71..4c052fb 100644
--- a/lib/pages/mh_page/user/page/find_password_page.dart
+++ b/lib/pages/mh_page/user/page/find_password_page.dart
@@ -70,7 +70,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
                         ),
                         // 左侧图标
                         Positioned(
-                          left: 20.rpx,
+                          left: 0.rpx,
                           child: returnIconButtomNew,
                         ),
                       ],
diff --git a/lib/pages/mh_page/user/page/register_page.dart b/lib/pages/mh_page/user/page/register_page.dart
index 507dfb2..d14dd19 100644
--- a/lib/pages/mh_page/user/page/register_page.dart
+++ b/lib/pages/mh_page/user/page/register_page.dart
@@ -56,7 +56,7 @@ class RegisterPage extends GetView<MHTRegisterController> {
                       ),
                     ),
                     Positioned(
-                      left: 20.rpx,
+                      left: 0.rpx,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/lib/pages/mh_page/user_agreement_page.dart b/lib/pages/mh_page/user_agreement_page.dart
index 99b9bba..5a91f46 100644
--- a/lib/pages/mh_page/user_agreement_page.dart
+++ b/lib/pages/mh_page/user_agreement_page.dart
@@ -78,7 +78,7 @@ class _UserAgreementPageState extends State<UserAgreementPage> {
 
                     /// 左边返回按钮
                     Positioned(
-                      left: 20,
+                      left: 0,
                       child: returnIconButtomNew,
                     ),
                   ],
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index 4695b6b..cf6d642 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -7,21 +7,13 @@
 #include "generated_plugin_registrant.h"
 
 #include <flutter_localization/flutter_localization_plugin.h>
-#include <gtk/gtk_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
-#include <window_to_front/window_to_front_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) flutter_localization_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterLocalizationPlugin");
   flutter_localization_plugin_register_with_registrar(flutter_localization_registrar);
-  g_autoptr(FlPluginRegistrar) gtk_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
-  gtk_plugin_register_with_registrar(gtk_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
-  g_autoptr(FlPluginRegistrar) window_to_front_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "WindowToFrontPlugin");
-  window_to_front_plugin_register_with_registrar(window_to_front_registrar);
 }
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 50b4fcf..2ceb801 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -4,9 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   flutter_localization
-  gtk
   url_launcher_linux
-  window_to_front
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index b292bf3..fe36b1d 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,14 +5,11 @@
 import FlutterMacOS
 import Foundation
 
-import app_links
 import connectivity_plus
-import device_info_plus
 import file_picker
 import flutter_blue_plus
 import flutter_inappwebview_macos
 import flutter_localization
-import flutter_web_auth_2
 import geolocator_apple
 import google_sign_in_ios
 import mobile_scanner
@@ -25,17 +22,13 @@ import url_launcher_macos
 import video_player_avfoundation
 import wakelock_plus
 import webview_flutter_wkwebview
-import window_to_front
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
-  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FlutterBluePlusPlugin.register(with: registry.registrar(forPlugin: "FlutterBluePlusPlugin"))
   InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
   FlutterLocalizationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalizationPlugin"))
-  FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin"))
   GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
   FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin"))
   MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
@@ -48,5 +41,4 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
   WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
-  WindowToFrontPlugin.register(with: registry.registrar(forPlugin: "WindowToFrontPlugin"))
 }
diff --git a/pubspec.lock b/pubspec.lock
index a26299e..671f5ea 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -14,15 +14,15 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77"
+      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "73.0.0"
+    version: "76.0.0"
   _macros:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.2"
+    version: "0.3.3"
   adaptive_number:
     dependency: transitive
     description:
@@ -51,10 +51,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a"
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.8.0"
+    version: "6.11.0"
   apivideo_live_stream:
     dependency: transitive
     description:
@@ -83,10 +83,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
   auto_size_text:
     dependency: transitive
     description:
@@ -131,10 +131,10 @@ packages:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   bson:
     dependency: transitive
     description:
@@ -251,10 +251,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   charcode:
     dependency: transitive
     description:
@@ -283,10 +283,10 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   code_builder:
     dependency: transitive
     description:
@@ -444,7 +444,11 @@ packages:
     description:
       path: "."
       ref: main
+<<<<<<< HEAD
+      resolved-ref: "840bcea66ee9222d9698a58f12a06107f337b59f"
+=======
       resolved-ref: f307495aac440031d119a728beaccf5d33003932
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
       url: "https://gitea.wslpc.real.he-info.cn:94/flutter/easydevice.git"
     source: git
     version: "0.0.1"
@@ -452,8 +456,13 @@ packages:
     dependency: "direct main"
     description:
       path: "."
+<<<<<<< HEAD
+      ref: main
+      resolved-ref: "13a86afdcf71b55017ebf7ee2c22af211e642603"
+=======
       ref: e86d515f77
       resolved-ref: e86d515f77a736a5e6f09036e5e022153cde425d
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
       url: "https://gitea.wslpc.real.he-info.cn:94/flutter/easyweb.git"
     source: git
     version: "0.0.1"
@@ -510,10 +519,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   ffi:
     dependency: transitive
     description:
@@ -819,34 +828,34 @@ packages:
     dependency: "direct main"
     description:
       name: geocoding
-      sha256: b34c0501bbbaf3190b85bef3078b27cf66c28a8915c6d3af50d67f356aa7da31
+      sha256: "606be036287842d779d7ec4e2f6c9435fc29bbbd3c6da6589710f981d8852895"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "4.0.0"
   geocoding_android:
     dependency: transitive
     description:
       name: geocoding_android
-      sha256: "609db1d71bc364dd9d0616f72a41c01e0c74f3a3807efb85e0d5a67e57baf50f"
+      sha256: ba810da90d6633cbb82bbab630e5b4a3b7d23503263c00ae7f1ef0316dcae5b9
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "4.0.1"
   geocoding_ios:
     dependency: transitive
     description:
       name: geocoding_ios
-      sha256: "8f79e380abb640ef4d88baee8bb65390058c802601158d0813dc990b36b189d2"
+      sha256: "43bde988312feb1a3cb6c3d514e9f4b04b564d1884fa56bd8241030bbb3bde36"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.2"
   geocoding_platform_interface:
     dependency: transitive
     description:
       name: geocoding_platform_interface
-      sha256: "8848605d307d844d89937cdb4b8ad7dfa880552078f310fa24d8a460f6dddab4"
+      sha256: "8c2c8226e5c276594c2e18bfe88b19110ed770aeb7c1ab50ede570be8b92229b"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "3.2.0"
   geolocator:
     dependency: "direct main"
     description:
@@ -1131,10 +1140,10 @@ packages:
     dependency: transitive
     description:
       name: json_path
-      sha256: a3a06eb005f2e93d0df7f263cdf76bbd02c7602f5c4bed9be94fcca4c36be03e
+      sha256: ba1904c4425dbe6230b824ed5b8b1684e87dbce2be5316e145584a6c46e750c1
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.7.5"
+    version: "0.7.6"
   json_serializable:
     dependency: "direct dev"
     description:
@@ -1147,18 +1156,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.8"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.9"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -1211,10 +1220,10 @@ packages:
     dependency: transitive
     description:
       name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.2-main.4"
+    version: "0.1.3-main.0"
   map_launcher:
     dependency: "direct main"
     description:
@@ -1235,10 +1244,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1259,10 +1268,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   mime:
     dependency: transitive
     description:
@@ -1395,10 +1404,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
@@ -1571,10 +1580,10 @@ packages:
     dependency: transitive
     description:
       name: pointer_interceptor_web
-      sha256: "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044"
+      sha256: "460b600e71de6fcea2b3d5f662c92293c049c4319e27f0829310e5a953b3ee2a"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.10.2+1"
+    version: "0.10.3"
   pointycastle:
     dependency: transitive
     description:
@@ -1819,7 +1828,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   smooth_page_indicator:
     dependency: transitive
     description:
@@ -1848,10 +1857,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
   sprintf:
     dependency: transitive
     description:
@@ -1864,34 +1873,34 @@ packages:
     dependency: transitive
     description:
       name: sqflite
-      sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb"
+      sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   sqflite_android:
     dependency: transitive
     description:
       name: sqflite_android
-      sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3"
+      sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709"
+      sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.4+6"
+    version: "2.5.5"
   sqflite_darwin:
     dependency: transitive
     description:
       name: sqflite_darwin
-      sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c"
+      sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.1+1"
+    version: "2.4.2"
   sqflite_platform_interface:
     dependency: transitive
     description:
@@ -1904,10 +1913,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   stop_watch_timer:
     dependency: transitive
     description:
@@ -1920,10 +1929,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   stream_transform:
     dependency: transitive
     description:
@@ -1936,10 +1945,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
   substring_highlight:
     dependency: transitive
     description:
@@ -1968,10 +1977,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
+      sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.3.0+3"
+    version: "3.3.1"
   table_calendar:
     dependency: transitive
     description:
@@ -1984,18 +1993,18 @@ packages:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.4"
   timeago:
     dependency: transitive
     description:
@@ -2064,10 +2073,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193"
+      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.3.14"
+    version: "6.3.16"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -2104,10 +2113,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
+      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.3"
+    version: "2.4.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -2200,10 +2209,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.1"
   vy_string_utils:
     dependency: transitive
     description:
@@ -2288,10 +2297,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "7cb32b21825bd65569665c32bb00a34ded5779786d6201f5350979d2d529940d"
+      sha256: f0dc2dc3a2b1e3a6abdd6801b9355ebfeb3b8f6cde6b9dc7c9235909c4a1f147
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.13.0"
+    version: "2.13.1"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
@@ -2341,5 +2350,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.5.4 <4.0.0"
-  flutter: ">=3.24.0"
+  dart: ">=3.7.0 <4.0.0"
+  flutter: ">=3.27.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index bea776f..729babb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -57,7 +57,7 @@ dependencies:
   flutter_city_picker: ^2.1.1
   weather: ^3.1.1
   lpinyin: ^2.0.3
-  geocoding: ^2.1.0
+  geocoding: ^4.0.0
   # fl_chart: ^1.0.0
   video_player: ^2.9.5
   chewie: ^1.10.0
@@ -84,7 +84,7 @@ dependency_overrides:
   flutter_blue_plus: 1.34.5 # 1.35.0 版本android连接蓝牙有问题
   geolocator: 13.0.3
   geolocator_android: 4.4.1
-  geocoding: 2.1.0
+  geocoding: 4.0.0
 
 flutter:
   uses-material-design: true
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 631a4db..203b6e9 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,7 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <app_links/app_links_plugin_c_api.h>
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
 #include <flutter_localization/flutter_localization_plugin_c_api.h>
@@ -14,11 +13,8 @@
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <rive_common/rive_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
-#include <window_to_front/window_to_front_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  AppLinksPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
   ConnectivityPlusWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
   FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
@@ -33,6 +29,4 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("RivePlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
-  WindowToFrontPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("WindowToFrontPlugin"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 40ebb0a..c4066a3 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  app_links
   connectivity_plus
   flutter_inappwebview_windows
   flutter_localization
@@ -11,7 +10,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
   permission_handler_windows
   rive_common
   url_launcher_windows
-  window_to_front
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST