瀏覽代碼

修改UI细节问题

316044749 7 年之前
父節點
當前提交
1d4cb0c80e

+ 14 - 0
app/src/main/java/com/ynstkz/shitu/android/activity/OrgDetailActivity.java

@@ -1,6 +1,7 @@
 package com.ynstkz.shitu.android.activity;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
@@ -170,6 +171,19 @@ public class OrgDetailActivity extends TitleBarActivity {
                         "http://www.baidu.com", dataBean.getHeadPic());
             }
         });
+
+        /**
+         * 拨打电话
+         */
+        tvOrgPhone.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(Intent.ACTION_DIAL);
+                Uri data = Uri.parse("tel:" + tvOrgPhone.getText().toString());
+                intent.setData(data);
+                startActivity(intent);
+            }
+        });
     }
 
     /**

+ 148 - 43
app/src/main/java/com/ynstkz/shitu/android/activity/StudentInfoActivity.java

@@ -33,60 +33,62 @@ import okhttp3.Response;
 
 public class StudentInfoActivity extends TitleBarActivity {
 
+
     @Bind(R.id.tv_title)
     TextView tvTitle;
     @Bind(R.id.view_title)
     RelativeLayout viewTitle;
-    @Bind(R.id.tv_username)
-    EditText tvUsername;
-    @Bind(R.id.tv_birthday)
-    EditText tvBirthday;
-    @Bind(R.id.tv_sex)
-    EditText tvSex;
-    @Bind(R.id.tv_nation)
-    EditText tvNation;
-    @Bind(R.id.tv_native_place)
-    EditText tvNativePlace;
-    @Bind(R.id.tv_residenceType)
-    EditText tvResidenceType;
-    @Bind(R.id.tv_height)
-    EditText tvHeight;
-    @Bind(R.id.tv_weight)
-    EditText tvWeight;
-    @Bind(R.id.tv_bloodType)
-    EditText tvBloodType;
-    @Bind(R.id.tv_physicalExamination)
-    EditText tvPhysicalExamination;
-    @Bind(R.id.tv_idcode)
-    EditText tvIdcode;
-    @Bind(R.id.tv_livingAddress)
-    EditText tvLivingAddress;
-    @Bind(R.id.textView)
-    TextView textView;
-    @Bind(R.id.edit_contactAddress)
-    EditText editContactAddress;
-    @Bind(R.id.tv_zipCode)
-    EditText tvZipCode;
-    @Bind(R.id.tv_preSchoolEducation)
-    EditText tvPreSchoolEducation;
-    @Bind(R.id.tv_hobby)
-    EditText tvHobby;
-    @Bind(R.id.ll_member_family)
-    LinearLayout llMemberFamily;
-    @Bind(R.id.gv_images)
-    ScrollViewWithGridView gvImages;
-    @Bind(R.id.btn_save)
-    Button btnSave;
+    @Bind(R.id.edit_username)
+    EditText editUsername;
+    @Bind(R.id.edit_birthday)
+    EditText editBirthday;
+    @Bind(R.id.edit_sex)
+    EditText editSex;
+    @Bind(R.id.edit_nation)
+    EditText editNation;
+    @Bind(R.id.edit_native_place)
+    EditText editNativePlace;
     @Bind(R.id.tv_residenceCityId)
     TextView tvResidenceCityId;
     @Bind(R.id.tv_residenceRegionId)
     TextView tvResidenceRegionId;
+    @Bind(R.id.edit_residenceType)
+    EditText editResidenceType;
+    @Bind(R.id.edit_height)
+    EditText editHeight;
+    @Bind(R.id.edit_weight)
+    EditText editWeight;
+    @Bind(R.id.edit_bloodType)
+    EditText editBloodType;
+    @Bind(R.id.edit_physicalExamination)
+    EditText editPhysicalExamination;
+    @Bind(R.id.edit_idcode)
+    EditText editIdcode;
     @Bind(R.id.tv_livingProvinceId)
     TextView tvLivingProvinceId;
     @Bind(R.id.tv_livingCityId)
     TextView tvLivingCityId;
     @Bind(R.id.tv_livingRegionId)
     TextView tvLivingRegionId;
+    @Bind(R.id.edit_livingAddress)
+    EditText editLivingAddress;
+    @Bind(R.id.textView)
+    TextView textView;
+    @Bind(R.id.edit_contactAddress)
+    EditText editContactAddress;
+    @Bind(R.id.edit_zipCode)
+    EditText editZipCode;
+    @Bind(R.id.edit_preSchoolEducation)
+    EditText editPreSchoolEducation;
+    @Bind(R.id.edit_hobby)
+    EditText editHobby;
+    @Bind(R.id.ll_member_family)
+    LinearLayout llMemberFamily;
+    @Bind(R.id.gv_images)
+    ScrollViewWithGridView gvImages;
+    @Bind(R.id.btn_save)
+    Button btnSave;
+
 
     private String residenceProvinceId = "30";
     private String residenceCityId;
@@ -175,6 +177,83 @@ public class StudentInfoActivity extends TitleBarActivity {
                 getLocalCityList("13", livingCityId);
             }
         });
+
+        /**
+         * 保存
+         */
+        btnSave.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String studentName = editUsername.getText().toString().trim();
+                if(TextUtils.isEmpty(studentName)){
+                    showToast("用户名不能为空");
+                    return;
+                }
+                String birthday = editBirthday.getText().toString().trim();
+                if(TextUtils.isEmpty(birthday)){
+                    showToast("出生日期不能为空");
+                    return;
+                }
+                String ethnic = editNation.getText().toString().trim();
+                if(TextUtils.isEmpty(ethnic)){
+                    showToast("民族不能为空");
+                    return;
+                }
+                String nativePlace = editNativePlace.getText().toString().trim();
+                if(TextUtils.isEmpty(nativePlace)){
+                    showToast("籍贯不能为空");
+                    return;
+                }
+                String height = editHeight.getText().toString().trim();
+                if(TextUtils.isEmpty(height)){
+                    showToast("升高不能为空");
+                    return;
+                }
+                String weight = editWeight.getText().toString().trim();
+                if(TextUtils.isEmpty(weight)){
+                    showToast("体重不能为空");
+                    return;
+                }
+                String bloodType = editBloodType.getText().toString().trim();
+                if(TextUtils.isEmpty(bloodType)){
+                    showToast("血型不能为空");
+                    return;
+                }
+                String physicalExamination = editPhysicalExamination.getText().toString().trim();
+                if(TextUtils.isEmpty(physicalExamination)){
+                    showToast("体检不能为空");
+                    return;
+                }
+                String idCardNum = editIdcode.getText().toString().trim();
+                if(TextUtils.isEmpty(idCardNum)){
+                    showToast("体检不能为空");
+                    return;
+                }
+                String contactAddress = editContactAddress.getText().toString().trim();
+                if(TextUtils.isEmpty(contactAddress)){
+                    showToast("居住地详细地址不能为空");
+                    return;
+                }
+                String zipCode = editZipCode.getText().toString().trim();
+                if(TextUtils.isEmpty(zipCode)){
+                    showToast("邮政编码不能为空");
+                    return;
+                }
+                String preSchoolEducation = editPreSchoolEducation.getText().toString();
+                if(TextUtils.isEmpty(preSchoolEducation)){
+                    showToast("学前教育不能为空");
+                    return;
+                }
+                String hobby = editHobby.getText().toString().trim();
+                if(TextUtils.isEmpty(hobby)){
+                    showToast("兴趣爱好不能为空");
+                    return;
+                }
+                saveApplyStudentInfo(studentName, birthday, "", ethnic, nativePlace, residenceProvinceId, residenceCityId, residenceRegionId, "",
+                        height, weight, bloodType, physicalExamination, idCardNum, livingProvinceId, livingCityId, livingRegionId, contactAddress, zipCode,
+                        preSchoolEducation, hobby);
+            }
+        });
     }
 
     /**
@@ -220,13 +299,13 @@ public class StudentInfoActivity extends TitleBarActivity {
                                         } else if ("03".equals(type)) {
                                             residenceRegionId = dataBean.get(i).getRegionId() + "";
                                             tvResidenceRegionId.setText(dataBean.get(i).getRegionName());
-                                        } else if ("11".equals(type)){
+                                        } else if ("11".equals(type)) {
                                             livingProvinceId = dataBean.get(i).getRegionId() + "";
                                             tvLivingProvinceId.setText(dataBean.get(i).getRegionName());
-                                        } else if ("12".equals(type)){
+                                        } else if ("12".equals(type)) {
                                             livingCityId = dataBean.get(i).getRegionId() + "";
                                             tvLivingCityId.setText(dataBean.get(i).getRegionName());
-                                        } else if ("13".equals(type)){
+                                        } else if ("13".equals(type)) {
                                             livingRegionId = dataBean.get(i).getRegionId() + "";
                                             tvLivingRegionId.setText(dataBean.get(i).getRegionName());
                                         }
@@ -242,4 +321,30 @@ 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,
+                                      String livingRegionId, String contactAddress,String zipCode, String preSchoolEducation, String hobby){
+
+        RequestGroup.saveApplyStudentInfo(studentName, birthday, sex, ethnic, nativePlace, residenceProvinceId, residenceCityId, residenceRegionId, residenceType,
+                height, weight, bloodType, physicalExamination, idCardNum, livingProvinceId, livingCityId, livingRegionId, contactAddress, zipCode, preSchoolEducation,
+                hobby, new Callback() {
+                    @Override
+                    public Object parseNetworkResponse(Response response, int id) throws Exception {
+                        return null;
+                    }
+
+                    @Override
+                    public void onError(Call call, Exception e, int id) {
+
+                    }
+
+                    @Override
+                    public void onResponse(Object response, int id) {
+
+                    }
+                });
+
+    }
 }

+ 10 - 0
app/src/main/java/com/ynstkz/shitu/android/adapter/OrgListAdapter.java

@@ -1,6 +1,7 @@
 package com.ynstkz.shitu.android.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -38,6 +39,7 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
             TextView tv_memberName;
             MaterialRatingBar rb_score;
             TextView tv_regaddress;
+            TextView tvViewCount;
 
             @Override
             public int getResource() {
@@ -50,12 +52,20 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
                 tv_memberName = convertView.findViewById(R.id.tv_memberName);
                 rb_score = convertView.findViewById(R.id.rb_score);
                 tv_regaddress = convertView.findViewById(R.id.tv_regaddress);
+                tvViewCount = convertView.findViewById(R.id.tv_view_count);
             }
 
             @Override
             public void updateView(OrgItemBean content, int position) {
                 tv_memberName.setText(content.getMemberName());
                 rb_score.setProgress(content.getScore() * 2);
+                tvViewCount.setText("浏览人数:" + content.getViewCount() + "人");
+                if(!TextUtils.isEmpty(content.getAddress())){
+                    tv_regaddress.setVisibility(View.VISIBLE);
+                    tv_regaddress.setText(content.getAddress());
+                } else {
+                    tv_regaddress.setVisibility(View.GONE);
+                }
             }
         };
     }

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

@@ -416,4 +416,72 @@ public class RequestGroup {
         OkHttpUtils.postString().url(UrlCat.URL_THIRD_UNBIND).addHeader(KEY_TOKEN,
                 SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
+
+    /**
+     * 保存学生信息
+     *
+     * birthday (string, optional): 出生日期 ,
+     contactCityId (integer, optional): 通信地址城市Id ,
+     zipCode (string, optional): 邮政编码 ,
+     preSchoolEducation (string, optional): 学前教育 ,
+     infoId (integer, optional): 学生信息id ,
+     livingProvinceId (integer, optional): 现居住地省份Id ,
+     residenceProvinceId (integer, optional): 户口所在地省份Id ,
+     residenceRegionId (integer, optional): 户口所在地区域Id ,
+     bloodType (string, optional): 血型 ,
+     parentPhone (string, optional): 家长联系方式 ,
+     livingCityId (integer, optional): 现居住地城市Id ,
+     residenceType (integer, optional): 户口性质,1:城镇,2:农村 ,
+     physicalExamination (integer, optional): 体检是否合格,0:不合格,1:合格 ,
+     contactAddress (string, optional): 通信地址详细地址 ,
+     height (string, optional): 身高 ,
+     ethnic (string, optional): 民族 ,
+     contactProvinceId (integer, optional): 通信地址省份Id ,
+     contactAddressRegionId (string, optional): 通信地址区域Id ,
+     isDelete (integer, optional),
+     sex (integer, optional): 性别,0:未知,1:男,2:女 ,
+     weight (string, optional): 体重 ,
+     updateTime (string, optional),
+     userId (integer, optional),
+     residenceCityId (integer, optional): 户口所在地城市Id ,
+     livingRegionId (integer, optional): 现居住地区域Id ,
+     parentName (string, optional): 家长姓名 ,
+     livingAddress (string, optional): 现居住地详细地址 ,
+     createTime (string, optional),
+     studentName (string, optional): 学生姓名 ,
+     idCardNum (string, optional): 身份证号 ,
+     nativePlace (string, optional): 籍贯 ,
+     studentPic (string, optional): 学生证件照 ,
+     residenceAddress (string, optional): 户口所在地详细地址 ,
+     hobby (string, optional): 兴趣爱好
+     */
+    public static 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,
+                                            String livingRegionId, String contactAddress,String zipCode, String preSchoolEducation, String hobby, Callback callback){
+        Map<String, String> params = getSystemParams();
+        params.put("studentName", studentName);
+        params.put("birthday", birthday);
+        params.put("sex", sex);
+        params.put("ethnic", ethnic);
+        params.put("nativePlace", nativePlace);
+        params.put("residenceProvinceId", residenceProvinceId);
+        params.put("residenceCityId", residenceCityId);
+        params.put("residenceRegionId", residenceRegionId);
+        params.put("residenceType", residenceType);
+        params.put("height", height);
+        params.put("weight", weight);
+        params.put("bloodType", bloodType);
+        params.put("physicalExamination", physicalExamination);
+        params.put("idCardNum", idCardNum);
+        params.put("livingProvinceId", livingProvinceId);
+        params.put("livingCityId", livingCityId);
+        params.put("livingRegionId", livingRegionId);
+        params.put("contactAddress", contactAddress);
+        params.put("zipCode", zipCode);
+        params.put("preSchoolEducation", preSchoolEducation);
+        params.put("hobby", hobby);
+        OkHttpUtils.postString().url(UrlCat.URL_APPLY_STUDENT_INFO).addHeader(KEY_TOKEN,
+                SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
+    }
 }

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

@@ -190,6 +190,12 @@ public class UrlCat {
      * 普通教育机构报名2
      */
     public static final String URL_APPLY_P43 = HOST + "p43.html";
+
+    /**
+     * 报名-学生信息
+     */
+    public static final String URL_APPLY_STUDENT_INFO = HOST + "api/apply/student/info";
+
 }
 
 

+ 3 - 1
app/src/main/java/com/ynstkz/shitu/android/fragment/HomeFragment.java

@@ -336,17 +336,19 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
             llOrgMain.removeAllViews();
         }
         for (int i = 0; i < listOrg.size(); i++) {
-            View view = LayoutInflater.from(getActivity()).inflate(R.layout.item_org_list, null);
+            View view = LayoutInflater.from(getActivity()).inflate(R.layout.item_org_recommend_list, null);
             ImageView iv_headPic = view.findViewById(R.id.iv_headPic);
             TextView tv_memberName = view.findViewById(R.id.tv_memberName);
             MaterialRatingBar rb_score = view.findViewById(R.id.rb_score);
             TextView tv_regaddress = view.findViewById(R.id.tv_regaddress);
+            TextView tvviewcount = view.findViewById(R.id.tv_view_count);
             //加载机构数据
             final OrgItemBean orgItemBean = listOrg.get(i);
             Glide.with(getActivity()).load(orgItemBean.getHeadPic()).into(iv_headPic);
             tv_memberName.setText(orgItemBean.getMemberName());
             rb_score.setProgress(orgItemBean.getScore() * 2);
             tv_regaddress.setText(orgItemBean.getAddress());
+            tvviewcount.setText(orgItemBean.getViewCount() + "条评论");
 
             //加载课程数据
             LinearLayout llCourseMain = view.findViewById(R.id.ll_course_main);

二進制
app/src/main/res/drawable-xxhdpi/org_link_phone_icon.png


二進制
app/src/main/res/drawable-xxhdpi/org_location_icon.png


+ 11 - 3
app/src/main/res/layout/activity_org_detail.xml

@@ -101,6 +101,8 @@
                         android:id="@+id/tv_org_phone"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:drawableLeft="@drawable/org_link_phone_icon"
+                        android:drawablePadding="@dimen/company_5dp"
                         android:layout_alignParentRight="true"
                         android:text="15812454678"
                         android:textColor="@color/color_666"
@@ -122,9 +124,14 @@
 
                     <TextView
                         android:id="@+id/tv_address"
-                        android:layout_width="@dimen/company_200dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
+                        android:drawableLeft="@drawable/org_location_icon"
+                        android:drawablePadding="@dimen/company_5dp"
+                        android:maxLength="100"
+                        android:ellipsize="end"
+                        android:gravity="right"
                         android:maxLines="1"/>
 
                 </RelativeLayout>
@@ -210,14 +217,15 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:layout_marginTop="@dimen/company_5dp"
+                    android:layout_marginBottom="@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:layout_below="@+id/tv_memberName"
-                        android:layout_marginTop="@dimen/company_5dp"
                         android:isIndicator="true"
                         app:mrb_progressTint="@color/rb_color"
                         app:mrb_secondaryProgressTint="@color/color_999"

+ 15 - 15
app/src/main/res/layout/activity_studentinfo.xml

@@ -31,7 +31,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_username"
+                    android:id="@+id/edit_username"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -61,7 +61,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_birthday"
+                    android:id="@+id/edit_birthday"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -91,7 +91,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_sex"
+                    android:id="@+id/edit_sex"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -121,7 +121,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_nation"
+                    android:id="@+id/edit_nation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -151,7 +151,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_native_place"
+                    android:id="@+id/edit_native_place"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -238,7 +238,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_residenceType"
+                    android:id="@+id/edit_residenceType"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -267,7 +267,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_height"
+                    android:id="@+id/edit_height"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -296,7 +296,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_weight"
+                    android:id="@+id/edit_weight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -325,7 +325,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_bloodType"
+                    android:id="@+id/edit_bloodType"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -354,7 +354,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_physicalExamination"
+                    android:id="@+id/edit_physicalExamination"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -383,7 +383,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_idcode"
+                    android:id="@+id/edit_idcode"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -454,7 +454,7 @@
             </RelativeLayout>
 
             <EditText
-                android:id="@+id/tv_livingAddress"
+                android:id="@+id/edit_livingAddress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -511,7 +511,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_zipCode"
+                    android:id="@+id/edit_zipCode"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -540,7 +540,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_preSchoolEducation"
+                    android:id="@+id/edit_preSchoolEducation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
@@ -569,7 +569,7 @@
                     android:textSize="@dimen/company_16sp" />
 
                 <EditText
-                    android:id="@+id/tv_hobby"
+                    android:id="@+id/edit_hobby"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"

+ 25 - 15
app/src/main/res/layout/item_org_list.xml

@@ -33,17 +33,32 @@
                 android:textStyle="bold"
                 android:text="新东方培训学校-西湖文化广场分校"/>
 
-            <me.zhanghai.android.materialratingbar.MaterialRatingBar
-                android:id="@+id/rb_score"
-                android:layout_width="@dimen/company_90dp"
-                android:layout_height="@dimen/company_20dp"
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_below="@+id/tv_memberName"
-                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.Indicator.Small" />
+                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.Indicator.Small" />
+
+                <TextView
+                    android:id="@+id/tv_view_count"
+                    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>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -79,9 +94,4 @@
 
     </LinearLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/company_5dp"
-        android:background="@color/default_bg"/>
-
 </LinearLayout>

+ 103 - 0
app/src/main/res/layout/item_org_recommend_list.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:orientation="vertical"
+    android:background="@color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <ImageView
+            android:id="@+id/iv_headPic"
+            android:layout_width="@dimen/company_80dp"
+            android:layout_height="@dimen/company_80dp"
+            android:background="@mipmap/ic_launcher"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/company_80dp"
+            android:layout_marginLeft="@dimen/company_10dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_memberName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/company_16sp"
+                android:textColor="@color/color_333"
+                android:textStyle="bold"
+                android:text="新东方培训学校-西湖文化广场分校"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_memberName"
+                android:layout_marginTop="@dimen/company_5dp"
+                android:orientation="horizontal">
+
+                <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.Indicator.Small" />
+
+                <TextView
+                    android:id="@+id/tv_view_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="@dimen/company_4dp"
+                    android:textSize="11sp"
+                    android:textColor="@color/color_999"/>
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="英语"/>
+
+                <TextView
+                    android:id="@+id/tv_regaddress"
+                    android:layout_width="@dimen/company_200dp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:text="未名湖"/>
+
+            </RelativeLayout>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_course_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/company_5dp"
+        android:background="@color/default_bg"/>
+
+</LinearLayout>

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

@@ -67,7 +67,6 @@
                     android:isIndicator="true"
                     app:mrb_progressTint="@color/rb_color"
                     app:mrb_secondaryProgressTint="@color/color_999"
-                    android:stepSize="0.5"
                     style="@style/Widget.MaterialRatingBar.RatingBar" />
 
             </LinearLayout>