From 26d17696350730d99f6cb292660e4606bd351c93 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Sat, 17 Mar 2018 17:27:50 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                                               | 16 ++++++++--------
 app/src/main/java/com/shunzhi/parent/AppConfig.java                                            | 18 +++++++++---------
 app/src/main/java/com/shunzhi/parent/api/MineApi.java                                          |  2 +-
 app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java                        |  4 ++--
 app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java                              |  5 +++--
 app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java |  1 +
 app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java                      |  4 ++--
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java                |  4 ++--
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java          | 19 +++++++++++++------
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                             | 46 ++++++++++++++++++++++++++--------------------
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java          |  8 ++++++--
 app/src/main/res/drawable-xhdpi/user_imge_defult.png                                           | Bin 0 -> 4634 bytes
 app/src/main/res/layout/fragment_consult_two_level.xml                                         |  2 +-
 app/src/main/res/layout/fragment_mine.xml                                                      |  6 ++++--
 14 files changed, 78 insertions(+), 57 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/user_imge_defult.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 650def1..b21014e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,17 +64,17 @@
             android:name="com.amap.api.v2.apikey"
             android:value="1d130afb822d8a1019e6592cbaf10bcc" />
 
-        <activity android:name=".ui.activity.LoginAndRegistActivity">
+        <activity android:name=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.MainActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
+        <!--<activity-->
+            <!--android:name=".ui.MainActivity"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />-->
         <activity
             android:name=".ui.activity.MyChildActivity"
             android:screenOrientation="portrait" />
@@ -94,9 +94,9 @@
             android:name=".ui.activity.binding.SelectSchoolActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
-        <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" -->
-        <!-- android:screenOrientation="portrait" -->
-        <!-- /> -->
+         <activity android:name=".ui.activity.LoginAndRegistActivity"
+         android:screenOrientation="portrait"
+         />
         <activity
             android:name=".ui.activity.PersonInfoActivity"
             android:screenOrientation="portrait"
diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index c27bc85..64b6548 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -22,19 +22,19 @@ public class AppConfig {
     public static String USER_SEX = "user_sex";
     public static String USER_IMAGE = "user_image";
     public static String PARENT_ID = "parent_id";
+    public static boolean ISLOGIN = false;
 
-    public static  int   BINDING_SUCCESS_HEZUO = 1;
-    public static  int   BINDING_SUCCESS_NOT= 2;
-    public static  int   ORDER_CENTER = 3;
+    public static int BINDING_SUCCESS_HEZUO = 1;
+    public static int BINDING_SUCCESS_NOT = 2;
+    public static int ORDER_CENTER = 3;
 
-    public static String USER_ID="user_id";
-    public static String APP_IS_START="app_is_start";
+    public static String USER_ID = "user_id";
+    public static String APP_IS_START = "app_is_start";
 
     //http://campus.myjxt.com/
-    public static String BASE_URL="http://60.190.202.57:1000/";
-    public static String BASE_URL_IMG="http://60.190.202.57:1000";
-    public static String BASE_URL_ORDER="http://60.190.202.57:8101/";
-
+    public static String BASE_URL = "http://60.190.202.57:1000/";
+    public static String BASE_URL_IMG = "http://60.190.202.57:1000";
+    public static String BASE_URL_ORDER = "http://60.190.202.57:8101/";
 
 
     //默认日志保存的路径
diff --git a/app/src/main/java/com/shunzhi/parent/api/MineApi.java b/app/src/main/java/com/shunzhi/parent/api/MineApi.java
index 7db02b2..a33aa8e 100644
--- a/app/src/main/java/com/shunzhi/parent/api/MineApi.java
+++ b/app/src/main/java/com/shunzhi/parent/api/MineApi.java
@@ -32,7 +32,7 @@ public interface MineApi {
     @FormUrlEncoded
     @POST("/api/ParentHelper/BindlingChildren")
     Observable<JsonObject> addChildResult(
-            @Field("parentId") int parentId, @Field("mobileFlag") boolean mobileFlag, @Field("cooperateFlag") boolean cooperateFlag
+            @Field("sex") int sex ,@Field("studentName") String studentName ,@Field("parentId") int parentId, @Field("mobileFlag") boolean mobileFlag, @Field("cooperateFlag") boolean cooperateFlag
             , @Field("schoolId") int schoolId, @Field("classId") int classId, @Field("studentId") int studentId, @Field("studentUserId") String studentUserId);
 
     @GET("/api/ParentHelper/GetClassOrGrade")
diff --git a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
index 3883c58..9912039 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
@@ -21,7 +21,7 @@ public interface MyChildContract {
 
     abstract class MyChildPresenter extends BasePresenter<IMyChildModel, IMyChildView> {
         public abstract void loadChildList(String mobile, int school_id, String captcha);
-        public abstract  void addChild(int parentId, boolean mobileFlag,boolean cooperateFlag
+        public abstract  void addChild( int sex ,String studentName,int parentId, boolean mobileFlag,boolean cooperateFlag
                 , int schoolId,int classId,int studentId,String studentUserId);
         public abstract  void gradeAndClassResult(int state, int  schooId,int gradeId);
 
@@ -31,7 +31,7 @@ public interface MyChildContract {
 
     interface IMyChildModel extends IBaseModel {
         Observable<UserInfo> getUserInfo(String mobile, int school_id, String captcha);
-        Observable<JsonObject> addChildResult(int parentId, boolean mobileFlag,boolean cooperateFlag
+        Observable<JsonObject> addChildResult( int sex , String studentName,int parentId, boolean mobileFlag,boolean cooperateFlag
                 , int schoolId,int classId,int studentId,String studentUserId);
         Observable<GradeBean> getGradeAndClass(int state, int  schooId,int gradeId);
         Observable<JsonObject>unBinnding(int parentId,int studentId);
diff --git a/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java b/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java
index 2bbab02..4e0315d 100644
--- a/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/mine/MyChildModel.java
@@ -11,6 +11,7 @@ import com.shunzhi.parent.bean.UserInfo;
 import com.shunzhi.parent.contract.mine.MyChildContract;
 
 import io.reactivex.Observable;
+import retrofit2.http.Field;
 
 /**
  * Created by Administrator on 2018/3/8 0008.
@@ -30,9 +31,9 @@ public class MyChildModel extends BaseModel implements MyChildContract.IMyChildM
 
 
     @Override
-    public Observable<JsonObject> addChildResult(int parentId, boolean mobileFlag,boolean cooperateFlag
+    public Observable<JsonObject> addChildResult( int sex , String studentName,int parentId, boolean mobileFlag,boolean cooperateFlag
             , int schoolId,int classId,int studentId,String studentUserId) {
-        return RetrofitCreateHelper.getInstance().createApi(MineApi.class,MineApi.url).addChildResult(parentId,mobileFlag,cooperateFlag,schoolId
+        return RetrofitCreateHelper.getInstance().createApi(MineApi.class,MineApi.url).addChildResult(sex ,studentName,parentId,mobileFlag,cooperateFlag,schoolId
         ,classId,studentId,studentUserId).compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index b9c5c57..75d1836 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -47,6 +47,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString());
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, loginName);
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, loginPwd);
+                        AppConfig.ISLOGIN = true;
                         RetrofitCreateHelper.getInstance().setAuthorization("Bearer " + jsonObject.get("access_token").getAsString());
                         getUserInfo(loginName, 0, "");
                     } else {
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
index c53477c..611efb6 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
@@ -64,8 +64,8 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
     }
 
     @Override
-    public void addChild(int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
-        mRxManager.register(mIModel.addChildResult(parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
+    public void addChild( int sex , String studentName,int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
+        mRxManager.register(mIModel.addChildResult(sex,studentName,parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 ToastUtils.showToast("绑定孩子成功");
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
index 7b25afd..473787c 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
@@ -82,9 +82,9 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
         if (!TextUtils.isEmpty(child_name.getText()) && !TextUtils.isEmpty(child_sex.getText())
                 && !TextUtils.isEmpty(child_grade.getText()) && !TextUtils.isEmpty(child_class.getText())) {
             if (isNew == 0) {
-                mPresenter.addChild(Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), true, true, 0, 0, studentId,"");
+                mPresenter.addChild(0,"",Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), true, true, 0, 0, studentId,"");
             } else {
-                mPresenter.addChild(Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), false, true, 0, classId, studentId, "");
+                mPresenter.addChild(0,"",Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID)), false, true, 0, classId, studentId, "");
             }
         } else {
             final PopupWindow popupWindow = new PopupWindow();
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
index 4ad17d4..e52fd64 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
@@ -62,6 +63,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
             }
         });
         add_child = findViewById(R.id.add_child);
+        add_child.setOnClickListener(this);
         child_name = findViewById(R.id.child_name);
         select_sex = findViewById(R.id.select_sex);
         select_grade = findViewById(R.id.select_grade);
@@ -70,6 +72,8 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
         select_grade.setOnClickListener(this);
         select_class.setOnClickListener(this);
         registerForContextMenu(select_sex);
+        registerForContextMenu(select_grade);
+        registerForContextMenu(select_class);
         sexList.add("男");
         sexList.add("女");
 
@@ -90,7 +94,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
         if (v == add_child) {
             if (!TextUtils.isEmpty(child_name.getText()) && !TextUtils.isEmpty(select_sex.getText())
                     && !TextUtils.isEmpty(select_grade.getText()) && !TextUtils.isEmpty(select_class.getText())) {
-                mPresenter.addChild(Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID))
+                mPresenter.addChild(sexId,child_name.getText().toString(),Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID))
                         , true, false, school_id, classId, 0, "");
             } else {
                 ToastUtils.showToast("请填写完整的孩子信息");
@@ -128,19 +132,22 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
 
     @Override
     public void addChildSuccess() {
-        startActivity(new Intent().setClass(CreateChildInfoActivity.this, MyChildActivity.class));
+        startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CreateChildInfoActivity.this, MyChildActivity.class));
         finish();
     }
 
     @Override
     public void showClass(List<ChildClass> list) {
         if (list.size() > 0 && list != null) {
+            Log.e("111-===",list.get(0).getGradeName());
             if (list.get(0).getGradeId() == 0) {
                 //班级列表
-                classList = list;
+                classList.clear();
+                classList.addAll(list);
             } else {
                 //年级列表
-                gradeList = list;
+                gradeList.clear();
+                gradeList.addAll(list);
             }
 
         }
@@ -175,7 +182,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
         } else if (type == 1) {
             for (int i = 0; i < gradeList.size(); i++) {
                 try {
-                    final String title = gradeList.get(i).getClassName();
+                    final String title = gradeList.get(i).getGradeName();
                     menu.add(0, i, 0, title).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                         @Override
                         public boolean onMenuItemClick(MenuItem item) {
@@ -192,7 +199,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
         } else if (type == 2) {
             for (int i = 0; i < classList.size(); i++) {
                 try {
-                    final String title = classList.get(i).getGradeName();
+                    final String title = classList.get(i).getClassName();
                     menu.add(0, i, 0, title).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                         @Override
                         public boolean onMenuItemClick(MenuItem item) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index 3532c22..dca55ac 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -20,14 +20,15 @@ import com.shunzhi.parent.R;
 import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
 import com.shunzhi.parent.contract.mine.MineContract;
 import com.shunzhi.parent.presenter.mine.MinePresenter;
+import com.shunzhi.parent.ui.activity.LoginAndRegistActivity;
 import com.shunzhi.parent.ui.activity.MyChildActivity;
 import com.shunzhi.parent.ui.activity.PersonInfoActivity;
-import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
+import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
 
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo,layout_orderDetail,layout_order;
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order;
     RoundedImageView user_photo;
     TextView user_name, user_mobile;
 
@@ -46,8 +47,8 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         childlayout = view.findViewById(R.id.childlayout);
         personinfo = view.findViewById(R.id.personinfo);
-        layout_order=view.findViewById(R.id.layout_order);
-        layout_orderDetail=view.findViewById(R.id.layout_orderDetail);
+        layout_order = view.findViewById(R.id.layout_order);
+        layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
         childlayout.setOnClickListener(this);
         personinfo.setOnClickListener(this);
         layout_order.setOnClickListener(this);
@@ -59,19 +60,21 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
     }
 
     private void setPersonInfo() {
-        String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
-        ToastUtils.showToast(url);
-        if (!TextUtils.isEmpty(url)) {
-            Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
-        } else {
-            Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);
+        if (AppConfig.ISLOGIN) {
+            String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
+            ToastUtils.showToast(url);
+            if (!TextUtils.isEmpty(url)) {
+                Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
+            } else {
+                Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);
+                user_photo.setCornerRadius(20);
+            }
             user_photo.setCornerRadius(20);
+            user_photo.setOval(true);
+            user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
+            user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
+            user_mobile.setVisibility(View.VISIBLE);
         }
-        user_photo.setCornerRadius(20);
-        user_photo.setOval(true);
-        user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
-        user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
-
     }
 
 
@@ -82,16 +85,19 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
                 startActivity(new Intent().setClass(getActivity(), MyChildActivity.class));
                 break;
             case R.id.personinfo:
-                startActivity(new Intent().setClass(getActivity(), PersonInfoActivity.class));
+                if (AppConfig.ISLOGIN)
+                    startActivity(new Intent().setClass(getActivity(), PersonInfoActivity.class));
+                else
+                    startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
                 break;
             case R.id.layout_orderDetail:
                 startNewActivity(OrderDetailActivity.class);
                 break;
             case R.id.layout_order:
-                Bundle bundle=new Bundle();
-                bundle.putString("url",AppConfig.BASE_URL_ORDER+"ParentOrderCenter.aspx?userid="+
-                AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
-                startNewActivity(WebViewActivity.class,bundle);
+                Bundle bundle = new Bundle();
+                bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
+                        AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+                startNewActivity(WebViewActivity.class, bundle);
                 break;
             default:
                 break;
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
index ebf470e..bfd030f 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
@@ -23,7 +23,6 @@ import com.share.mvpsdk.utils.DisplayUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.adapter.MyConsultAdapter;
-import com.shunzhi.parent.bean.GrallyBean;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.MyConsultBean;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
@@ -126,6 +125,11 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
         initRecyclerView(guangGaoBeanList);
     }
 
+    @Override
+    public void showConsultContent() {
+
+    }
+
     private class MyGrallyAdapter extends BaseRecyclerViewAdapter<GuangGaoBean> {
         @Override
         public void onAttachedToRecyclerView(RecyclerView recyclerView) {
@@ -162,7 +166,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
             public void onBindViewHolder(GuangGaoBean object, int position) {
                 Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG+object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
 //                iv_grally.setImageResource(R.drawable.ic_launcher_background);
-                tv_grally_title.setText(object.describe);
+                tv_grally_title.setText(object.describe+"");
             }
         }
     }
diff --git a/app/src/main/res/drawable-xhdpi/user_imge_defult.png b/app/src/main/res/drawable-xhdpi/user_imge_defult.png
new file mode 100644
index 0000000..32299b7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/user_imge_defult.png differ
diff --git a/app/src/main/res/layout/fragment_consult_two_level.xml b/app/src/main/res/layout/fragment_consult_two_level.xml
index 653f915..ae38f37 100644
--- a/app/src/main/res/layout/fragment_consult_two_level.xml
+++ b/app/src/main/res/layout/fragment_consult_two_level.xml
@@ -25,4 +25,4 @@
         android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
 
 
-</>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 8ed8221..2343663 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -40,7 +40,7 @@
                     android:layout_width="60dp"
                     android:layout_height="60dp"
                     android:layout_margin="20dp"
-                    android:src="@color/white"
+                    android:src="@drawable/user_imge_defult"
                     app:riv_corner_radius="10dp" />
 
                 <LinearLayout
@@ -48,13 +48,14 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="25dp"
                     android:layout_weight="1"
+                    android:gravity="center_vertical"
                     android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/user_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="马铂賽"
+                        android:text="登录/注册"
                         android:textColor="@color/white"
                         android:textSize="@dimen/txtsize_headline" />
 
@@ -65,6 +66,7 @@
                         android:text="账号：12345678991"
                         android:textColor="@color/white"
                         android:textSize="@dimen/txtsize_title"
+                        android:visibility="gone"
 
                         />
 
--
libgit2 0.21.0