diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index a135915..b2ef457 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java
index a535819..6cf58c4 100644
--- a/app/src/main/java/com/shunzhi/parent/AppContext.java
+++ b/app/src/main/java/com/shunzhi/parent/AppContext.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
@@ -209,16 +210,22 @@ public class AppContext extends GlobalApplication {
         @Override
         public void onLocationChanged(AMapLocation aMapLocation) {
             if (null != aMapLocation) {
-
                 if (aMapLocation.getErrorCode() == 0) {
-                    cityName = aMapLocation.getCity();
-                    district = aMapLocation.getDistrict();
-                    aMapLocation.getCityCode();
+                    String currName = AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT);
+                    Log.e("11111", currName);
+                    if (currName != null && !"定位失败".equals(currName) &&! "".equals(currName)) {
+                        district = AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT);
+                    } else {
+                        cityName = aMapLocation.getCity();
+                        district = aMapLocation.getDistrict();
+                        aMapLocation.getCityCode();
+                    }
+                    AppConfig.getAppConfig(getContext()).set(AppConfig.DISTRICT, district);
                     Intent intent = new Intent();
                     intent.setAction(LOCATION_CITYNAME + "");
                     sendBroadcast(intent);
+                    Log.e("11111", "222222");
                     stopLocation();
-                    AppConfig.getAppConfig(getContext()).set(AppConfig.DISTRICT, district);
                 } else {
                     cityName = "定位失败";
                     district = "定位失败";
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
index d24c988..e1732a6 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
@@ -26,9 +27,10 @@ import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter;
 public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract.PersonInfoPresenter, PersonInfoContract.IPersonInfoModel>
         implements PersonInfoContract.IPersonInfoView, View.OnClickListener {
     RoundedImageView user_image;
-    TextView user_name, user_mobile, change_info;
+    TextView user_name, user_mobile, change_info, center_title;
     EditText et_name;
     RadioButton man, women;
+    ImageView top_back;
 
 
     @NonNull
@@ -48,6 +50,11 @@ public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract
         women = findViewById(R.id.women);
         change_info = findViewById(R.id.change_info);
         change_info.setOnClickListener(this);
+        center_title = findViewById(R.id.center_title);
+        center_title.setText("个人资料");
+        top_back = findViewById(R.id.back_top);
+        top_back.setOnClickListener(this);
+
         initInfo();
 
 
@@ -100,6 +107,9 @@ public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract
 
             mPresenter.ChangeInfoResult(et_name.getText().toString().trim(), sex, user_mobile.getText().toString().trim());
 
+        } else if (v == top_back) {
+            finish();
+
         }
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index 812c3d1..5726c09 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -11,7 +11,6 @@ import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.v4.widget.NestedScrollView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -84,10 +83,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
 
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
-
         recycler_context = view.findViewById(R.id.recycler_content);
-        initRecycler();
-
         nesteScrollView = view.findViewById(R.id.nesteScrollView);
         ivSearch = view.findViewById(R.id.ivSearch);
         xBanner = view.findViewById(R.id.xBanner);
@@ -100,11 +96,10 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         videoplayer.batteryLevel.setVisibility(View.GONE);
         videoplayer.replayTextView.setVisibility(View.GONE);
         videoplayer.backButton.setVisibility(View.GONE);
-
         mPresenter.getBanners("2", AppContext.getInstance().district);
 
         initBroadCast();
-
+        initRecycler();
         initListeners();
 
         layout_consult.measure(0, 0);
@@ -124,7 +119,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
                 //refresh data here
                 pageIndex = 1;
                 contextList.clear();
-                mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex);
+                mPresenter.getContextChannel(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.DISTRICT), 0, 1, pageIndex);
                 recycler_context.refreshComplete();
             }
 
@@ -132,12 +127,12 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
             public void onLoadMore() {
                 // load more data here
                 pageIndex = pageIndex + 1;
-                mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex);
+                mPresenter.getContextChannel(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.DISTRICT), 0, 1, pageIndex);
                 recycler_context.refreshComplete();
             }
         });
         pageIndex = 1;
-        mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex);
+        mPresenter.getContextChannel(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.DISTRICT), 0, 1, pageIndex);
     }
 
     private void initListeners() {
@@ -206,7 +201,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     }
 
     private void initBroadCast() {
-
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(AppContext.LOCATION_CITYNAME + "");
         getActivity().registerReceiver(broadcastReceiver, intentFilter);
@@ -301,6 +295,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         mPresenter.getContextChannel(name.split(" ")[2], 0, 1, 1);
         AppContext.getInstance().cityName = name.split(" ")[1];
         AppContext.getInstance().district = name.split(" ")[2];
+        AppConfig.getAppConfig(getContext()).set(AppConfig.DISTRICT, name.split(" ")[2]);
     }
 
     public void refresh() {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
index 0199cee..fc8fdc7 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -243,7 +243,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
         @Override
         public CharSequence getPageTitle(int position) {
             if (position==0){
-                return "成长";
+                return "应用";
             }else {
                 return "报告";
             }
diff --git a/app/src/main/res/layout/activity_personinfo.xml b/app/src/main/res/layout/activity_personinfo.xml
index 16f3fb8..27f3721 100644
--- a/app/src/main/res/layout/activity_personinfo.xml
+++ b/app/src/main/res/layout/activity_personinfo.xml
@@ -26,18 +26,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="200dp"
                     android:background="@drawable/backgroud_top"
-                    android:orientation="vertical"
-                    >
+                    android:orientation="vertical">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="?android:actionBarSize"
-                        android:background="@color/back_top"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="个人资料"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/txtsize_headline" />
+                    <include layout="@layout/top" />
 
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 4f5efbf..26e155f 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -27,7 +27,7 @@
                 android:gravity="center"
                 android:text="个人中心"
                 android:textColor="@color/white"
-                android:textSize="@dimen/txtsize_headline" />
+                android:textSize="@dimen/sp_18" />
 
             <LinearLayout
                 android:id="@+id/personinfo"
diff --git a/app/src/main/res/layout/top.xml b/app/src/main/res/layout/top.xml
index 5305e79..dc40bec 100644
--- a/app/src/main/res/layout/top.xml
+++ b/app/src/main/res/layout/top.xml
@@ -24,7 +24,7 @@
         android:text="主题"
         android:gravity="center"
         android:textColor="@color/white"
-        android:textSize="@dimen/textSize16" />
+        android:textSize="@dimen/textSize18" />
     <TextView
         android:layout_width="30dp"
         android:layout_height="30dp"
--
libgit2 0.21.0