修改反馈问题

app/src/main/java/com/ynstkz/shitu/android/activity/CourseDetailActivity.java

@@ -4,6 +4,7 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -24,6 +25,7 @@ import com.common.library.okhttp.OkHttpUtils;
 import com.common.library.okhttp.callback.Callback;
 import com.common.library.pulltorefresh.PullToRefreshBase;
 import com.common.library.pulltorefresh.PullToRefreshScrollView;
+import com.common.library.utils.DateUtil;
 import com.common.library.utils.PixelUtil;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
@@ -38,6 +40,7 @@ import com.ynstkz.shitu.android.data.UrlCat;
 import com.ynstkz.shitu.android.helper.UmengShareHelper;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import butterknife.Bind;
@@ -72,8 +75,6 @@ public class CourseDetailActivity extends TitleBarActivity implements PullToRefr
     TextView tvCourseMarketprice;
     @Bind(R.id.tv_requirement)
     TextView tvRequirement;
-    @Bind(R.id.tv_view_count)
-    TextView tvViewCount;
     @Bind(R.id.ll_collect)
     LinearLayout llCollect;
     @Bind(R.id.iv_banner_bg)
@@ -86,6 +87,22 @@ public class CourseDetailActivity extends TitleBarActivity implements PullToRefr
     PullToRefreshScrollView svMain;
     @Bind(R.id.rl_banner_main)
     RelativeLayout rlBannerMain;
+    @Bind(R.id.tv_org_desc_lab)
+    TextView tvOrgDescLab;
+    @Bind(R.id.tv_requirement_lab)
+    TextView tvRequirementLab;
+    @Bind(R.id.tv_enrollmentArea_lab)
+    TextView tvEnrollmentAreaLab;
+    @Bind(R.id.ll_price_bottom)
+    LinearLayout llPriceBottom;
+    @Bind(R.id.tv_registration_lab)
+    TextView tvRegistrationLab;
+    @Bind(R.id.tv_registrationt)
+    TextView tvRegistrationt;
+    @Bind(R.id.tv_registrationt_main)
+    LinearLayout tvRegistrationtMain;
+    @Bind(R.id.tv_course_marketprice_main)
+    LinearLayout tvCourseMarketpriceMain;
 
     private String courseId;
     private CourseDetilBean courseDetilBean;
@@ -136,11 +153,6 @@ public class CourseDetailActivity extends TitleBarActivity implements PullToRefr
                     startActivity(new Intent(CourseDetailActivity.this, LoginActivity.class));
                     return;
                 }
-//                if (!STSign.getInstance().isHavePhoneNumber()) {
-//                    startActivity(new Intent(CourseDetailActivity.this, CompleteInfoActivity.class));
-//                    return;
-//                }
-
                 if (ActivityCompat.checkSelfPermission(CourseDetailActivity.this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
                     //权限发生了改变 true  //  false 小米
                     ActivityCompat.requestPermissions(CourseDetailActivity.this, new String[]{Manifest.permission.CAMERA}, 1000);
@@ -253,14 +265,14 @@ public class CourseDetailActivity extends TitleBarActivity implements PullToRefr
     /**
      * 初始化课程详情
      */
+    @SuppressLint("SetTextI18n")
     private void initCourseDetail(CourseDetilBean courseDetilBean) {
         if (courseDetilBean == null || courseDetilBean.getData() == null) {
             return;
         }
         CourseDetilBean.DataBean dataBean = courseDetilBean.getData();
         initBannerView(dataBean);
-        tvViewCount.setText("收藏：" + courseDetilBean.getData().getCollectCount() + "次");
-        tvTitle.setText(dataBean.getTitle());
+        tvTitle.setText(dataBean.getMemberName());
         tvOrgName.setText(dataBean.getTitle());
         if (!TextUtils.isEmpty(dataBean.getDetail())) {
             tvOrgDesc.setText(dataBean.getDetail());
@@ -274,16 +286,43 @@ public class CourseDetailActivity extends TitleBarActivity implements PullToRefr
 
         if (!TextUtils.isEmpty(dataBean.getPrice())) {
             tvPrice.setVisibility(View.VISIBLE);
-            tvPrice.setText("￥" + dataBean.getPrice() + "元");
+            tvPrice.setText("￥" + dataBean.getPrice());
         } else {
-            tvPrice.setText("￥0元");
+            tvPrice.setText("￥0");
         }
         if (!TextUtils.isEmpty(dataBean.getMarketPrice())) {
             tvCourseMarketprice.setVisibility(View.VISIBLE);
-            tvCourseMarketprice.setText("市场价￥" + dataBean.getMarketPrice());
+            tvCourseMarketprice.setText(dataBean.getMarketPrice());
+            tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
         } else {
             tvCourseMarketprice.setVisibility(View.GONE);
         }
+        if (dataBean.isIsNormal()) { //普通机构
+            tvPrice.setVisibility(View.GONE);
+            tvOrgDescLab.setText("招生简章");
+            tvRequirementLab.setText("招生要求：");
+            tvCourseMarketprice.setVisibility(View.GONE);
+            tvRegistrationtMain.setVisibility(View.VISIBLE);
+            tvCourseMarketpriceMain.setVisibility(View.GONE);
+            tvRegistrationt.setText(DateUtil.format(new Date(dataBean.getOnlineTime()), DateUtil.DATE_TIME_FORMAT_YYYY年MM月DD日) + "-" +
+                    DateUtil.format(new Date(dataBean.getOfflineTime()), DateUtil.DATE_TIME_FORMAT_YYYY年MM月DD日));
+        } else { //非普通机构
+            tvPrice.setVisibility(View.VISIBLE);
+            tvOrgDescLab.setText("课程介绍");
+            tvRequirementLab.setText("报名要求：");
+            tvCourseMarketprice.setVisibility(View.VISIBLE);
+            tvRegistrationtMain.setVisibility(View.GONE);
+            tvCourseMarketpriceMain.setVisibility(View.VISIBLE);
+        }
+        if (dataBean.isCanApply()) { //可以报名
+            tvApply.setClickable(true);
+            tvApply.setBackgroundColor(getResources().getColor(R.color.main_color));
+            tvApply.setText("立即报名");
+        } else {
+            tvApply.setClickable(false);
+            tvApply.setBackgroundColor(getResources().getColor(R.color.color_999));
+            tvApply.setText(dataBean.getReason());
+        }
         initCollectIcon();
         //招生区域
         initEnrollAreaList(dataBean);

app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java

@@ -286,7 +286,8 @@ public class LoginActivity extends TitleBarActivity {
                             if(isBind){
                                 loginSuccess(loginBean);
                             } else {
-                                completeUserInfo(thirdId, thirdType, name, iconurl);
+//                                completeUserInfo(thirdId, thirdType, name, iconurl);
+                                thirdRegist(thirdType, thirdId, iconurl, name);
                             }
                         }
                     } else {

app/src/main/java/com/ynstkz/shitu/android/activity/OrgDetailActivity.java

@@ -19,14 +19,12 @@ import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import com.alibaba.idst.nls.internal.common.PhoneInfo;
 import com.bumptech.glide.Glide;
 import com.common.library.okhttp.OkHttpUtils;
 import com.common.library.okhttp.callback.Callback;
 import com.common.library.pulltorefresh.PullToRefreshBase;
 import com.common.library.pulltorefresh.PullToRefreshScrollView;
 import com.common.library.utils.DateUtil;
-import com.common.library.utils.PhotoUtils;
 import com.common.library.utils.PixelUtil;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
@@ -121,6 +119,10 @@ public class OrgDetailActivity extends TitleBarActivity implements PullToRefresh
     TextView tvServiceLab;
     @Bind(R.id.rl_banner_main)
     RelativeLayout rlBannerMain;
+    @Bind(R.id.tv_course_lab)
+    TextView tvCourseLab;
+    @Bind(R.id.ll_course_main)
+    LinearLayout llCourseMain;
 
     private int memberId;
     private boolean isCollect;
@@ -340,9 +342,11 @@ public class OrgDetailActivity extends TitleBarActivity implements PullToRefresh
         if (dataBean.isNormal()) {
             tvOrgDescLab.setText("学校介绍");
             tvServiceLab.setText("学校特色");
+            tvCourseLab.setText("招生信息");
         } else {
             tvOrgDescLab.setText("机构介绍");
             tvServiceLab.setText("机构特色");
+            tvCourseLab.setText("课程");
         }
 
         if (!TextUtils.isEmpty(dataBean.getPhone())) {
@@ -370,9 +374,12 @@ public class OrgDetailActivity extends TitleBarActivity implements PullToRefresh
 
         //课程信息
         if (dataBean.getCourseList() != null && dataBean.getCourseList().size() > 0) {
+            llCourseMain.setVisibility(View.VISIBLE);
             OrgCourseListAdapter orgCourseListAdapter = new OrgCourseListAdapter(this, dataBean.getCourseList());
             lvCourse.setAdapter(orgCourseListAdapter);
             orgCourseListAdapter.notifyDataSetChanged();
+        } else {
+            llCourseMain.setVisibility(View.GONE);
         }
 
         //特色服务

app/src/main/java/com/ynstkz/shitu/android/adapter/MineSignUpAdapter.java

@@ -6,6 +6,7 @@ import android.graphics.Paint;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
@@ -46,6 +47,7 @@ public class MineSignUpAdapter extends CCListAdapter<SignUpRecorsBean>{
             TextView tvCoursePrice;
             TextView tvCourseMarketprice;
             TextView tvPreview;
+            LinearLayout llPriceMain;
 
             @Override
             public int getResource() {
@@ -61,6 +63,7 @@ public class MineSignUpAdapter extends CCListAdapter<SignUpRecorsBean>{
                 tvCoursePrice = convertView.findViewById(R.id.tv_course_price);
                 tvCourseMarketprice = convertView.findViewById(R.id.tv_course_marketprice);
                 tvPreview = convertView.findViewById(R.id.tv_preview);
+                llPriceMain = convertView.findViewById(R.id.ll_price_main);
             }
 
             @Override
@@ -77,8 +80,13 @@ public class MineSignUpAdapter extends CCListAdapter<SignUpRecorsBean>{
                 tvMemberName.setText(content.getMemberName());
                 tvCourseName.setText(content.getTitle());
                 tvRegaddress.setText(content.getAddress());
-                tvCoursePrice.setText("￥" + content.getPrice());
-                tvCourseMarketprice.setText(content.getMarketPrice() + "");
+                if(!TextUtils.isEmpty(content.getPrice())){
+                    llPriceMain.setVisibility(View.VISIBLE);
+                    tvCoursePrice.setText("￥" + content.getPrice());
+                    tvCourseMarketprice.setText(content.getMarketPrice() + "");
+                } else {
+                    llPriceMain.setVisibility(View.GONE);
+                }
                 tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
                 PhoneViewUtils.expandViewTouchDelegate(tvPreview, 0, 50, 30, 0);
                 tvPreview.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/ynstkz/shitu/android/adapter/OrgCourseListAdapter.java

@@ -8,6 +8,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.FitCenter;
 import com.common.library.adapter.CCAdapterHolder;
 import com.common.library.adapter.CCListAdapter;
 import com.ynstkz.shitu.android.R;
@@ -63,9 +65,9 @@ public class OrgCourseListAdapter extends CCListAdapter<CourseItemBean>{
                     String coursePic = content.getCoursePicList().get(0).getPicUrl();
                     if(!TextUtils.isEmpty(coursePic)) {
                         if(coursePic.startsWith("http:")) {
-                            Glide.with(context).load(coursePic).asBitmap().transform(new GlideRoundTransform(context)).into(ivIcon);
+                            Glide.with(context).load(coursePic).asBitmap().transform(new CenterCrop(context), new GlideRoundTransform(context)).into(ivIcon);
                         } else {
-                            Glide.with(context).load(UrlCat.HOST + coursePic).asBitmap().transform(new GlideRoundTransform(context)).into(ivIcon);
+                            Glide.with(context).load(UrlCat.HOST + coursePic).asBitmap().transform(new CenterCrop(context), new GlideRoundTransform(context)).into(ivIcon);
                         }
                     }
                 } else {

app/src/main/java/com/ynstkz/shitu/android/adapter/OrgListAdapter.java

@@ -6,11 +6,13 @@ import android.graphics.Paint;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.common.library.adapter.CCAdapterHolder;
 import com.common.library.adapter.CCListAdapter;
 import com.ynstkz.shitu.android.R;
@@ -50,6 +52,7 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
             TextView tv_regaddress;
             TextView tvViewCount;
             LinearLayout llCourseMain;
+            Button btnCourseMore;
 
             @Override
             public int getResource() {
@@ -64,18 +67,19 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
                 tv_regaddress = convertView.findViewById(R.id.tv_regaddress);
                 tvViewCount = convertView.findViewById(R.id.tv_view_count);
                 llCourseMain = convertView.findViewById(R.id.ll_course_main);
+                btnCourseMore = convertView.findViewById(R.id.btn_course_more);
             }
 
             @Override
-            public void updateView(OrgItemBean content, int position) {
+            public void updateView(final OrgItemBean content, int position) {
                 tv_memberName.setText(content.getMemberName());
                 rb_score.setProgress((int)content.getScore());
                 tvViewCount.setText("浏览人数：" + content.getViewCount() + "人");
                 if(!TextUtils.isEmpty(content.getLogo())){
                     if(content.getLogo().startsWith("http")){
-                        Glide.with(context).load(content.getLogo()).asBitmap().transform(new GlideRoundTransform(context)).into(iv_headPic);
+                        Glide.with(context).load(content.getLogo()).asBitmap().transform(new CenterCrop(context), new GlideRoundTransform(context)).into(iv_headPic);
                     } else {
-                        Glide.with(context).load(UrlCat.HOST + content.getLogo()).asBitmap().transform(new GlideRoundTransform(context)).into(iv_headPic);
+                        Glide.with(context).load(UrlCat.HOST + content.getLogo()).asBitmap().transform(new CenterCrop(context), new GlideRoundTransform(context)).into(iv_headPic);
                     }
                 } else {
                     iv_headPic.setImageResource(R.drawable.org_item_default_icon);
@@ -89,39 +93,63 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
 
                 //课程信息
                 if (content.getCourseList() != null && content.getCourseList().size() > 0) {
-                    llCourseMain.setVisibility(View.VISIBLE);
-                    llCourseMain.removeAllViews();
-                    for (int j = 0; j < content.getCourseList().size(); j++) {
-                        View courseView = LayoutInflater.from(context).inflate(R.layout.item_org_course_list, null);
-                        TextView tvCourseTitle = courseView.findViewById(R.id.tv_course_title);
-                        TextView tvCoursePrice = courseView.findViewById(R.id.tv_course_price);
-                        TextView tvCourseMarketprice = courseView.findViewById(R.id.tv_course_marketprice);
-
-                        final CourseItemBean courseItemBean = content.getCourseList().get(j);
-                        tvCourseTitle.setText(courseItemBean.getTitle());
-                        if(!TextUtils.isEmpty(courseItemBean.getPrice())){
-                            tvCoursePrice.setText("￥" + courseItemBean.getPrice());
-                        }
-                        if(!TextUtils.isEmpty(courseItemBean.getMarketPrice())) {
-                            tvCourseMarketprice.setText("￥" + courseItemBean.getMarketPrice());
-                            tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
-                        }
-
-                        //课程详情
-                        courseView.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View view) {
-                                Intent intent = new Intent(context, CourseDetailActivity.class);
-                                intent.putExtra("courseId", courseItemBean.getCourseId());
-                                context.startActivity(intent);
-                            }
-                        });
-                        llCourseMain.addView(courseView);
+                    if(content.getCourseList().size() > 2) {
+                        btnCourseMore.setVisibility(View.VISIBLE);
+                        addCourse2Org(llCourseMain, content.getCourseList().subList(0, 2));
+                        btnCourseMore.setText("其他" + (content.getCourseList().size() - 2) + "个课程");
+                    } else {
+                        btnCourseMore.setVisibility(View.GONE);
+                        addCourse2Org(llCourseMain, content.getCourseList());
                     }
                 } else {
                     llCourseMain.setVisibility(View.GONE);
                 }
+
+                //查看更多
+                btnCourseMore.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        addCourse2Org(llCourseMain, content.getCourseList());
+                        btnCourseMore.setVisibility(View.GONE);
+                    }
+                });
             }
         };
     }
+    /**
+     * 为机构添加课程
+     */
+    private void addCourse2Org(LinearLayout llCourseMain, List<CourseItemBean> listCourses){
+        if(llCourseMain == null) return;
+        if(listCourses == null || listCourses.size() == 0) return;
+        llCourseMain.setVisibility(View.VISIBLE);
+        llCourseMain.removeAllViews();
+        for (int j = 0; j < listCourses.size(); j++) {
+            View courseView = LayoutInflater.from(context).inflate(R.layout.item_org_course_list, null);
+            TextView tvCourseTitle = courseView.findViewById(R.id.tv_course_title);
+            TextView tvCoursePrice = courseView.findViewById(R.id.tv_course_price);
+            TextView tvCourseMarketprice = courseView.findViewById(R.id.tv_course_marketprice);
+
+            final CourseItemBean courseItemBean = listCourses.get(j);
+            tvCourseTitle.setText(courseItemBean.getTitle());
+            if(!TextUtils.isEmpty(courseItemBean.getPrice())){
+                tvCoursePrice.setText("￥" + courseItemBean.getPrice());
+            }
+            if(!TextUtils.isEmpty(courseItemBean.getMarketPrice())) {
+                tvCourseMarketprice.setText("￥" + courseItemBean.getMarketPrice());
+                tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
+            }
+
+            //课程详情
+            courseView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(context, CourseDetailActivity.class);
+                    intent.putExtra("courseId", courseItemBean.getCourseId());
+                    context.startActivity(intent);
+                }
+            });
+            llCourseMain.addView(courseView);
+        }
+    }
 }

app/src/main/java/com/ynstkz/shitu/android/bean/CourseDetilBean.java

@@ -41,6 +41,10 @@ public class CourseDetilBean extends BaseBean{
         private List<CoursePicListBean> coursePicList;
         private String viewCount;
         private boolean isCollect;
+        private long onlineTime;
+        private long offlineTime;
+        private boolean canApply;
+        private String reason;
 
         public String getMarketPrice() {
             return marketPrice;
@@ -194,6 +198,38 @@ public class CourseDetilBean extends BaseBean{
             isCollect = collect;
         }
 
+        public long getOnlineTime() {
+            return onlineTime;
+        }
+
+        public void setOnlineTime(long onlineTime) {
+            this.onlineTime = onlineTime;
+        }
+
+        public long getOfflineTime() {
+            return offlineTime;
+        }
+
+        public void setOfflineTime(long offlineTime) {
+            this.offlineTime = offlineTime;
+        }
+
+        public boolean isCanApply() {
+            return canApply;
+        }
+
+        public void setCanApply(boolean canApply) {
+            this.canApply = canApply;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+
+        public void setReason(String reason) {
+            this.reason = reason;
+        }
+
         public static class EnrollAreaListBean {
 
             private int areaId;

app/src/main/java/com/ynstkz/shitu/android/bean/CourseItemBean.java

@@ -29,7 +29,7 @@ public class CourseItemBean extends BaseBean{
     private String price;
     private int scoreCount;
     private String title;
-    private int courseId;
+    private String courseId;
     private String detail;
     private List<CoursePicListBean> coursePicList;
 
@@ -81,11 +81,11 @@ public class CourseItemBean extends BaseBean{
         this.title = title;
     }
 
-    public int getCourseId() {
+    public String getCourseId() {
         return courseId;
     }
 
-    public void setCourseId(int courseId) {
+    public void setCourseId(String courseId) {
         this.courseId = courseId;
     }
 

app/src/main/java/com/ynstkz/shitu/android/bean/SignUpRecorsBean.java

@@ -9,7 +9,7 @@ import com.ynstkz.shitu.android.base.BaseBean;
 public class SignUpRecorsBean extends BaseBean{
 
 
-    private int marketPrice;
+    private String marketPrice;
     private String address;
     private String memberName;
     private String lon;
@@ -20,17 +20,17 @@ public class SignUpRecorsBean extends BaseBean{
     private float score;
     private String coursePic;
     private long createTime;
-    private int price;
+    private String price;
     private int courseId;
     private String applyStatus;
     private String lat;
     private int memberId;
 
-    public int getMarketPrice() {
+    public String getMarketPrice() {
         return marketPrice;
     }
 
-    public void setMarketPrice(int marketPrice) {
+    public void setMarketPrice(String marketPrice) {
         this.marketPrice = marketPrice;
     }
 
@@ -114,11 +114,11 @@ public class SignUpRecorsBean extends BaseBean{
         this.createTime = createTime;
     }
 
-    public int getPrice() {
+    public String getPrice() {
         return price;
     }
 
-    public void setPrice(int price) {
+    public void setPrice(String price) {
         this.price = price;
     }
 

app/src/main/java/com/ynstkz/shitu/android/fragment/HomeFragment.java

@@ -30,6 +30,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.common.library.cache.Cache;
 import com.common.library.okhttp.OkHttpUtils;
 import com.common.library.okhttp.callback.Callback;
@@ -423,6 +424,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     /**
      * 设置推荐列表数据
      */
+    @SuppressLint("SetTextI18n")
     private void setOrgListData(List<OrgItemBean> listOrg) {
         if (listOrg == null || listOrg.size() == 0) {
             return;
@@ -437,13 +439,16 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
             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 Button btnCourseMore = view.findViewById(R.id.btn_course_more);
             //加载机构数据
             final OrgItemBean orgItemBean = listOrg.get(i);
             if (!TextUtils.isEmpty(orgItemBean.getLogo())) {
                 if (orgItemBean.getLogo().startsWith("http")) {
-                    Glide.with(getActivity()).load(orgItemBean.getLogo()).asBitmap().transform(new GlideRoundTransform(getActivity())).into(iv_headPic);
+                    Glide.with(getActivity()).load(orgItemBean.getLogo()).asBitmap().transform(new CenterCrop(getActivity()),
+                            new GlideRoundTransform(getActivity())).into(iv_headPic);
                 } else {
-                    Glide.with(getActivity()).load(UrlCat.HOST + orgItemBean.getLogo()).asBitmap().transform(new GlideRoundTransform(getActivity())).into(iv_headPic);
+                    Glide.with(getActivity()).load(UrlCat.HOST + orgItemBean.getLogo()).asBitmap().transform(new CenterCrop(getActivity()),
+                            new GlideRoundTransform(getActivity())).into(iv_headPic);
                 }
             } else {
                 iv_headPic.setImageResource(R.drawable.org_item_default_icon);
@@ -466,39 +471,27 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
             //加载课程数据
             final LinearLayout llCourseMain = view.findViewById(R.id.ll_course_main);
             if (orgItemBean.getCourseList() != null && orgItemBean.getCourseList().size() > 0) {
-                llCourseMain.setVisibility(View.VISIBLE);
-                llCourseMain.removeAllViews();
-
-                for (int j = 0; j < orgItemBean.getCourseList().size(); j++) {
-                    final View courseView = LayoutInflater.from(getActivity()).inflate(R.layout.item_org_course_recommend_list, null);
-                    TextView tvCourseTitle = courseView.findViewById(R.id.tv_course_title);
-                    TextView tvCoursePrice = courseView.findViewById(R.id.tv_course_price);
-                    TextView tvCourseMarketprice = courseView.findViewById(R.id.tv_course_marketprice);
-
-                    final CourseItemBean courseItemBean = orgItemBean.getCourseList().get(j);
-                    tvCourseTitle.setText(courseItemBean.getTitle());
-                    if (!TextUtils.isEmpty(courseItemBean.getPrice())) {
-                        tvCoursePrice.setText("￥" + courseItemBean.getPrice());
-                    }
-                    if (!TextUtils.isEmpty(courseItemBean.getMarketPrice())) {
-                        tvCourseMarketprice.setText(courseItemBean.getMarketPrice());
-                        tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
-                    }
-
-                    //课程详情
-                    courseView.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            Intent intent = new Intent(getActivity(), CourseDetailActivity.class);
-                            intent.putExtra("courseId", courseItemBean.getCourseId());
-                            startActivity(intent);
-                        }
-                    });
-                    llCourseMain.addView(courseView);
+                if(orgItemBean.getCourseList().size() > 2) {
+                    btnCourseMore.setVisibility(View.VISIBLE);
+                    addCourse2Org(llCourseMain, orgItemBean.getCourseList().subList(0, 2));
+                    btnCourseMore.setText("其他" + (orgItemBean.getCourseList().size() - 2) + "个课程");
+                } else {
+                    btnCourseMore.setVisibility(View.GONE);
+                    addCourse2Org(llCourseMain, orgItemBean.getCourseList());
                 }
             } else {
                 llCourseMain.setVisibility(View.GONE);
+                btnCourseMore.setVisibility(View.GONE);
             }
+
+            //查看更多
+            btnCourseMore.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    addCourse2Org(llCourseMain, orgItemBean.getCourseList());
+                    btnCourseMore.setVisibility(View.GONE);
+                }
+            });
             llOrgMain.addView(view);
 
             /**
@@ -517,6 +510,47 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     }
 
     /**
+     * 为机构添加课程
+     */
+    private void addCourse2Org(LinearLayout llCourseMain, List<CourseItemBean> listCourses){
+        if(llCourseMain == null) return;
+        if(listCourses == null || listCourses.size() == 0) return;
+        llCourseMain.setVisibility(View.VISIBLE);
+        llCourseMain.removeAllViews();
+        for (int j = 0; j < listCourses.size(); j++) {
+            final View courseView = LayoutInflater.from(getActivity()).inflate(R.layout.item_org_course_recommend_list, null);
+            TextView tvCourseTitle = courseView.findViewById(R.id.tv_course_title);
+            TextView tvCoursePrice = courseView.findViewById(R.id.tv_course_price);
+            TextView tvCourseMarketprice = courseView.findViewById(R.id.tv_course_marketprice);
+            TextView tvCourseMarketpriceLab = courseView.findViewById(R.id.tv_course_marketprice_lab);
+
+            final CourseItemBean courseItemBean = listCourses.get(j);
+            tvCourseTitle.setText(courseItemBean.getTitle());
+            if (!TextUtils.isEmpty(courseItemBean.getPrice())) {
+                tvCoursePrice.setText("￥" + courseItemBean.getPrice());
+            }
+            if (!TextUtils.isEmpty(courseItemBean.getMarketPrice())) {
+                tvCourseMarketpriceLab.setVisibility(View.VISIBLE);
+                tvCourseMarketprice.setText(courseItemBean.getMarketPrice());
+                tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
+            } else {
+                tvCourseMarketpriceLab.setVisibility(View.GONE);
+            }
+
+            //课程详情
+            courseView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(getActivity(), CourseDetailActivity.class);
+                    intent.putExtra("courseId", courseItemBean.getCourseId());
+                    startActivity(intent);
+                }
+            });
+            llCourseMain.addView(courseView);
+        }
+    }
+
+    /**
      * 初始化Banner数据
      */
     private void initBannerView() {

app/src/main/java/com/ynstkz/shitu/android/fragment/OrgListFragment.java

@@ -365,11 +365,11 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
                 } else if (filterIndex == 3) {
                     tvFilterOrder.setText(content);
                     if (i == 0) {
-                        sortType = "1";
+                        sortType = "";
                     } else if (i == 1) {
-                        sortType = "2";
+                        sortType = "1";
                     } else if (i == 2) {
-                        sortType = "3";
+                        sortType = "2";
                     }
                     pageNumber = 1;
                     getOrgList();

app/src/main/res/layout/activity_course_detail.xml

@@ -104,44 +104,46 @@
 
             </RelativeLayout>
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:padding="@dimen/default_content_margin">
 
-
                 <TextView
                     android:id="@+id/tv_org_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_toLeftOf = "@+id/tv_course_marketprice_main"
                     android:textColor="@color/color_333"
                     android:textSize="@dimen/company_16sp" />
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
+                <LinearLayout
+                    android:id="@+id/tv_course_marketprice_main"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/company_15dp">
+                    android:layout_alignParentRight="true"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/tv_view_count"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textSize="@dimen/company_12sp"
                         android:textColor="@color/color_666"
-                        android:textSize="@dimen/company_12sp" />
+                        android:text="市场价￥"/>
 
                     <TextView
                         android:id="@+id/tv_course_marketprice"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
                         android:textSize="@dimen/company_12sp"
                         android:textColor="@color/color_666"/>
 
-                </RelativeLayout>
+                </LinearLayout>
 
-            </LinearLayout>
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -152,6 +154,7 @@
                 android:padding="@dimen/default_content_margin">
 
                 <TextView
+                    android:id="@+id/tv_org_desc_lab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="课程介绍"
@@ -168,7 +171,7 @@
 
             </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/company_10dp"
@@ -177,30 +180,28 @@
                 android:padding="@dimen/default_content_margin">
 
                 <TextView
-                    android:id="@+id/tv_enrollmentArea_lab"
+                    android:id="@+id/tv_requirement_lab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
-                    android:text="招生区域："
+                    android:text="报名要求："
                     android:textColor="@color/color_333"
                     android:textSize="@dimen/company_15sp" />
 
                 <TextView
-                    android:id="@+id/tv_enrollmentArea"
+                    android:id="@+id/tv_requirement"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:layout_marginTop="@dimen/company_2dp"
-                    android:layout_alignTop="@+id/tv_enrollmentArea_lab"
-                    android:layout_toRightOf="@+id/tv_enrollmentArea_lab"
                     android:layout_gravity="center_vertical"
                     android:textColor="@color/color_666"
                     android:textSize="@dimen/company_12sp"/>
 
-            </RelativeLayout>
+            </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/tv_registrationt_main"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/company_10dp"
@@ -209,16 +210,17 @@
                 android:padding="@dimen/default_content_margin">
 
                 <TextView
+                    android:id="@+id/tv_registration_lab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
-                    android:text="报名要求："
+                    android:text="报名时间："
                     android:textColor="@color/color_333"
                     android:textSize="@dimen/company_15sp" />
 
                 <TextView
-                    android:id="@+id/tv_requirement"
+                    android:id="@+id/tv_registrationt"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
@@ -228,6 +230,38 @@
 
             </LinearLayout>
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_10dp"
+                android:background="@color/white"
+                android:orientation="horizontal"
+                android:padding="@dimen/default_content_margin">
+
+                <TextView
+                    android:id="@+id/tv_enrollmentArea_lab"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="center_vertical"
+                    android:text="招生区域："
+                    android:textColor="@color/color_333"
+                    android:textSize="@dimen/company_15sp" />
+
+                <TextView
+                    android:id="@+id/tv_enrollmentArea"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="@dimen/company_2dp"
+                    android:layout_alignTop="@+id/tv_enrollmentArea_lab"
+                    android:layout_toRightOf="@+id/tv_enrollmentArea_lab"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/color_666"
+                    android:textSize="@dimen/company_12sp"/>
+
+            </RelativeLayout>
+
         </LinearLayout>
 
     </com.common.library.pulltorefresh.PullToRefreshScrollView>
@@ -235,7 +269,7 @@
     <LinearLayout
         android:id="@+id/ll_price_bottom"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/company_45dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal"
         android:background="@color/white">
@@ -247,6 +281,8 @@
             android:layout_weight="1"
             android:layout_gravity="center"
             android:gravity="center"
+            android:paddingTop="@dimen/company_10dp"
+            android:paddingBottom="@dimen/company_10dp"
             android:background="@color/white"
             android:textSize="@dimen/company_16sp"
             android:textColor="@color/color_price"/>
@@ -258,6 +294,8 @@
             android:layout_weight="1"
             android:layout_gravity="center"
             android:gravity="center"
+            android:paddingTop="@dimen/company_10dp"
+            android:paddingBottom="@dimen/company_10dp"
             android:background="@color/main_color"
             android:textSize="@dimen/company_16sp"
             android:textColor="@color/white"

app/src/main/res/layout/activity_org_detail.xml

@@ -211,6 +211,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/ll_course_main"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/company_10dp"
@@ -219,6 +220,7 @@
                 android:padding="@dimen/default_content_margin">
 
                 <TextView
+                    android:id="@+id/tv_course_lab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/color_333"

app/src/main/res/layout/activity_userinfo.xml

@@ -87,7 +87,8 @@
         <RelativeLayout
             android:id="@+id/rl_three_account"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -106,7 +107,8 @@
 
         </RelativeLayout>
 
-        <include layout="@layout/view_default_line" />
+        <include layout="@layout/view_default_line"
+            android:visibility="gone"/>
 
         <RelativeLayout
             android:id="@+id/rl_id_auth"

app/src/main/res/layout/item_org_course_recommend_list.xml

@@ -45,6 +45,7 @@
                 android:layout_marginTop="@dimen/company_10dp">
 
                 <TextView
+                    android:id="@+id/tv_course_marketprice_lab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/color_999"

app/src/main/res/layout/item_org_list.xml

@@ -15,7 +15,8 @@
         <ImageView
             android:id="@+id/iv_headPic"
             android:layout_width="@dimen/company_80dp"
-            android:layout_height="@dimen/company_80dp"/>
+            android:layout_height="@dimen/company_80dp"
+            android:scaleType="centerCrop"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -96,6 +97,17 @@
 
     </LinearLayout>
 
+    <Button
+        android:id="@+id/btn_course_more"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/company_30dp"
+        android:background="@null"
+        android:textSize="@dimen/company_12sp"
+        android:textColor="@color/main_color"
+        android:orientation="vertical"
+        android:text="查看其他课程"
+        android:visibility="gone"/>
+
     <include layout="@layout/view_default_line"/>
 
 </LinearLayout>

app/src/main/res/layout/item_org_recommend_list.xml

@@ -15,7 +15,8 @@
         <ImageView
             android:id="@+id/iv_headPic"
             android:layout_width="@dimen/company_80dp"
-            android:layout_height="@dimen/company_80dp"/>
+            android:layout_height="@dimen/company_80dp"
+            android:scaleType="centerCrop"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -88,6 +89,8 @@
 
     </LinearLayout>
 
+    <include layout="@layout/view_default_line"/>
+
     <LinearLayout
         android:id="@+id/ll_course_main"
         android:layout_width="match_parent"
@@ -97,7 +100,7 @@
     </LinearLayout>
 
     <Button
-        android:id="@+id/ll_course_more"
+        android:id="@+id/btn_course_more"
         android:layout_width="match_parent"
         android:layout_height="@dimen/company_30dp"
         android:background="@null"

app/src/main/res/layout/item_orgdetail_course.xml

@@ -15,7 +15,8 @@
             android:id="@+id/iv_headPic"
             android:layout_width="@dimen/company_80dp"
             android:layout_height="@dimen/company_80dp"
-            android:layout_centerVertical="true"/>
+            android:layout_centerVertical="true"
+            android:scaleType="centerCrop"/>
 
         <RelativeLayout
             android:layout_width="match_parent"

app/src/main/res/layout/view_home_title.xml

@@ -56,7 +56,7 @@
             android:layout_height="match_parent"
             android:layout_toRightOf="@+id/iv_search_icon"
             android:layout_toLeftOf="@+id/iv_clear_edittext"
-            android:hint="机构/学校/家教名称"
+            android:hint="机构/学校名称"
             android:layout_marginLeft="@dimen/company_5dp"
             android:imeOptions="actionSearch"
             android:singleLine="true"