diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 62df7c4..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="11d76f05" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-11-23T14:29:36.358446300Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/bird2fish/travelbook/MainActivity.kt b/app/src/main/java/com/bird2fish/travelbook/MainActivity.kt
index 9906ae4..6fabc93 100644
--- a/app/src/main/java/com/bird2fish/travelbook/MainActivity.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/MainActivity.kt
@@ -1,20 +1,14 @@
 package com.bird2fish.travelbook
 
-import android.Manifest
 import android.content.ComponentName
-import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.os.IBinder
 import android.view.Menu
-import android.view.MenuItem
 import android.view.View
-import android.view.Window
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
 import com.google.android.material.navigation.NavigationView
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
@@ -23,16 +17,11 @@ import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
-import androidx.core.view.get
-import androidx.fragment.app.FragmentActivity
-import com.bird2fish.travelbook.R
 import com.bird2fish.travelbook.core.HttpService
 import com.bird2fish.travelbook.core.UiHelper
 import com.bird2fish.travelbook.databinding.ActivityMainBinding
 import com.bird2fish.travelbook.helper.LogHelper
-import com.bird2fish.travelbook.helper.PreferencesHelper
 import com.bird2fish.travelbook.ui.data.model.CurrentUser
 
 class MainActivity : AppCompatActivity() {
@@ -50,6 +39,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     public fun openDrawer(){
+
         binding.drawerLayout.openDrawer(GravityCompat.START);
     }
 
@@ -94,7 +84,7 @@ class MainActivity : AppCompatActivity() {
                 //R.id.nav_newgroup,
                 R.id.nav_home,  R.id.nav_playground, R.id.nav_favourite,
                 R.id.nav_map, R.id.nav_track,
-                R.id.nav_contract, R.id.nav_setting
+                R.id.nav_me, R.id.nav_contract, R.id.settingFragment
             ), drawerLayout
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
@@ -118,6 +108,31 @@ class MainActivity : AppCompatActivity() {
 //            window.statusBarColor = resources.getColor(R.color.toolbar_gray)
 //        }
 
+
+        drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener {
+            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+                // 当侧边栏滑动时调用
+            }
+
+            override fun onDrawerOpened(drawerView: View) {
+                // 当侧边栏打开时调用
+                // 这里可以处理在侧边栏打开时需要执行的逻辑
+                val user = CurrentUser.getUser()
+                if (user != null){
+                    setUserInfo()
+                }
+            }
+
+            override fun onDrawerClosed(drawerView: View) {
+                // 当侧边栏关闭时调用
+                // 这里可以处理在侧边栏关闭时需要执行的逻辑
+            }
+
+            override fun onDrawerStateChanged(newState: Int) {
+                // 当侧边栏状态发生变化时调用
+            }
+        })
+
     }
 
     private fun setUserInfo(){
@@ -126,7 +141,7 @@ class MainActivity : AppCompatActivity() {
         var navigationView = this.findViewById<NavigationView>(R.id.nav_view);
         // 侧边栏的头部栏的信息设置
         var headerLayout = navigationView.getHeaderView(0);
-        var userNameview = headerLayout.findViewById<TextView>(R.id.textNick);
+        var userNameview = headerLayout.findViewById<TextView>(R.id.tvName);
         var userInfoview = headerLayout.findViewById<TextView>(R.id.textInfo);
         var userIcon = headerLayout.findViewById<ImageView>(R.id.imageViewIcon)
 
diff --git a/app/src/main/java/com/bird2fish/travelbook/ServerSettingView.kt b/app/src/main/java/com/bird2fish/travelbook/ServerSettingView.kt
new file mode 100644
index 0000000..d8b8497
--- /dev/null
+++ b/app/src/main/java/com/bird2fish/travelbook/ServerSettingView.kt
@@ -0,0 +1,95 @@
+package com.bird2fish.travelbook
+
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.PopupWindow
+import android.widget.ScrollView
+import android.widget.TextView
+import com.bird2fish.travelbook.helper.PreferencesHelper
+
+class ServerSettingView(context: Context) {
+
+    private var popupWindow: PopupWindow
+
+    init {
+        // 填充布局 R.layout.pop_location
+        val popupView = LayoutInflater.from(context).inflate(R.layout.setting_server, null)
+
+        // 创建 PopupWindow 实例
+        popupWindow = PopupWindow(
+            popupView,
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            true
+        )
+
+        // 设置 PopupWindow 的背景
+        popupWindow.setBackgroundDrawable(ColorDrawable(Color.WHITE))
+
+        // 设置 PopupWindow 的位置（在底部）
+        popupWindow.showAtLocation(popupView, Gravity.BOTTOM, 0, 0)
+
+        // 设置 PopupWindow 进入和退出的动画效果（可选）
+        popupWindow.animationStyle = R.style.PopupWindowAnimation
+
+        // 设置点击外部不关闭PopupWindow
+        popupWindow.isOutsideTouchable = false
+        // 设置背景为null，防止点击外部传递到下面的View
+        popupWindow.setBackgroundDrawable(null)
+
+        // 添加监听器，处理关闭事件
+        popupWindow.setOnDismissListener {
+            // 在这里添加处理 PopupWindow 关闭时的逻辑
+        }
+
+        // 如果需要处理点击事件等，可以在这里找到对应的 View 并设置相应的监听器
+        val schemaEdit = popupView.findViewById<TextView>(R.id.tv_shema)
+        val schema = PreferencesHelper.getHostSchema()
+        schemaEdit.setText(schema)
+
+
+        val hostEdit = popupView.findViewById<TextView>(R.id.tv_ip)
+        val host = PreferencesHelper.getHostName()
+        hostEdit.setText(host)
+
+        val saveBtn = popupView.findViewById<Button>(R.id.btn_server_ok)
+        val cancelBtn = popupView.findViewById<Button>(R.id.btn_server_cancel)
+
+        saveBtn.setOnClickListener{
+            val schema = schemaEdit.text.toString()
+            val host = hostEdit.text.toString()
+            PreferencesHelper.setHost(schema, host)
+        }
+
+        cancelBtn.setOnClickListener{
+            this.dismissPopupWindow()
+        }
+
+
+    }
+
+    // 如果需要在外部调用显示 PopupWindow 的方法，可以添加一个公共方法
+    fun showPopupWindow() {
+        if (!popupWindow.isShowing) {
+            popupWindow.showAtLocation(
+                popupWindow.contentView,
+                Gravity.BOTTOM,
+                0,
+                0
+            )
+        }
+    }
+
+    // 添加关闭 PopupWindow 的方法
+    fun dismissPopupWindow() {
+        if (popupWindow.isShowing) {
+            popupWindow.dismiss()
+        }
+    }
+}
diff --git a/app/src/main/java/com/bird2fish/travelbook/TencentMapActivity.kt b/app/src/main/java/com/bird2fish/travelbook/TencentMapActivity.kt
index 38eeb6d..982b417 100644
--- a/app/src/main/java/com/bird2fish/travelbook/TencentMapActivity.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/TencentMapActivity.kt
@@ -46,6 +46,7 @@ class TencentMapActivity : AppCompatActivity() {
     //private lateinit var layout: MapFragmentLayoutHolder
     //private  var trackerService: TrackerService? = null
     private lateinit var  mMarker:com.tencent.tencentmap.mapsdk.maps.model.Marker   // 自己的位置
+    private lateinit var  mImageView:ImageView
     private var markersMap =  mutableMapOf<String, com.tencent.tencentmap.mapsdk.maps.model.Marker>()
     private var iconsMap = mutableMapOf<String, ImageView>()
 
@@ -128,6 +129,7 @@ class TencentMapActivity : AppCompatActivity() {
             onImageIconClick(me)
         }
         linearLayout.addView(imageView)
+        this.mImageView = imageView
     }
 
     // 对点击的marker设置为顶层
@@ -772,6 +774,29 @@ class TencentMapActivity : AppCompatActivity() {
         }
     }
 
+    // 如果个人信息部分编辑了头像，这里需要更改
+    private fun updateAvarta(){
+        val user = CurrentUser.getUser()
+        if (user!!.isChanged){
+            val bitmapIcon = UiHelper.getSmallIconBitmap(CurrentUser.getUser()!!.icon, this)
+            val custom = BitmapDescriptorFactory.fromBitmap(bitmapIcon)
+            this.mMarker.setIcon(custom)
+
+            // 获取底部列表
+            val linearLayout = this.findViewById<LinearLayout>(R.id.linear_layout_icons)
+            // 先检查是否有不需要显示的, 不再朋友列表中，通信簿设置后说明不需要显示了
+
+            if (this.mImageView != null){
+                val icon = CurrentUser.getUser()!!.icon
+                val id = UiHelper.getIconResId(icon)
+                this.mImageView.setImageResource(id)
+            }
+
+
+            user!!.isChanged = false
+        }
+    }
+
     /**
      * mapview的生命周期管理
      */
@@ -788,6 +813,9 @@ class TencentMapActivity : AppCompatActivity() {
 
         // 在恢复时重新启动任务
         startRefreshInfo()
+
+        // 查看头像是否更改
+        updateAvarta()
     }
 
     // 当一个 Activity 即将失去焦点并进入后台时，系统会调用 onPause() 方法。
diff --git a/app/src/main/java/com/bird2fish/travelbook/core/GlobalData.kt b/app/src/main/java/com/bird2fish/travelbook/core/GlobalData.kt
index 4065e5a..c19eb38 100644
--- a/app/src/main/java/com/bird2fish/travelbook/core/GlobalData.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/core/GlobalData.kt
@@ -42,6 +42,12 @@ class GlobalData {
             }catch (e: Exception){
                 GlobalData.sportMode = GlobalData.SportModeEnum.SPORT_MODE_HIKE
             }
+            GlobalData.intervalOfRefresh =  PreferencesHelper.getRefreshInterval()
+            if (GlobalData.intervalOfRefresh < 2000){
+                GlobalData.intervalOfRefresh = 2000
+            }else if (GlobalData.intervalOfRefresh > 60000){
+                GlobalData.intervalOfRefresh = 60000
+            }
         }
 
         fun setCurrentLocation(pos :TencentLocation){
diff --git a/app/src/main/java/com/bird2fish/travelbook/core/HttpService.kt b/app/src/main/java/com/bird2fish/travelbook/core/HttpService.kt
index fc20b40..d01d39f 100644
--- a/app/src/main/java/com/bird2fish/travelbook/core/HttpService.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/core/HttpService.kt
@@ -5,13 +5,16 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import android.util.Log
+import com.bird2fish.travelbook.helper.DateTimeHelper
 import com.bird2fish.travelbook.helper.LogHelper
 import com.bird2fish.travelbook.helper.PreferencesHelper
 import com.bird2fish.travelbook.ui.contact.Friend
 import com.bird2fish.travelbook.ui.data.model.CurrentUser
 import com.bird2fish.travelbook.ui.data.model.LoggedInUser
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONArray
 import org.json.JSONObject
 import java.lang.RuntimeException
@@ -281,7 +284,7 @@ class HttpService : Service() {
     fun getUserInfo(uid: String, sid:String, fid:String) : LoggedInUser{
         val fakeUser = LoggedInUser("", "", "", "0", "")
         //构建url地址
-        var url1 = "${schema}://${host}/v1/user/searchfriends?fid=${fid}"
+        var url1 = "${schema}://${host}/v1/user/searchfriends?fid=${fid}&uid=${uid}"
 
         try {
             var client = HttpsUtil.getClient()
@@ -303,6 +306,14 @@ class HttpService : Service() {
                     fakeUser.userId = user.getString("name")
                     fakeUser.icon = user.getString("icon")
 
+                    if (user.getInt("age") != null){
+                        fakeUser.age =user.getInt("age").toString()
+                    }else
+                    {
+                        fakeUser.age = "0"
+                    }
+
+
                     fakeUser.phone = user.getString("phone")
                     fakeUser.email = user.getString("email")
 
@@ -530,24 +541,104 @@ class HttpService : Service() {
     }
 
     // 查询好友信息
-    // http://localhost:7817/v1/gpx/position?
-    //    {
-    //        "uid":"1005",
-    //        "sid":"6812630841045951575",
-    //        "fid":"1004"
-    //    }
-    //    {
-    //        "state": "OK",
-    //        "pt": {
-    //        "uid": "1004",
-    //        "lat": 40,
-    //        "lon": 116,
-    //        "ele": 100,
-    //        "speed": 0,
-    //        "tm": 1007
-    //        }
-    //    }
-    fun getUserLocation(friend: Friend) : Boolean {
-        return true
+    /*
+    {
+        "id": 1005,
+        "phone": "",
+        "icon": "sys:icon/2.jpg",
+        "name": "robin",
+        "nick": "飞鸟",
+        "email": "",
+        "pwd": "123456",
+        "temppwd": "",
+        "region": "unknow",
+        "ipv4": "0.0.0.0",
+        "wxid": "0",
+        "age": 42,
+        "gender": 1,
+        "tm": "2023/09/20 16:04:18",
+        "sid": 6812630841045951575
+    }
+     */
+
+    fun updateInfo(user : LoggedInUser) : Boolean {
+
+        var jsonObject= JSONObject()
+
+        try {
+            val intNumber = user.uid.toInt()
+            jsonObject.put("id", intNumber)
+
+        }catch (e: NumberFormatException) {
+            return false
+        }
+
+        try {
+            val intNumber = user.sid.toLong()
+            jsonObject.put("sid", intNumber)
+
+        }catch (e: NumberFormatException) {
+            return false
+        }
+
+
+
+        jsonObject.put("pwd", user.pwd)
+        jsonObject.put("icon", user.icon)
+        jsonObject.put("nick", user.nickName)
+        jsonObject.put("name", user.userId)
+
+
+        try {
+            val intNumber = user.age.toInt()
+            println("转换后的整数: $intNumber")
+            jsonObject.put("age", intNumber)
+        } catch (e: NumberFormatException) {
+            println("无法将字符串转换为整数: $e")
+            jsonObject.put("age", 0)
+        }
+
+        if (user.gender == "男"){
+            jsonObject.put("gender", 1)
+        }else{
+            jsonObject.put("gender", 0)
+        }
+
+        jsonObject.put("phone", user.phone)
+        jsonObject.put("email", user.email)
+
+        //System.out.println(tmStr)
+        //jsonObject.put("tmStr", tmStr)
+        var jsonStr=jsonObject.toString()
+        //System.out.println(jsonStr)
+
+        //调用请求
+        val contentType = "application/json".toMediaType()
+        var requestBody = jsonStr.toRequestBody(contentType)
+
+        //构建url地址
+        var url1 = "${schema}://${host}/v1/user/setbaseinfo"
+
+        try {
+            var client = HttpsUtil.getClient()
+            val request = Request.Builder()
+                .url(url1)
+                .post(requestBody)
+                .build()
+            var response = client.newCall(request).execute()
+            val responseData = response.body?.string()
+            val jsonObject = JSONObject(responseData)
+            val state = jsonObject.getString("state")
+
+            if (state == "ok") {
+
+                return true
+            }
+        }catch (e: Exception) {
+            //LogHelper.e("Exception")
+            e.printStackTrace();
+            LogHelper.e("$e.message")
+        }
+        return false
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bird2fish/travelbook/core/TracklistElement.kt b/app/src/main/java/com/bird2fish/travelbook/core/TracklistElement.kt
index cc759e2..e289361 100644
--- a/app/src/main/java/com/bird2fish/travelbook/core/TracklistElement.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/core/TracklistElement.kt
@@ -8,7 +8,7 @@ import java.util.*
 
 
 /*
- * 用于录制或者提某一段路径的轨迹
+ * 用于某一段路径的轨迹的描述信息
  */
 @Keep
 @Parcelize
diff --git a/app/src/main/java/com/bird2fish/travelbook/core/UiHelper.kt b/app/src/main/java/com/bird2fish/travelbook/core/UiHelper.kt
index a1af84d..ed0ece9 100644
--- a/app/src/main/java/com/bird2fish/travelbook/core/UiHelper.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/core/UiHelper.kt
@@ -16,6 +16,7 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.bird2fish.travelbook.R
 import com.bird2fish.travelbook.ui.contact.Friend
+import com.google.android.material.internal.ViewUtils.dpToPx
 
 
 public object UiHelper {
@@ -77,6 +78,20 @@ public object UiHelper {
         R.drawable.icon32,
         R.drawable.icon33
     )
+
+    fun getIconResIndex(name :String) :Int{
+        if (name.startsWith("sys:")) {
+            val idStr = name.substring(4)
+            val index = idStr.toIntOrNull()
+            if (index != null) {
+                if (index > iconIds.size || index <1)
+                    return 0
+                return index -1
+            }
+        }
+        return 0
+    }
+
     fun getIconResId(name :String) :Int{
         if (name.startsWith("sys:")){
             val idStr = name.substring(4)
diff --git a/app/src/main/java/com/bird2fish/travelbook/core/WayPoint.kt b/app/src/main/java/com/bird2fish/travelbook/core/WayPoint.kt
index c9303d4..ae82190 100644
--- a/app/src/main/java/com/bird2fish/travelbook/core/WayPoint.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/core/WayPoint.kt
@@ -34,8 +34,7 @@ data class WayPoint(@Expose val provider: String,
         location.altitude,
         location.accuracy,
         location.time,
-        distanceToStartingPoint,
-        LocationHelper.getNumberOfSatellites(location))
+        distanceToStartingPoint)
 
     /* Converts WayPoint into Location */
     fun toLocation(): Location {
diff --git a/app/src/main/java/com/bird2fish/travelbook/helper/LocationHelper.kt b/app/src/main/java/com/bird2fish/travelbook/helper/LocationHelper.kt
index e31df1e..c3362cb 100644
--- a/app/src/main/java/com/bird2fish/travelbook/helper/LocationHelper.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/helper/LocationHelper.kt
@@ -137,14 +137,14 @@ object LocationHelper {
 
 
 
-    /* Checks if given location is new */
+    /* 一分钟之内的点 */
     fun isRecentEnough(location: Location): Boolean {
         val locationAge: Long = SystemClock.elapsedRealtimeNanos() - location.elapsedRealtimeNanos
         return locationAge < Keys.DEFAULT_THRESHOLD_LOCATION_AGE
     }
 
 
-    /* Checks if given location is accurate */
+    /* 检查精度是否达标， */
     fun isAccurateEnough(location: Location, locationAccuracyThreshold: Int): Boolean {
         val isAccurate: Boolean
         when (location.provider) {
diff --git a/app/src/main/java/com/bird2fish/travelbook/helper/PreferencesHelper.kt b/app/src/main/java/com/bird2fish/travelbook/helper/PreferencesHelper.kt
index 1f7d6fe..502e99a 100644
--- a/app/src/main/java/com/bird2fish/travelbook/helper/PreferencesHelper.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/helper/PreferencesHelper.kt
@@ -210,7 +210,7 @@ object PreferencesHelper {
         return schema!!
     }
 
-    fun setHost(host:String, schema:String){
+    fun setHost(schema:String, host:String){
         val editor = sharedPreferences.edit()
         //得到Editor后，写入需要保存的数据
         editor.putString("hostname", host)
@@ -337,4 +337,18 @@ object PreferencesHelper {
         return t
     }
 
+    fun setRefreshInterval(t :Long){
+        val editor = sharedPreferences.edit()
+        editor.putLong("refreshInterval", t)
+        editor.commit() //提交修改
+    }
+
+    fun getRefreshInterval(): Long{
+        var t = sharedPreferences.getLong("refreshInterval", 3000)
+        if (t < 2000){
+            t = 2000
+        }
+        return t
+    }
+
 }
diff --git a/app/src/main/java/com/bird2fish/travelbook/helper/TrackHelper.kt b/app/src/main/java/com/bird2fish/travelbook/helper/TrackHelper.kt
index 19970b7..ac75064 100644
--- a/app/src/main/java/com/bird2fish/travelbook/helper/TrackHelper.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/helper/TrackHelper.kt
@@ -15,7 +15,7 @@ import com.bird2fish.travelbook.core.*
 
 
 /*
- * TrackHelper object
+ * 辅助工具
  */
 object TrackHelper {
 
@@ -32,6 +32,11 @@ object TrackHelper {
 
 
     /* Adds given locatiom as waypoint to track */
+    /* 用法：
+     val result: Pair<Boolean, Track> = TrackHelper.addWayPointToTrack(track, currentBestLocation, accuracyMultiplier, resumed)
+     val successfullyAdded: Boolean = result.first
+     track = result.second
+     */
     fun addWayPointToTrack(track: Track, location: Location, accuracyMultiplier: Int, resumed: Boolean): Pair<Boolean, Track> {
         // Step 1: Get previous location
         val previousLocation: Location?
@@ -41,7 +46,7 @@ object TrackHelper {
         if (numberOfWayPoints == 0) {
             previousLocation = null
         }
-        // CASE: Second location - check if first location was plausible & remove implausible location
+        // 检查数据点是否发生了瞬间跳跃，这里使用腾讯地图应该不会有
         else if (numberOfWayPoints == 1 && !LocationHelper.isFirstLocationPlausible(location, track)) {
             previousLocation = null
             numberOfWayPoints = 0
@@ -58,7 +63,7 @@ object TrackHelper {
         track.duration = track.duration + difference
         track.recordingStop = now
 
-        // Step 3: Add waypoint, ifrecent and accurate and different enough
+        // Step 3: 一分钟之内的，不能太近，按照精度来计算一下是否晃动了
         val shouldBeAdded: Boolean = (LocationHelper.isRecentEnough(location) &&
                 LocationHelper.isAccurateEnough(location, Keys.DEFAULT_THRESHOLD_LOCATION_ACCURACY) &&
                 LocationHelper.isDifferentEnough(previousLocation, location, accuracyMultiplier))
@@ -80,7 +85,7 @@ object TrackHelper {
                 }
             }
             // Step 3.3: Toggle stop over status, if necessary
-            if (track.wayPoints.size < 0) {
+            if (track.wayPoints.size > 0) {
                 track.wayPoints[track.wayPoints.size - 1].isStopOver = LocationHelper.isStopOver(previousLocation, location)
             }
 
diff --git a/app/src/main/java/com/bird2fish/travelbook/ui/PersonalInfo.kt b/app/src/main/java/com/bird2fish/travelbook/ui/PersonalInfo.kt
new file mode 100644
index 0000000..50893ee
--- /dev/null
+++ b/app/src/main/java/com/bird2fish/travelbook/ui/PersonalInfo.kt
@@ -0,0 +1,256 @@
+package com.bird2fish.travelbook.ui
+
+import android.content.Context
+import android.graphics.Color
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.*
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import com.bird2fish.travelbook.R
+import com.bird2fish.travelbook.core.HttpService
+import com.bird2fish.travelbook.core.UiHelper
+import com.bird2fish.travelbook.databinding.FragmentPersonalInfoBinding
+import com.bird2fish.travelbook.helper.DateTimeHelper
+import com.bird2fish.travelbook.helper.PreferencesHelper
+import com.bird2fish.travelbook.ui.data.Result
+import com.bird2fish.travelbook.ui.data.model.CurrentUser
+import com.bird2fish.travelbook.ui.data.model.LoggedInUser
+import com.bird2fish.travelbook.ui.login.LoggedInUserView
+import com.bird2fish.travelbook.ui.login.LoginResult
+import androidx.appcompat.app.AppCompatActivity
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [PersonalInfo.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class PersonalInfo : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    private var _binding: FragmentPersonalInfoBinding? = null
+    private val binding get() = _binding!!
+
+    private var _changed : MutableLiveData<Boolean> = MutableLiveData(false)
+    var changed : LiveData<Boolean> =  _changed
+    private var inited :Boolean = false
+
+    private var  icon :String  = ""
+
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        arguments?.let {
+//            param1 = it.getString(ARG_PARAM1)
+//            param2 = it.getString(ARG_PARAM2)
+//        }
+//    }
+
+    override fun onResume() {
+        super.onResume()
+//        val iconId = UiHelper.getIconResId(this.icon)
+//        //binding.imageViewIcon.setImageResource(iconId)
+    }
+
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        //return inflater.inflate(R.layout.fragment_personal_info, container, false)
+
+        _binding = FragmentPersonalInfoBinding.inflate(inflater, container, false)
+
+        val user = CurrentUser.getUser()
+        binding.tvName.setText("${user!!.userId} (${user!!.uid}) ")
+        binding.tvNick.setText(user!!.nickName)
+        binding.tvAge.setText(user!!.age)
+        binding.tvGender.setText(user!!.gender)
+        binding.tvPass.setText(user!!.pwd)
+        binding.tvPhone.setText(user!!.phone)
+        binding.tvEmail.setText(user!!.email)
+        this.icon = user.icon
+
+
+        // 保存基本信息
+        binding.btnSave.setOnClickListener{
+            saveInfo()
+        }
+
+        // 验证手机
+        binding.btnCheckPhone.setOnClickListener{
+            UiHelper.showCenterMessage(requireActivity(), "后端暂时未能发送验证码")
+        }
+        binding.btnCheckPhone.visibility = View.INVISIBLE
+
+        // 验证邮件
+        binding.btnCheckEmail.setOnClickListener{
+            UiHelper.showCenterMessage(requireActivity(), "后端暂时未能发送验证码")
+        }
+
+        binding.btnCheckEmail.visibility = View.INVISIBLE
+
+        // 检查验证码
+        binding.btnSendCode.setOnClickListener{
+
+        }
+
+        binding.btnSendCode.visibility = View.INVISIBLE
+        binding.tvCode.visibility = View.INVISIBLE
+        binding.titleTvCode.visibility = View.INVISIBLE
+        binding.iconSpinner.visibility = View.INVISIBLE
+
+        // 结果
+        this.changed.observe(requireActivity(), Observer {
+
+           if (inited){
+               if (changed.value == true){
+                   UiHelper.showCenterMessage(requireActivity(), "更新成功")
+               }else{
+                   UiHelper.showCenterMessage(requireActivity(), "更新失败")
+               }
+               inited = false
+           }
+
+        })
+
+        // 设置图标按钮点击事件
+        binding.imageViewIcon.setOnClickListener {
+            // 显示或隐藏Spinner下拉框
+            //binding.iconSpinner.visibility  = View.VISIBLE
+            binding.iconSpinner.performClick()
+        }
+
+
+        // 声明一个映射对象的队列，用于保存行星的图标与名称配对信息
+        val list: MutableList<Map<String, Any>> = ArrayList()
+        // iconArray是行星的图标数组，starArray是行星的名称数组
+        for (i in UiHelper.iconIds.indices) {
+            val item: MutableMap<String, Any> = HashMap()
+            item["icon"] = UiHelper.iconIds[i]
+            item["name"] = (i+1).toString()
+            // 把一个行星图标与名称的配对映射添加到队列当中
+            list.add(item)
+        }
+        // 声明一个下拉列表的简单适配器，其中指定了图标与文本两组数据
+        val starAdapter = SimpleAdapter(
+            requireActivity(),
+            list,
+            R.layout.spinner_drop_down,
+            arrayOf("icon", "name"),
+            intArrayOf(R.id.iv_icon, R.id.tv_name)
+        )
+        // 设置简单适配器的布局样式
+        starAdapter.setDropDownViewResource(R.layout.spinner_drop_down)
+
+        // 设置下拉框的标题
+        binding.iconSpinner.prompt = "请选择图标"
+        // 设置下拉框的简单适配器
+        binding.iconSpinner.adapter = starAdapter
+        binding.iconSpinner.setSelection(UiHelper.getIconResIndex(this.icon))
+
+
+//        val iconArray = UiHelper.iconIds.toList()
+//        val adapter  = IconAdapter(requireActivity(), R.layout.spinner_drop_down, iconArray)
+//        adapter.setDropDownViewResource(R.layout.spinner_drop_down)
+//        binding.iconSpinner.adapter = adapter
+
+        // 设置 Spinner 的选择监听器
+        binding.iconSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                // 用户选择了某一项的回调函数
+                val selectedIconId = UiHelper.iconIds[position]
+                // 在这里可以执行相应的操作，例如更新界面或执行其他逻辑
+                val index = position + 1
+                this@PersonalInfo.icon = "sys:" + index.toString()
+
+                val iconId = UiHelper.getIconResId(this@PersonalInfo.icon)
+                binding.imageViewIcon.setImageResource(iconId)
+                //binding.imageViewIcon.setImageResource(selectedIconId)
+
+                binding.iconSpinner.visibility  = View.INVISIBLE
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                binding.iconSpinner.visibility  = View.INVISIBLE
+            }
+        }
+
+        return binding.root
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment PersonalInfo.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            PersonalInfo().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+
+    // 保存昵称等基本信息
+    fun saveInfo(){
+
+        var user = LoggedInUser()
+        val info = PreferencesHelper.getUserInfo()
+        user.uid = info!!.uid
+        user.sid = info!!.sid
+        user.pwd = binding.tvPass.text.toString()
+        user.userId = CurrentUser.getUser()!!.userId
+
+        user.icon = this.icon
+        user.nickName = binding.tvNick.text.toString()
+        user.age =      binding.tvAge.text.toString()
+        user.gender =   binding.tvGender.text.toString()
+        user.phone =    binding.tvPhone.text.toString()
+        user.email =    binding.tvEmail.text.toString()
+
+        inited  = true
+        object : Thread() {
+            override fun run() {
+                //网络操作连接的代码
+                val server = HttpService()
+                server.initServer()
+                val ret = server.updateInfo(user)
+                _changed.postValue(ret)
+
+                if (ret){
+                    PreferencesHelper.saveUserInfo(user.userId, user.pwd, user.uid, user.sid)
+                    var u = CurrentUser.getUser()
+                    u!!.isChanged = true
+                    u!!.icon = user.icon
+                    u!!.nickName = user.nickName
+                    u!!.age = user.age
+                    u!!.gender = user.gender
+                    u!!.phone = user.phone
+                    u!!.email = user.email
+                }
+
+
+            }
+        }.start()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bird2fish/travelbook/ui/data/LoginRepository.kt b/app/src/main/java/com/bird2fish/travelbook/ui/data/LoginRepository.kt
index 68a7ab2..26aca96 100644
--- a/app/src/main/java/com/bird2fish/travelbook/ui/data/LoginRepository.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/ui/data/LoginRepository.kt
@@ -53,8 +53,6 @@ class LoginRepository(val dataSource: LoginDataSource) {
         PreferencesHelper.saveUserInfo(loggedInUser.userId, loggedInUser.pwd,
             loggedInUser.uid, loggedInUser.sid)
 
-
-
     }
 
 
diff --git a/app/src/main/java/com/bird2fish/travelbook/ui/data/model/LoggedInUser.kt b/app/src/main/java/com/bird2fish/travelbook/ui/data/model/LoggedInUser.kt
index c363044..efb7df3 100644
--- a/app/src/main/java/com/bird2fish/travelbook/ui/data/model/LoggedInUser.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/ui/data/model/LoggedInUser.kt
@@ -16,7 +16,8 @@ data class LoggedInUser(
     var age : String = "",
     var ip : String = "",
     var region : String = "",
-    var mask : Int = 0
+    var mask : Int = 0,
+    var isChanged: Boolean = false
 )
 
 class CurrentUser {
diff --git a/app/src/main/java/com/bird2fish/travelbook/ui/login/LoginActivity.kt b/app/src/main/java/com/bird2fish/travelbook/ui/login/LoginActivity.kt
index 854b06d..dd79fc0 100644
--- a/app/src/main/java/com/bird2fish/travelbook/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/bird2fish/travelbook/ui/login/LoginActivity.kt
@@ -6,25 +6,22 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Bundle
 import android.os.IBinder
-import android.os.StrictMode
-import android.os.StrictMode.ThreadPolicy
-import android.os.StrictMode.VmPolicy
 import android.text.*
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
-import android.view.Window
 import android.view.inputmethod.EditorInfo
 import android.widget.*
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.bird2fish.travelbook.BottomWindow
-import com.bird2fish.travelbook.MainActivity
 import com.bird2fish.travelbook.R
+import com.bird2fish.travelbook.ServerSettingView
 import com.bird2fish.travelbook.TencentMapActivity
 import com.bird2fish.travelbook.core.HttpService
 import com.bird2fish.travelbook.core.UiHelper
@@ -231,6 +228,25 @@ class LoginActivity : AppCompatActivity() {
         return spannableString
     }
 
+    // 加载工具条菜单
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.login_menu, menu)
+        return true
+    }
+
+    // 点击了按钮
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id: Int = item.getItemId()
+        if (id == R.id.server_settings) {
+            // 打开设置服务器IP的对话框或者新活动
+            //UiHelper.showMessage(this, "ceshi   d d ")
+            val popView = ServerSettingView(this)
+            popView.showPopupWindow()
+
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
 
     private fun showPrivacyPolicy() {
         // 启动一个新的界面或弹窗，显示隐私协议的内容
diff --git a/app/src/main/java/com/bird2fish/travelbook/ui/settingFragment.kt b/app/src/main/java/com/bird2fish/travelbook/ui/settingFragment.kt
new file mode 100644
index 0000000..a269933
--- /dev/null
+++ b/app/src/main/java/com/bird2fish/travelbook/ui/settingFragment.kt
@@ -0,0 +1,152 @@
+package com.bird2fish.travelbook.ui
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.bird2fish.travelbook.R
+import com.bird2fish.travelbook.core.GlobalData
+import com.bird2fish.travelbook.core.UiHelper
+import com.bird2fish.travelbook.databinding.FragmentSettingBinding
+import com.bird2fish.travelbook.helper.PreferencesHelper
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [settingFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class settingFragment : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    private var _binding: FragmentSettingBinding? = null
+    private val binding get() = _binding!!
+
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        arguments?.let {
+//            param1 = it.getString(ARG_PARAM1)
+//            param2 = it.getString(ARG_PARAM2)
+//        }
+//    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        _binding = FragmentSettingBinding.inflate(inflater, container, false)
+        //return inflater.inflate(R.layout.fragment_setting, container, false)
+
+        loadConfig()
+        binding.btnSave.setOnClickListener{
+            saveConfig()
+        }
+
+        return binding.root
+    }
+
+    private fun loadConfig(){
+        val hike = PreferencesHelper.getModeHikePosInterval() / 1000
+        binding.tvHike.setText(hike.toString())
+
+        val run = PreferencesHelper.getModeRunPosInterval() / 1000
+        binding.tvRun.setText(run.toString())
+
+        val bike = PreferencesHelper.getModeBikePosInterval() / 1000
+        binding.tvBike.setText(bike.toString())
+
+        val motor = PreferencesHelper.getModeMotorPosInterval() / 1000
+        binding.tvMotor.setText(motor.toString())
+
+        val car = PreferencesHelper.getModeCarPosInterval() / 1000
+        binding.tvCar.setText(car.toString())
+
+        val lasy = PreferencesHelper.getModeLasyPosInterval() / 1000
+        binding.tvLasy.setText(lasy.toString())
+
+
+        val refresh = PreferencesHelper.getRefreshInterval() / 1000
+        binding.tvRefresh.setText(refresh.toString())
+    }
+
+    private fun saveConfig(){
+        try {
+            // 刷新周期
+            var deltaRefresh = binding.tvRefresh.text.toString().toLong()
+            if (deltaRefresh < 2){
+                deltaRefresh = 2000
+            }else{
+                deltaRefresh = deltaRefresh * 1000
+            }
+            GlobalData.intervalOfRefresh =  deltaRefresh
+            PreferencesHelper.setRefreshInterval(deltaRefresh)
+
+            // 运动模式周期
+            var deltaHike= binding.tvHike.text.toString().toLong()
+            var deltaRun= binding.tvRun.text.toString().toLong()
+            var deltaBike= binding.tvBike.text.toString().toLong()
+            var deltaMotor= binding.tvMotor.text.toString().toLong()
+            var deltaCar= binding.tvCar.text.toString().toLong()
+            var deltaLasy= binding.tvLasy.text.toString().toLong()
+            if (deltaHike < 1){
+                deltaHike = 1000
+            }else {
+                deltaHike *=  1000
+            }
+
+            if (deltaRun < 1){
+                deltaRun = 1000
+            }else {
+                deltaRun *= 1000
+            }
+
+            if (deltaBike < 1){
+                deltaBike = 1000
+            }else {
+                deltaBike *=  1000
+            }
+
+            if (deltaMotor < 1){
+                deltaMotor = 1000
+            }else {
+                deltaMotor *=  1000
+            }
+
+            if (deltaCar < 1){
+                deltaCar = 1000
+            }else {
+                deltaCar *= 1000
+            }
+
+            if (deltaLasy < 1){
+                deltaLasy = 1000
+            }else {
+                deltaLasy *= 1000
+            }
+
+            PreferencesHelper.setModeHikePosInterval(deltaHike)
+            PreferencesHelper.setModeRunPosLongerval(deltaRun)
+            PreferencesHelper.setModeBikePosInterval(deltaBike)
+            PreferencesHelper.setModeMotorPosInterval(deltaMotor)
+            PreferencesHelper.setModeCarPosInterval(deltaCar)
+            PreferencesHelper.setModeLasyPosInterval(deltaLasy)
+            UiHelper.showCenterMessage(requireActivity(), "保存完毕")
+
+        }catch (e: NumberFormatException) {
+            UiHelper.showCenterMessage(requireActivity(), e.toString())
+        }
+
+
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/back_pop_win.xml b/app/src/main/res/drawable/back_pop_win.xml
new file mode 100644
index 0000000..d4a8bc9
--- /dev/null
+++ b/app/src/main/res/drawable/back_pop_win.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- res/drawable/rounded_border.xml -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/status_bar_background" /> <!-- 设置半透明背景颜色 -->
+            <corners android:radius="10dp" /> <!-- 圆角半径 -->
+            <stroke android:color="@color/gray_title" android:width="2dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 00b4917..6a677b0 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -90,6 +90,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
+        android:background="@android:color/transparent"
         android:ems="10"
         android:focusable="false"
         android:inputType="none|text"
@@ -97,7 +98,6 @@
         android:text="请先阅读并同意相关协议"
         android:textAlignment="viewStart"
         android:textSize="14sp"
-        android:background="@android:color/transparent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/checkBoxAgree"
         app:layout_constraintRight_toRightOf="parent" />
diff --git a/app/src/main/res/layout/fragment_personal_info.xml b/app/src/main/res/layout/fragment_personal_info.xml
new file mode 100644
index 0000000..2392cb4
--- /dev/null
+++ b/app/src/main/res/layout/fragment_personal_info.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".ui.PersonalInfo">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:layout_height="match_parent"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="160dp"
+            android:background="@drawable/side_nav_bar"
+            android:gravity="bottom"
+
+            android:orientation="vertical"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/imageViewIcon"
+                    android:layout_width="99dp"
+                    android:layout_height="97dp"
+                    android:contentDescription="@string/nav_header_desc"
+                    android:paddingTop="@dimen/nav_header_vertical_spacing"
+                    tools:srcCompat="@drawable/icon4" />
+
+                <Spinner
+                    android:id="@+id/iconSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="25dp"
+                    android:paddingLeft="200dp"
+                    android:layout_gravity="right"
+                    android:layout_marginTop="20dp"
+                    android:background="@android:color/white"
+                    android:gravity="right|center_vertical" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvName"
+                android:layout_width="285dp"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/nav_header_vertical_spacing"
+                android:text="@string/nav_header_title"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        </LinearLayout>
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="昵称"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_nick"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="textPersonName" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="年龄"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tvAge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="text" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="性别"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tvGender"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="text" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="手机"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tvPhone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="phone" />
+
+                <ImageButton
+                    android:id="@+id/btnCheckPhone"
+                    android:layout_width="60dp"
+                    android:layout_height="40dp"
+                    app:srcCompat="@drawable/profile_phone" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="邮箱"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tvEmail"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="textEmailAddress" />
+
+                <ImageButton
+                    android:id="@+id/btnCheckEmail"
+                    android:layout_width="60dp"
+                    android:layout_height="40dp"
+                    app:srcCompat="@android:drawable/ic_dialog_email" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="密码"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tvPass"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="textPassword" />
+
+            </TableRow>
+
+        </TableLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btnSave"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="保存"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:ignore="MissingConstraints" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <TableLayout
+            android:id="@+id/panel_code"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/title_tv_code"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="left"
+                    android:padding="8dp"
+                    android:text="验证码"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tvCode"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="textPersonName" />
+
+                <ImageButton
+                    android:id="@+id/btnSendCode"
+                    android:layout_width="60dp"
+                    android:layout_height="40dp"
+                    app:srcCompat="@android:drawable/ic_menu_send" />
+
+            </TableRow>
+
+
+        </TableLayout>
+
+        <TextView
+            android:id="@+id/tvResult"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:gravity="left"
+            android:padding="8dp"
+            android:textColor="#000000"
+            android:textSize="18sp" />
+
+    </LinearLayout>
+
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
new file mode 100644
index 0000000..6e68c46
--- /dev/null
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.settingFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:clickable="false"
+            android:gravity="center"
+            android:padding="8dp"
+            android:text="不同模式的信号采集周期(秒)"
+            android:textColor="@color/black"
+            android:textSize="18sp" />
+
+
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/img_hike"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:background="@drawable/back_hike"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="3dp"
+                    android:src="@drawable/hike"
+                    app:srcCompat="@drawable/hike" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="徒步"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_hike"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ems="10"
+                    android:inputType="number"
+                    android:text="30" />
+
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/img_run"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:background="@drawable/back_run"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="3dp"
+                    app:srcCompat="@drawable/run" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="跑步"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_run"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ems="10"
+                    android:inputType="number"
+                    android:text="15" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/img_bike"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:background="@drawable/back_bike"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="3dp"
+                    app:srcCompat="@drawable/bike" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="骑车"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_bike"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ems="10"
+                    android:inputType="number"
+                    android:text="10" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/img_motor"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:background="@drawable/back_motor"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="3dp"
+                    app:srcCompat="@drawable/motorbike" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="摩托"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_motor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ems="10"
+                    android:inputType="number"
+                    android:text="5" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/img_car"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:background="@drawable/back_car"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="3dp"
+                    app:srcCompat="@drawable/car" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="自驾"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_car"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ems="10"
+                    android:inputType="number"
+                    android:text="5" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/img_lazy"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:background="@drawable/back_lasy"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="3dp"
+                    app:srcCompat="@drawable/lasy" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="节能"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_lasy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ems="10"
+                    android:inputType="number"
+                    android:text="300" />
+            </TableRow>
+
+
+        </TableLayout>
+
+
+
+        <View
+            android:id="@+id/view"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/default_neutral_lighter"
+            android:layout_marginTop="18dp"
+            android:layout_marginBottom="18dp"
+            />
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/img_refresh"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:background="@drawable/back_car"
+                    android:paddingLeft="3dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="3dp"
+                    android:paddingBottom="3dp"
+                    app:srcCompat="@drawable/msg_user_search" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:clickable="false"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="好友同步周期（秒）"
+                    android:textColor="#000000"
+                    android:textSize="18sp" />
+
+                <EditText
+                    android:id="@+id/tv_refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:ems="10"
+                    android:inputType="number"
+                    android:text="3" />
+            </TableRow>
+
+
+        </TableLayout>
+
+        <Button
+            android:id="@+id/btn_save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="保存" />
+
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 20a6fc2..e5a6f83 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/nav_header_height"
+    android:layout_height="196dp"
     android:background="@drawable/side_nav_bar"
     android:gravity="bottom"
     android:orientation="vertical"
@@ -12,6 +12,10 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
+
     <ImageView
         android:id="@+id/imageViewIcon"
         android:layout_width="99dp"
@@ -21,7 +25,7 @@
         app:srcCompat="@drawable/widget_avatar_2" />
 
     <TextView
-        android:id="@+id/textNick"
+        android:id="@+id/tvName"
         android:layout_width="285dp"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
diff --git a/app/src/main/res/layout/personal_setting.xml b/app/src/main/res/layout/personal_setting.xml
new file mode 100644
index 0000000..c55a930
--- /dev/null
+++ b/app/src/main/res/layout/personal_setting.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_height="match_parent"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/nav_header_height"
+        android:background="@drawable/side_nav_bar"
+        android:gravity="bottom"
+
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark">
+
+        <ImageView
+            android:id="@+id/imageViewIcon"
+            android:layout_width="99dp"
+            android:layout_height="97dp"
+            android:contentDescription="@string/nav_header_desc"
+            android:paddingTop="@dimen/nav_header_vertical_spacing"
+            app:srcCompat="@drawable/widget_avatar_2" />
+
+        <TextView
+            android:id="@+id/tvName"
+            android:layout_width="285dp"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/nav_header_vertical_spacing"
+            android:text="@string/nav_header_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+    </LinearLayout>
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:gravity="center"
+                android:padding="8dp"
+                android:text="昵称"
+                android:textColor="#000000"
+                android:textSize="18sp" />
+
+            <EditText
+                android:id="@+id/tv_nick"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="textPersonName"
+                android:text="Name" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:gravity="center"
+                android:padding="8dp"
+                android:text="年龄"
+                android:textColor="#000000"
+                android:textSize="18sp" />
+
+            <EditText
+                android:id="@+id/tvAge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="number" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:gravity="center"
+                android:padding="8dp"
+                android:text="手机"
+                android:textColor="#000000"
+                android:textSize="18sp" />
+
+            <EditText
+                android:id="@+id/tvPhone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="phone" />
+
+            <ImageButton
+                android:id="@+id/btnCheckPhone"
+                android:layout_width="60dp"
+                android:layout_height="40dp"
+                app:srcCompat="@drawable/profile_phone" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:gravity="center"
+                android:padding="8dp"
+                android:text="邮箱"
+                android:textColor="#000000"
+                android:textSize="18sp" />
+
+            <EditText
+                android:id="@+id/tvEmail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="textEmailAddress" />
+
+            <ImageButton
+                android:id="@+id/btnCheckEmail"
+                android:layout_width="60dp"
+                android:layout_height="40dp"
+                app:srcCompat="@android:drawable/ic_dialog_email" />
+
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:gravity="center"
+                android:padding="8dp"
+                android:text="密码"
+                android:textColor="#000000"
+                android:textSize="18sp" />
+
+            <EditText
+                android:id="@+id/tvPass"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="textPassword" />
+
+        </TableRow>
+
+    </TableLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/btnSave"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="保存"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="MissingConstraints" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:gravity="left"
+                android:padding="8dp"
+                android:text="验证码"
+                android:textColor="#000000"
+                android:textSize="18sp" />
+
+            <EditText
+                android:id="@+id/tvCode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="textPersonName"
+                android:text="Name" />
+
+            <ImageButton
+                android:id="@+id/btnSendCode"
+                android:layout_width="60dp"
+                android:layout_height="40dp"
+                app:srcCompat="@android:drawable/ic_menu_send" />
+
+        </TableRow>
+
+
+    </TableLayout>
+
+    <TextView
+        android:id="@+id/tvResult"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:clickable="false"
+        android:gravity="left"
+        android:padding="8dp"
+        android:text="验证结果"
+        android:textColor="#000000"
+        android:textSize="18sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/setting_server.xml b/app/src/main/res/layout/setting_server.xml
index d174968..0d525db 100644
--- a/app/src/main/res/layout/setting_server.xml
+++ b/app/src/main/res/layout/setting_server.xml
@@ -2,11 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/back_pop_win">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="200dp">
 
         <TextView
             android:id="@+id/tv_shema_title"
diff --git a/app/src/main/res/layout/spinner_drop_down.xml b/app/src/main/res/layout/spinner_drop_down.xml
new file mode 100644
index 0000000..0463612
--- /dev/null
+++ b/app/src/main/res/layout/spinner_drop_down.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@color/bottom_navigation_background"
+    android:orientation="horizontal"
+    android:padding="8dp">
+
+    <!-- 这是展示行星图标的ImageView -->
+    <ImageView
+        android:id="@+id/iv_icon"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_weight="1"
+        android:gravity="left" />
+
+
+    <!-- Use CheckedTextView or TextView -->
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="60dp"
+        android:ellipsize="marquee"
+        android:gravity="center_vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:textColor="@color/black" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/transparent_dropdown_item.xml b/app/src/main/res/layout/transparent_dropdown_item.xml
new file mode 100644
index 0000000..0ed9d46
--- /dev/null
+++ b/app/src/main/res/layout/transparent_dropdown_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- res/layout/transparent_dropdown_item.xml -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:background="@android:color/transparent"
+    android:textColor="@android:color/black"/>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 5e826e7..82e37de 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -38,12 +38,16 @@
             android:title="@string/menu_track" />
     </group>
     <group android:checkableBehavior="none">
+        <item
+            android:id="@+id/nav_me"
+            android:icon="@drawable/msg_usersearch"
+            android:title="个人信息" />
         <item
             android:id="@+id/nav_contract"
             android:icon="@drawable/ic_menu_gallery"
             android:title="@string/menu_contract" />
         <item
-            android:id="@+id/nav_setting"
+            android:id="@+id/settingFragment"
             android:icon="@drawable/msg_settings"
             android:title="@string/menu_setting" />
     </group>
diff --git a/app/src/main/res/menu/login_menu.xml b/app/src/main/res/menu/login_menu.xml
new file mode 100644
index 0000000..3a0d837
--- /dev/null
+++ b/app/src/main/res/menu/login_menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/server_settings"
+        android:icon="@drawable/msg_settings"
+        android:title="Settings"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 3b4c6ae..ade02bd 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -42,13 +42,19 @@
         android:label="@string/menu_contract"
         tools:layout="@layout/fragment_contract" />
 
-    <fragment
-        android:id="@+id/nav_setting"
-        android:name="com.bird2fish.travelbook.ui.setting.SettingsFragment"
-        android:label="@string/menu_setting" />
     <activity
         android:id="@+id/nav_map"
         android:name="com.bird2fish.travelbook.TencentMapActivity"
         android:label="activity_tencent_map"
         tools:layout="@layout/activity_tencent_map" />
+    <fragment
+        android:id="@+id/nav_me"
+        android:name="com.bird2fish.travelbook.ui.PersonalInfo"
+        android:label="fragment_personal_info"
+        tools:layout="@layout/fragment_personal_info" />
+    <fragment
+        android:id="@+id/settingFragment"
+        android:name="com.bird2fish.travelbook.ui.settingFragment"
+        android:label="fragment_setting"
+        tools:layout="@layout/fragment_setting" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 499b946..4464bef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,4 +90,6 @@
     <string name="start_to_motor">开始骑行</string>
     <string name="start_to_car">开始自驾</string>
     <string name="start_to_lasy">省电模式记录</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 489dfcf..146b31e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,9 +5,20 @@
         <item name="android:windowExitAnimation">@anim/pop_exit_animation</item>
     </style>
 
+    <style name="SpinnerDropdownStyle" parent="Widget.AppCompat.Spinner.DropDown">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
+
     <style name="AppThemeGrey" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- 添加以下两行 -->
         <item name="colorPrimary">@color/gray</item>
         <item name="colorPrimaryDark">@color/gray</item>
+        <item name="android:spinnerDropDownItemStyle">@style/SpinnerDropdownStyle</item>
     </style>
+
+    <!-- res/values/spinner_dropdown_style.xml -->
+
+
+
 </resources>
\ No newline at end of file