Selaa lähdekoodia

修改学生信息和测试反馈的问题

316044749 7 vuotta sitten
vanhempi
commit
311b5d5ac8

+ 16 - 7
app/src/main/java/com/ynstkz/shitu/android/activity/AlterPhoneNumberCheckActivity.java

@@ -3,6 +3,7 @@ package com.ynstkz.shitu.android.activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -63,13 +64,21 @@ public class AlterPhoneNumberCheckActivity extends TitleBarActivity implements C
     }
 
     private void setListener(){
-        String verifyCode = editVerifyCode.getText().toString().trim();
-        if(TextUtils.isEmpty(verifyCode)){
-            showToast("验证码不能为空");
-            return;
-        }
-        STSign.getInstance().checkVerifycode(4, phoneNumber,
-                verifyCode, AlterPhoneNumberCheckActivity.this);
+        /**
+         * 提交
+         */
+        btnSubmit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String verifyCode = editVerifyCode.getText().toString().trim();
+                if(TextUtils.isEmpty(verifyCode)){
+                    showToast("验证码不能为空");
+                    return;
+                }
+                STSign.getInstance().checkVerifycode(4, phoneNumber,
+                        verifyCode, AlterPhoneNumberCheckActivity.this);
+            }
+        });
     }
 
     @Override

+ 58 - 24
app/src/main/java/com/ynstkz/shitu/android/activity/RegisterSubmitActivity.java

@@ -1,5 +1,6 @@
 package com.ynstkz.shitu.android.activity;
 
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -7,6 +8,7 @@ import android.text.TextUtils;
 import android.util.Patterns;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -47,6 +49,10 @@ public class RegisterSubmitActivity extends TitleBarActivity {
     EditText editPasswordAgain;
     @Bind(R.id.btn_register)
     Button btnRegister;
+    @Bind(R.id.cb_agree)
+    CheckBox cbAgree;
+    @Bind(R.id.tv_agreement)
+    TextView tvAgreement;
 
     private String phoneNumber;
     private String thirdId;
@@ -70,18 +76,28 @@ public class RegisterSubmitActivity extends TitleBarActivity {
         return R.layout.activity_register_submint;
     }
 
-    private void initView(){
+    private void initView() {
 
     }
 
-    private void initData(){
+    private void initData() {
         phoneNumber = getIntent().getStringExtra("phoneNumber");
         thirdId = getIntent().getStringExtra("thirdId");
         thirdType = getIntent().getStringExtra("thirdType");
         code = getIntent().getStringExtra("code");
     }
 
-    private void setListener(){
+    private void setListener() {
+
+        /**
+         * 关闭
+         */
+        ivCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
 
         /**
          * 注册
@@ -89,24 +105,40 @@ public class RegisterSubmitActivity extends TitleBarActivity {
         btnRegister.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                if(!cbAgree.isChecked()) {
+                    showToast("请阅读并同意注册协议");
+                    return;
+                }
                 String userName = editUsername.getText().toString().trim();
                 String pwd = editPassword.getText().toString().trim();
                 String rePwd = editPasswordAgain.getText().toString().trim();
-                if(verifyData(phoneNumber, userName, pwd, rePwd)){
+                if (verifyData(phoneNumber, userName, pwd, rePwd)) {
                     register(phoneNumber, userName, pwd, rePwd, code);
                 }
             }
         });
+
+        /**
+         *登陆
+         */
+        tvLogin.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(RegisterSubmitActivity.this, LoginActivity.class));
+                finish();
+            }
+        });
     }
 
     /**
      * 注册
+     *
      * @param mobile
      * @param userName
      * @param pwd
      * @param rePwd
      */
-    private void register(String mobile, String userName, String pwd, final String rePwd, String code){
+    private void register(String mobile, String userName, String pwd, final String rePwd, String code) {
 
         RequestGroup.register(mobile, userName, pwd, rePwd, code, new Callback() {
             @Override
@@ -121,21 +153,20 @@ public class RegisterSubmitActivity extends TitleBarActivity {
 
             @Override
             public void onResponse(Object response, int id) {
-                RegisterBean bean = (RegisterBean)response;
-                if(bean != null){
-                    if("200".equals(bean.getCode())){
-                        if(bean.getData() != null){
+                RegisterBean bean = (RegisterBean) response;
+                if (bean != null) {
+                    if ("200".equals(bean.getCode())) {
+                        if (bean.getData() != null) {
 
                             SharedPreferencesUtils.setLogin(true);
-                            EventBus.getDefault().post(new RegisterSuccessEvent());
-                            showToast(bean.getMsg());
-
                             SharedPreferencesUtils.saveToken(bean.getData().getToken());
                             SharedPreferencesUtils.saveUserId(bean.getData().getUserId());
 
-                            if(!TextUtils.isEmpty(thirdId) && !TextUtils.isEmpty(thirdType)){
+                            if (!TextUtils.isEmpty(thirdId) && !TextUtils.isEmpty(thirdType)) {
                                 thirdBind(thirdId, thirdType);
                             } else {
+                                EventBus.getDefault().post(new RegisterSuccessEvent());
+                                showToast(bean.getMsg());
                                 finish();
                             }
                         }
@@ -149,34 +180,35 @@ public class RegisterSubmitActivity extends TitleBarActivity {
 
     /**
      * 校验数据
+     *
      * @param mobile
      * @param userName
      * @param pwd
      * @param rePwd
      * @return
      */
-    private boolean verifyData(String mobile, String userName, String pwd, String rePwd){
-        if(TextUtils.isEmpty(mobile)){
+    private boolean verifyData(String mobile, String userName, String pwd, String rePwd) {
+        if (TextUtils.isEmpty(mobile)) {
             showToast("手机号码不能为空!");
             return false;
         }
-        if(!Patterns.PHONE.matcher(mobile).matches()){
+        if (!Patterns.PHONE.matcher(mobile).matches()) {
             showToast("手机号码不正确!");
             return false;
         }
-        if(TextUtils.isEmpty(userName)){
+        if (TextUtils.isEmpty(userName)) {
             showToast("用户名不能为空!");
             return false;
         }
-        if(TextUtils.isEmpty(pwd)){
+        if (TextUtils.isEmpty(pwd)) {
             showToast("密码不能为空!");
             return false;
         }
-        if(TextUtils.isEmpty(rePwd)){
+        if (TextUtils.isEmpty(rePwd)) {
             showToast("确认密码不能为空!");
             return false;
         }
-        if(!pwd.equals(rePwd)){
+        if (!pwd.equals(rePwd)) {
             showToast("密码输入不一致");
             return false;
         }
@@ -185,10 +217,11 @@ public class RegisterSubmitActivity extends TitleBarActivity {
 
     /**
      * 三方账号绑定
+     *
      * @param thirdId
      * @param thirdType
      */
-    private void thirdBind(String thirdId, String thirdType){
+    private void thirdBind(String thirdId, String thirdType) {
 
         RequestGroup.thirdBind(thirdId, thirdType, new Callback() {
             @Override
@@ -204,9 +237,10 @@ public class RegisterSubmitActivity extends TitleBarActivity {
 
             @Override
             public void onResponse(Object response, int id) {
-                BaseBean baseBean = (BaseBean)response;
-                if(baseBean != null){
-                    if("200".equals(baseBean.getCode())){
+                BaseBean baseBean = (BaseBean) response;
+                if (baseBean != null) {
+                    if ("200".equals(baseBean.getCode())) {
+                        EventBus.getDefault().post(new RegisterSuccessEvent());
                         finish();
                     }
                     showToast(baseBean.getMsg());

+ 90 - 7
app/src/main/java/com/ynstkz/shitu/android/activity/StudentInfoActivity.java

@@ -11,6 +11,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -20,10 +21,13 @@ import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.LocalCityBean;
+import com.ynstkz.shitu.android.bean.StudentFamilyInfoBean;
+import com.ynstkz.shitu.android.bean.StudentInfoAddBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.view.ScrollViewWithGridView;
 
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
@@ -93,6 +97,7 @@ public class StudentInfoActivity extends TitleBarActivity {
     @Bind(R.id.btn_save)
     Button btnSave;
 
+    //学生信息
     private String birthday;
     private int sex;
     private String residenceProvinceId = "30";
@@ -103,6 +108,9 @@ public class StudentInfoActivity extends TitleBarActivity {
     private String livingCityId;
     private String livingRegionId;
 
+    //家庭成员信息
+    private List<StudentFamilyInfoBean> listStudentFamilyInfo;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -118,13 +126,11 @@ public class StudentInfoActivity extends TitleBarActivity {
 
     private void initView() {
         tvTitle.setText("学生信息");
-        llMemberFamily.removeAllViews();
-        View familyView = LayoutInflater.from(this).inflate(R.layout.item_student_family, null);
-        llMemberFamily.addView(familyView);
+        initFamilyInfo();
     }
 
     private void initData() {
-
+        listStudentFamilyInfo = new ArrayList<>();
     }
 
     private void setListener() {
@@ -365,6 +371,9 @@ public class StudentInfoActivity extends TitleBarActivity {
         });
     }
 
+    /**
+     * 保存学生信息
+     */
     private void saveApplyStudentInfo(String studentName, String birthday, String sex, String ethnic, String nativePlace, String residenceProvinceId,
                                       String residenceCityId, String residenceRegionId, String residenceType, String height, String weight,
                                       String bloodType, String physicalExamination, String idCardNum, String livingProvinceId, String livingCityId,
@@ -375,19 +384,93 @@ public class StudentInfoActivity extends TitleBarActivity {
                 hobby, new Callback() {
                     @Override
                     public Object parseNetworkResponse(Response response, int id) throws Exception {
-                        return null;
+                        return new Gson().fromJson(response.body().string(), StudentInfoAddBean.class);
                     }
 
                     @Override
                     public void onError(Call call, Exception e, int id) {
-
+                        showToast(getString(R.string.error_msg));
                     }
 
                     @Override
                     public void onResponse(Object response, int id) {
-
+                        StudentInfoAddBean studentInfoAddBean = (StudentInfoAddBean)response;
+                        if(studentInfoAddBean != null) {
+                            if("200".equals(studentInfoAddBean.getCode())){
+                                saveApplyFamilyInfo();
+                            } else {
+                                showToast(studentInfoAddBean.getMsg());
+                            }
+                        }
                     }
                 });
 
     }
+
+    /**
+     * 保存家庭成员信息
+     */
+    private void saveApplyFamilyInfo(){
+        if(llMemberFamily.getChildCount() > 0) {
+            for (int i=0; i<llMemberFamily.getChildCount(); i++) {
+                StudentFamilyInfoBean studentFamilyInfoBean = new StudentFamilyInfoBean();
+                studentFamilyInfoBean.setFamilyName("");
+                studentFamilyInfoBean.setFamilyId("");
+                studentFamilyInfoBean.setFamilyPhone("");
+                studentFamilyInfoBean.setJob("");
+                studentFamilyInfoBean.setRemark("");
+                studentFamilyInfoBean.setStudentInfoId("");
+                studentFamilyInfoBean.setUserId("");
+                listStudentFamilyInfo.add(studentFamilyInfoBean);
+            }
+        }
+
+        RequestGroup.applyFamilyInfo(listStudentFamilyInfo, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), StudentInfoAddBean.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                showToast(getString(R.string.error_msg));
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                StudentInfoAddBean studentInfoAddBean = (StudentInfoAddBean)response;
+                if(studentInfoAddBean != null) {
+                    if("200".equals(studentInfoAddBean.getCode())){
+                        saveApplyFamilyInfo();
+                    } else {
+                        showToast(studentInfoAddBean.getMsg());
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * 初始化家庭成员信息
+     */
+    private void initFamilyInfo(){
+        llMemberFamily.removeAllViews();
+        View familyView = LayoutInflater.from(this).inflate(R.layout.item_student_family, null);
+        TextView tvFamilyLab = familyView.findViewById(R.id.tv_family_lab);
+        tvFamilyLab.setText("家庭成员1");
+        ImageView ivFamilyAdd = familyView.findViewById(R.id.iv_family_add);
+        ivFamilyAdd.setVisibility(View.VISIBLE);
+        //添加成员
+        ivFamilyAdd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                View familyView = LayoutInflater.from(StudentInfoActivity.this).inflate(R.layout.item_student_family, null);
+                TextView tvFamilyLab = familyView.findViewById(R.id.tv_family_lab);
+                llMemberFamily.addView(familyView);
+                tvFamilyLab.setText("家庭成员" + llMemberFamily.getChildCount());
+            }
+        });
+        llMemberFamily.addView(familyView);
+    }
+
 }

+ 5 - 0
app/src/main/java/com/ynstkz/shitu/android/adapter/OrgCommentListAdapter.java

@@ -11,9 +11,11 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.common.library.adapter.CCAdapterHolder;
 import com.common.library.adapter.CCListAdapter;
+import com.common.library.utils.DateUtil;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.bean.EvaluateListBean;
 
+import java.util.Date;
 import java.util.List;
 
 import me.zhanghai.android.materialratingbar.MaterialRatingBar;
@@ -45,6 +47,7 @@ public class OrgCommentListAdapter extends CCListAdapter<EvaluateListBean>{
 
             ImageView ivIcon;
             TextView tvUsername;
+            TextView tvCtime;
             MaterialRatingBar rbScore;
             TextView tvContent;
             GridView gvCommentPic;
@@ -59,6 +62,7 @@ public class OrgCommentListAdapter extends CCListAdapter<EvaluateListBean>{
                 ivIcon = convertView.findViewById(R.id.iv_icon);
                 tvUsername = convertView.findViewById(R.id.tv_username);
                 rbScore = convertView.findViewById(R.id.rb_score);
+                tvCtime = convertView.findViewById(R.id.tv_ctime);
                 tvContent = convertView.findViewById(R.id.tv_content);
                 gvCommentPic = convertView.findViewById(R.id.gv_comment_pic);
             }
@@ -73,6 +77,7 @@ public class OrgCommentListAdapter extends CCListAdapter<EvaluateListBean>{
                 tvUsername.setText(content.getUserName());
                 rbScore.setProgress(content.getScore());
                 tvContent.setText(content.getContent());
+                tvCtime.setText(DateUtil.format(new Date(content.getCreateTime()),DateUtil.DATE_TIME_FORMAT_YYYY年MM月DD日));
                 if(content.getEvaluatePicList() != null && content.getEvaluatePicList().size() > 0) {
                     gvCommentPic.setVisibility(View.VISIBLE);
                     OrgDetailCommentPicAdapter orgCommentPicAdapter = new OrgDetailCommentPicAdapter(context, content.getEvaluatePicList());

+ 105 - 0
app/src/main/java/com/ynstkz/shitu/android/bean/StudentFamilyInfoBean.java

@@ -0,0 +1,105 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+/**
+ * 作者:fuchangle on 2018/4/19 11:06
+ */
+
+public class StudentFamilyInfoBean extends BaseBean{
+
+
+    /**
+     * familyName :
+     * relationShip :
+     * familyPhone :
+     * job :
+     * jobAddress :
+     * remark :
+     * familyId : 0
+     * studentInfoId : 63
+     * userId : 36
+     */
+
+    private String familyName;
+    private String relationShip;
+    private String familyPhone;
+    private String job;
+    private String jobAddress;
+    private String remark;
+    private String familyId;
+    private String studentInfoId;
+    private String userId;
+
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    public void setFamilyName(String familyName) {
+        this.familyName = familyName;
+    }
+
+    public String getRelationShip() {
+        return relationShip;
+    }
+
+    public void setRelationShip(String relationShip) {
+        this.relationShip = relationShip;
+    }
+
+    public String getFamilyPhone() {
+        return familyPhone;
+    }
+
+    public void setFamilyPhone(String familyPhone) {
+        this.familyPhone = familyPhone;
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public void setJob(String job) {
+        this.job = job;
+    }
+
+    public String getJobAddress() {
+        return jobAddress;
+    }
+
+    public void setJobAddress(String jobAddress) {
+        this.jobAddress = jobAddress;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getFamilyId() {
+        return familyId;
+    }
+
+    public void setFamilyId(String familyId) {
+        this.familyId = familyId;
+    }
+
+    public String getStudentInfoId() {
+        return studentInfoId;
+    }
+
+    public void setStudentInfoId(String studentInfoId) {
+        this.studentInfoId = studentInfoId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}

+ 20 - 0
app/src/main/java/com/ynstkz/shitu/android/bean/StudentInfoAddBean.java

@@ -0,0 +1,20 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+/**
+ * 作者:fuchangle on 2018/4/19 10:41
+ */
+
+public class StudentInfoAddBean extends BaseBean{
+
+    private int data;
+
+    public int getData() {
+        return data;
+    }
+
+    public void setData(int data) {
+        this.data = data;
+    }
+}

+ 2 - 2
app/src/main/java/com/ynstkz/shitu/android/common/Constants.java

@@ -24,9 +24,9 @@ public class Constants {
 
     public static final String QQ_KEY = "aREJsqSU3Ep4msfM";
 
-    public static final String WX_KEY = "wxdef12ce6777b9477";
+    public static final String WX_KEY = "wx463ba00e2ba57243";
 
-    public static final String WX_SECRET = "7854e61bf525343f98abea8a6c4f42f0";
+    public static final String WX_SECRET = "387f3a5d418bd013a015598df8e9f3d3";
 
     public static final String SINA_KEY = "3644208114";
 

+ 9 - 0
app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -7,12 +7,14 @@ import com.common.library.okhttp.OkHttpUtils;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.application.STSign;
+import com.ynstkz.shitu.android.bean.StudentFamilyInfoBean;
 import com.ynstkz.shitu.android.bean.UserInfoBean;
 import com.ynstkz.shitu.android.common.Constants;
 
 import java.io.File;
 import java.net.URL;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -496,4 +498,11 @@ public class RequestGroup {
         params.put("nickName", nickName);
         OkHttpUtils.postString().url(UrlCat.URL_THIRD_REGIST).content(new Gson().toJson(params)).build().execute(callback);
     }
+
+    /**
+     * 报名-家庭成员信息
+     */
+    public static void applyFamilyInfo(List<StudentFamilyInfoBean> listStudentFamily, Callback callback){
+        OkHttpUtils.postString().url(UrlCat.URL_APPLY_FAMILY).content(new Gson().toJson(listStudentFamily)).build().execute(callback);
+    }
 }

+ 5 - 0
app/src/main/java/com/ynstkz/shitu/android/data/UrlCat.java

@@ -200,6 +200,11 @@ public class UrlCat {
      * 新用户第三方登录默认注册,默认密码888888
      */
     public static final String URL_THIRD_REGIST = HOST + "api/third/reg";
+
+    /**
+     * 家庭成员信息
+     */
+    public static final String URL_APPLY_FAMILY = HOST + "api/apply/family/info";
 }
 
 

BIN
app/src/main/res/drawable-xxhdpi/family_info_add_icon.png


+ 28 - 0
app/src/main/res/layout/activity_register_submint.xml

@@ -96,6 +96,34 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/company_10dp">
+
+        <CheckBox
+            android:id="@+id/cb_agree"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:theme="@style/Color1SwitchStyle"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/company_14sp"
+            android:textColor="@color/color_666"
+            android:text="我已阅读并同意"/>
+
+        <TextView
+            android:id="@+id/tv_agreement"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/company_14sp"
+            android:textColor="@color/main_color"
+            android:text="《灌灌在线用户协议》"/>
+
+    </LinearLayout>
+
     <Button
         android:id="@+id/btn_register"
         android:layout_width="match_parent"

+ 26 - 10
app/src/main/res/layout/item_org_comment_list.xml

@@ -25,16 +25,32 @@
             android:textSize="@dimen/company_15sp"
             android:textColor="@color/color_333"/>
 
-        <me.zhanghai.android.materialratingbar.MaterialRatingBar
-            android:id="@+id/rb_score"
-            android:layout_width="@dimen/company_90dp"
-            android:layout_height="@dimen/company_20dp"
-            android:layout_marginTop="@dimen/company_5dp"
-            android:isIndicator="true"
-            app:mrb_progressTint="@color/rb_color"
-            app:mrb_secondaryProgressTint="@color/color_999"
-            android:stepSize="0.5"
-            style="@style/Widget.MaterialRatingBar.RatingBar" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="@dimen/company_5dp">
+
+            <me.zhanghai.android.materialratingbar.MaterialRatingBar
+                android:id="@+id/rb_score"
+                android:layout_width="@dimen/company_90dp"
+                android:layout_height="@dimen/company_20dp"
+                android:isIndicator="true"
+                app:mrb_progressTint="@color/rb_color"
+                app:mrb_secondaryProgressTint="@color/color_999"
+                android:stepSize="0.5"
+                style="@style/Widget.MaterialRatingBar.RatingBar" />
+
+            <TextView
+                android:id="@+id/tv_ctime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:textSize="11sp"
+                android:textColor="@color/color_999"/>
+
+        </RelativeLayout>
 
         <TextView
             android:id="@+id/tv_content"

+ 5 - 0
app/src/main/res/layout/item_orgdetail_comment.xml

@@ -31,6 +31,10 @@
                     android:id="@+id/tv_username"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:layout_toLeftOf="@+id/tv_time"
+                    android:layout_alignParentLeft="true"
                     android:textSize="@dimen/company_16sp"
                     android:textColor="@color/color_333"
                     android:text="某某老师"/>
@@ -67,6 +71,7 @@
                     android:isIndicator="true"
                     app:mrb_progressTint="@color/rb_color"
                     app:mrb_secondaryProgressTint="@color/color_999"
+                    android:stepSize="1"
                     style="@style/Widget.MaterialRatingBar.RatingBar" />
 
             </LinearLayout>

+ 23 - 8
app/src/main/res/layout/item_student_family.xml

@@ -4,15 +4,30 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/tv_family_lab"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/default_content_margin"
-        android:paddingTop="@dimen/default_content_margin"
-        android:text="家庭成员一"
-        android:textSize="@dimen/company_16sp"
-        android:textStyle="bold" />
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_family_lab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/default_content_margin"
+            android:paddingTop="@dimen/default_content_margin"
+            android:textSize="@dimen/company_16sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/iv_family_add"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/company_20dp"
+            android:layout_gravity="bottom"
+            android:src="@drawable/family_info_add_icon"
+            android:visibility="gone"/>
+
+    </LinearLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"