修改测试反馈的问题

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

@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.base.BaseBean;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.CourseDetilBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
@@ -53,6 +54,7 @@ public class CourseDetailActivity extends TitleBarActivity {
 
     private String courseId;
     private CourseDetilBean courseDetilBean;
+    private boolean isCollect;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -112,6 +114,24 @@ public class CourseDetailActivity extends TitleBarActivity {
                 }
             }
         });
+
+        /**
+         * 收藏
+         */
+        ivCollect.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(isLogin()){
+                    if (!isCollect) {
+                        collectCourse(courseId + "");
+                    } else {
+                        cacelCollectCourse(courseId + "");
+                    }
+                } else {
+                    startActivityForResult(new Intent(CourseDetailActivity.this, LoginActivity.class), 20);
+                }
+            }
+        });
     }
 
     /**
@@ -160,5 +180,95 @@ public class CourseDetailActivity extends TitleBarActivity {
         tvOrgDesc.setText(dataBean.getDetail());
         tvPrice.setText("￥" + dataBean.getPrice() + "元");
         tvCourseMarketprice.setText("市场价￥" + dataBean.getMarketPrice());
+        isCollect = courseDetilBean.getData().isCollect();
+        initCollectIcon();
+    }
+
+
+    /**
+     * 收藏
+     *
+     * @param memberId
+     */
+    private void collectCourse(String memberId) {
+
+        RequestGroup.sumintCollect(memberId, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), BaseBean.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) {
+                BaseBean baseBean = (BaseBean) response;
+                if (baseBean != null) {
+                    if ("200".equals(baseBean.getCode())) {
+                        isCollect = true;
+                        initCollectIcon();
+                    }
+                    showToast(baseBean.getMsg());
+                }
+            }
+        });
+    }
+
+    /**
+     * 取消收藏
+     */
+    /**
+     * 收藏
+     *
+     * @param memberId
+     */
+    private void cacelCollectCourse(String memberId) {
+
+        RequestGroup.cancelCollect(memberId, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), BaseBean.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) {
+                BaseBean baseBean = (BaseBean) response;
+                if (baseBean != null) {
+                    if ("200".equals(baseBean.getCode())) {
+                        isCollect = false;
+                        initCollectIcon();
+                    }
+                    showToast(baseBean.getMsg());
+                }
+            }
+        });
+    }
+
+    /**
+     * 初始化收藏图标
+     */
+    private void initCollectIcon() {
+        if (!isCollect) {
+            ivCollect.setImageResource(R.drawable.collect_icon);
+        } else {
+            ivCollect.setImageResource(R.drawable.collect_press_icon);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case 20:
+                collectCourse(courseId);
+                break;
+        }
     }
 }

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

@@ -389,6 +389,7 @@ public class LoginActivity extends TitleBarActivity {
 
         showToast(loginBean.getMsg());
         EventBus.getDefault().post(new LoginEvent());
+        setResult(RESULT_OK);
         finish();
     }
 

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

@@ -89,6 +89,8 @@ public class OrgDetailActivity extends TitleBarActivity {
     ScrollViewWithGridView gvService;
     @Bind(R.id.ll_org_service)
     LinearLayout llOrgService;
+    @Bind(R.id.ll_recommend_main)
+    LinearLayout llRecommendMain;
 
     private int memberId;
     private boolean isCollect;
@@ -158,10 +160,14 @@ public class OrgDetailActivity extends TitleBarActivity {
         ivCollect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (!isCollect) {
-                    collectOrg(memberId + "");
+                if(isLogin()){
+                    if (!isCollect) {
+                        collectOrg(memberId + "");
+                    } else {
+                        cacelCollectOrg(memberId + "");
+                    }
                 } else {
-                    cacelCollectOrg(memberId + "");
+                    startActivityForResult(new Intent(OrgDetailActivity.this, LoginActivity.class), 20);
                 }
             }
         });
@@ -301,6 +307,13 @@ public class OrgDetailActivity extends TitleBarActivity {
         } else {
             llCommentMain.setVisibility(View.GONE);
         }
+
+        //相似评论
+        if(dataBean.getRecentList() != null && dataBean.getRecentList().size() > 0){
+            llRecommendMain.setVisibility(View.VISIBLE);
+        } else {
+            llRecommendMain.setVisibility(View.GONE);
+        }
     }
 
     /**
@@ -389,6 +402,12 @@ public class OrgDetailActivity extends TitleBarActivity {
                 if (resultCode == RESULT_OK) {
                     getOrgDetail(memberId);
                 }
+                break;
+            case 20:
+                if (resultCode == RESULT_OK) {
+                    collectOrg(memberId + "");
+                }
+                break;
         }
     }
 }

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

@@ -140,17 +140,12 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
         btnSubmint.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(rbScore.getProgress() == 0){
-                    showToast("评分不能为空！");
-                    return;
+                if(!isLogin()){
+                    startActivityForResult(new Intent(OrgWriteCommentActivity.this, LoginActivity.class), 10);
+                } else {
+                    submintOrgComment(memberId);
                 }
-                String content = editContent.getText().toString().trim();
-                String score = rbScore.getProgress() + "";
 
-                progressDialog = new ProgressDialog(OrgWriteCommentActivity.this);
-                progressDialog.setMessage("正在提交...");
-                progressDialog.show();
-                submintOrgComment(memberId, score, content, fileParam);
             }
         });
     }
@@ -159,13 +154,21 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
      * 提交机构评论
      *
      * @param memberId
-     * @param score
-     * @param content
-     * @param files
      */
-    private void submintOrgComment(String memberId, String score, String content, Map<String, File> files) {
+    private void submintOrgComment(String memberId) {
 
-        RequestGroup.submintOrgComment(memberId, score, content, files, new Callback() {
+        if(rbScore.getProgress() == 0){
+            showToast("评分不能为空！");
+            return;
+        }
+        String content = editContent.getText().toString().trim();
+        String score = rbScore.getProgress() + "";
+
+        progressDialog = new ProgressDialog(OrgWriteCommentActivity.this);
+        progressDialog.setMessage("正在提交...");
+        progressDialog.show();
+
+        RequestGroup.submintOrgComment(memberId, score, content, fileParam, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
                 return new Gson().fromJson(response.body().string(), OrgCommentSubmintBean.class);
@@ -364,6 +367,9 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
                 }
                 addTakeImage(uploadFile);
                 break;
+            case 10:
+                submintOrgComment(memberId);
+                break;
         }
     }
 }

app/src/main/java/com/ynstkz/shitu/android/adapter/MineCollectItemAdapter.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;
@@ -10,6 +11,7 @@ import com.common.library.adapter.CCAdapterHolder;
 import com.common.library.adapter.CCListAdapter;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.bean.OrgItemBean;
+import com.ynstkz.shitu.android.data.UrlCat;
 
 import java.util.List;
 
@@ -60,7 +62,15 @@ public class MineCollectItemAdapter extends CCListAdapter<OrgItemBean>{
 
             @Override
             public void updateView(OrgItemBean content, int position) {
-                Glide.with(context).load(content.getHeadPic()).into(ivHeadPic);
+                if(!TextUtils.isEmpty(content.getHeadPic())){
+                    if(content.getHeadPic().startsWith("http")) {
+                        Glide.with(context).load(content.getHeadPic()).into(ivHeadPic);
+                    } else {
+                        Glide.with(context).load(UrlCat.HOST + content.getHeadPic()).into(ivHeadPic);
+                    }
+                } else {
+                    ivHeadPic.setImageResource(R.drawable.org_item_default_icon);
+                }
                 tvMemberName.setText(content.getMemberName());
                 tvRegaddress.setText(content.getAddress());
                 materialRatingBar.setProgress(content.getScore());

app/src/main/java/com/ynstkz/shitu/android/application/STSign.java

@@ -20,6 +20,7 @@ import com.ynstkz.shitu.android.base.BaseBean;
 import com.ynstkz.shitu.android.bean.UserInfoBean;
 import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
+import com.ynstkz.shitu.android.data.SharedPreferencesDao;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.event.LogoutEvent;
 import com.ynstkz.shitu.android.listener.CheckVerifyCodeCallback;
@@ -175,6 +176,8 @@ public class STSign {
     public static void logout(){
         EventBus.getDefault().post(new LogoutEvent());
         SharedPreferencesUtils.setLogin(false);
+        SharedPreferencesDao.remove(SharedPreferencesUtils.KEY_TOKEN);
+        SharedPreferencesDao.remove(SharedPreferencesUtils.KEY_USERID);
         Cache.clean(Constants.CACHE_USER_KEY);
     }
 }

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

@@ -33,6 +33,7 @@ public class CourseDetilBean extends BaseBean{
         private String createTime;
         private String updateTime;
         private int isDelete;
+        private boolean isCollect;
 
         public String getCourseId() {
             return courseId;
@@ -113,5 +114,13 @@ public class CourseDetilBean extends BaseBean{
         public void setIsDelete(int isDelete) {
             this.isDelete = isDelete;
         }
+
+        public boolean isCollect() {
+            return isCollect;
+        }
+
+        public void setCollect(boolean collect) {
+            isCollect = collect;
+        }
     }
 }

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

@@ -36,6 +36,8 @@ public class OrgDetailBean extends BaseBean{
         private List<CourseItemBean> courseList;
         private List<String> showPicList;
         private boolean isCollect;
+        private String service;
+        private List<OrgItemBean> recentList;
 
         public String getAddress() {
             return address;
@@ -148,5 +150,21 @@ public class OrgDetailBean extends BaseBean{
         public void setCollect(boolean collect) {
             isCollect = collect;
         }
+
+        public String getService() {
+            return service;
+        }
+
+        public void setService(String service) {
+            this.service = service;
+        }
+
+        public List<OrgItemBean> getRecentList() {
+            return recentList;
+        }
+
+        public void setRecentList(List<OrgItemBean> recentList) {
+            this.recentList = recentList;
+        }
     }
 }

app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -244,6 +244,7 @@ public class RequestGroup {
     public static void getNearbyAgencyList(String pageNumber, String lon, String lat, String agencyTypeId, String sortType, String keyword, Callback callback){
         Map<String, String> params = getSystemParams();
         params.put("pageNumber",pageNumber);
+        params.put("pageSize", "10");
         if(!TextUtils.isEmpty(lon)){
             params.put("lon", lon);
         }

app/src/main/java/com/ynstkz/shitu/android/data/SharedPreferencesUtils.java

@@ -12,9 +12,9 @@ public class SharedPreferencesUtils {
 
     private static final String KEY_LOCATION = "key_location";
 
-    private static final String KEY_TOKEN = "token";
+    public static final String KEY_TOKEN = "token";
 
-    private static final String KEY_USERID = "userId";
+    public static final String KEY_USERID = "userId";
 
     /**
      * 是否登录

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

@@ -3,6 +3,7 @@ package com.ynstkz.shitu.android.fragment;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -41,7 +42,6 @@ import com.ynstkz.shitu.android.adapter.OrgNavigationGridAdapter;
 import com.ynstkz.shitu.android.application.STSign;
 import com.ynstkz.shitu.android.base.BaseFragment;
 import com.ynstkz.shitu.android.bean.CourseItemBean;
-import com.ynstkz.shitu.android.bean.CourseNavigationBean;
 import com.ynstkz.shitu.android.bean.HomeBannerBean;
 import com.ynstkz.shitu.android.bean.LocationDataBean;
 import com.ynstkz.shitu.android.bean.OrgItemBean;
@@ -95,6 +95,8 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     RelativeLayout rlOrgMore;
     @Bind(R.id.ll_phone_server)
     LinearLayout llPhoneServer;
+    @Bind(R.id.ll_point_main)
+    LinearLayout llPointMain;
 
 
     private List<HomeBannerBean.DataBean> listBanner;
@@ -104,6 +106,9 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     private double latitude;
 
     private OrgNavigationGridAdapter orgNavigationGridAdapter;
+    private int bannerRealSize;
+    private int pointIndex;
+    private List<ImageView> listPointView;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -118,6 +123,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     private void initView() {
         EventBus.getDefault().register(this);
         svMain.setOnRefreshListener(this);
+        listBanner = new ArrayList<>();
     }
 
     private void initData() {
@@ -142,6 +148,8 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
             @Override
             public void onPageSelected(int position) {
                 bannerIndex = position;
+                pointIndex = position % bannerRealSize;
+                refreshPointView();
             }
 
             @Override
@@ -184,11 +192,11 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
 
-                if(orgNavigationGridAdapter == null){
+                if (orgNavigationGridAdapter == null) {
                     return;
                 }
 
-                OrgNavigationBean.DataBean dataBean = (OrgNavigationBean.DataBean)adapterView.getAdapter().getItem(i);
+                OrgNavigationBean.DataBean dataBean = (OrgNavigationBean.DataBean) adapterView.getAdapter().getItem(i);
 
                 Intent intent = new Intent(getActivity(), OrgListActivity.class);
                 intent.putExtra("isHideTitleView", true);
@@ -223,15 +231,15 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     /**
      * 初始化缓存数据
      */
-    private void initCacheData(){
+    private void initCacheData() {
         //初始化banner
 
         //获取机构导航数据
         Cache<OrgNavigationBean> cacheNavigation = new Cache<>();
         OrgNavigationBean orgNavigationBean = cacheNavigation.get("OrgNavigationBean");
-        if(orgNavigationBean != null){
-            if("200".equals(orgNavigationBean.getCode())){
-                if(orgNavigationBean.getData() != null && orgNavigationBean.getData().size() > 0){
+        if (orgNavigationBean != null) {
+            if ("200".equals(orgNavigationBean.getCode())) {
+                if (orgNavigationBean.getData() != null && orgNavigationBean.getData().size() > 0) {
                     orgNavigationGridAdapter = new OrgNavigationGridAdapter(getActivity(), orgNavigationBean.getData());
                     gvCourseNavigation.setAdapter(orgNavigationGridAdapter);
                     orgNavigationGridAdapter.notifyDataSetChanged();
@@ -264,8 +272,18 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
                 if (bannerBean != null) {
                     if ("200".equals(bannerBean.getCode())) {
                         if (bannerBean.getData() != null) {
-                            listBanner = bannerBean.getData();
+                            List<HomeBannerBean.DataBean> listBanner = bannerBean.getData();
+                            bannerRealSize = listBanner.size();
+                            HomeFragment.this.listBanner.clear();
+                            if(bannerRealSize > 1) {
+                                for (int i = 0; i < 100; i++) {
+                                    HomeFragment.this.listBanner.addAll(listBanner);
+                                }
+                            } else {
+                                HomeFragment.this.listBanner.addAll(listBanner);
+                            }
                             initBannerView();
+                            initPointView();
                         }
                     } else {
                         showToast(bannerBean.getMsg());
@@ -293,10 +311,10 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
 
             @Override
             public void onResponse(Object response, int id) {
-                OrgNavigationBean orgNavigationBean = (OrgNavigationBean)response;
-                if(orgNavigationBean != null){
-                    if("200".equals(orgNavigationBean.getCode())){
-                        if(orgNavigationBean.getData() != null && orgNavigationBean.getData().size() > 0){
+                OrgNavigationBean orgNavigationBean = (OrgNavigationBean) response;
+                if (orgNavigationBean != null) {
+                    if ("200".equals(orgNavigationBean.getCode())) {
+                        if (orgNavigationBean.getData() != null && orgNavigationBean.getData().size() > 0) {
                             orgNavigationGridAdapter = new OrgNavigationGridAdapter(getActivity(), orgNavigationBean.getData());
                             gvCourseNavigation.setAdapter(orgNavigationGridAdapter);
                             orgNavigationGridAdapter.notifyDataSetChanged();
@@ -369,7 +387,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
             TextView tvviewcount = view.findViewById(R.id.tv_view_count);
             //加载机构数据
             final OrgItemBean orgItemBean = listOrg.get(i);
-            if(!TextUtils.isEmpty(orgItemBean.getHeadPic())){
+            if (!TextUtils.isEmpty(orgItemBean.getHeadPic())) {
                 Glide.with(getActivity()).load(orgItemBean.getHeadPic()).asBitmap().transform(new GlideRoundTransform(getActivity())).into(iv_headPic);
             } else {
                 iv_headPic.setImageResource(R.drawable.org_item_default_icon);
@@ -438,7 +456,6 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
         getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
         viewpager.setPageMargin((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 25, metrics));
         viewpager.setPageTransformer(true, new MyPageTransform());
-        viewpager.setOffscreenPageLimit(listBanner.size());
 
         HomeBannerAdapter homeBannerAdapter = new HomeBannerAdapter(getActivity(), listBanner);
         viewpager.setAdapter(homeBannerAdapter);
@@ -447,6 +464,43 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
         handler.sendEmptyMessageDelayed(10, BANNER_DELAYED);
     }
 
+    /**
+     * 初始化焦点View
+     */
+    private void initPointView(){
+        if(bannerRealSize > 0){
+            listPointView = new ArrayList<>();
+            for(int i=0; i< bannerRealSize; i++) {
+                ImageView imageView = new ImageView(getActivity());
+                imageView.setImageResource(R.drawable.banner_point_nomal);
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(15, 15);
+                params.rightMargin = 10;
+                imageView.setLayoutParams(params);
+                listPointView.add(imageView);
+                llPointMain.addView(imageView);
+            }
+            refreshPointView();
+        }
+    }
+
+    /**
+     * 刷新焦点图片
+     */
+    private void refreshPointView(){
+        if(pointIndex >= bannerRealSize) {
+            pointIndex = 0;
+        }
+        if(listPointView != null && listBanner.size() > 0){
+            for(int i=0; i<listPointView.size(); i++){
+                if(i == pointIndex) {
+                    listPointView.get(i).setImageResource(R.drawable.banner_point_press);
+                } else {
+                    listPointView.get(i).setImageResource(R.drawable.banner_point_nomal);
+                }
+            }
+        }
+    }
+
     class MyPageTransform implements ViewPager.PageTransformer {
 
         final float SCALE_MAX = 0.8f;
@@ -516,9 +570,9 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode){
+        switch (requestCode) {
             case 20:
-                if(resultCode == Activity.RESULT_OK) {
+                if (resultCode == Activity.RESULT_OK) {
                     LocationDataBean locationDataBean = new LocationDataBean();
                     locationDataBean.setCity(data.getStringExtra("city"));
                     locationDataBean.setLatitude(data.getDoubleExtra("latitude", 0));

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

@@ -334,11 +334,17 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
                                     orgListAdapter.notifyDataSetChanged();
                                 }
                             } else {
-                                showNoData();
+                                if(listOrg != null && listOrg.size() > 0) {
+                                    showToast("已加载全部");
+                                } else {
+                                    showNoData();
+                                }
                             }
                         }
                     } else {
-                        showNoData();
+                        if(listOrg == null){
+                            showNoData();
+                        }
                         showToast(bean.getMsg());
                     }
                 }

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

@@ -77,7 +77,7 @@
                 android:layout_height="@dimen/company_50dp"
                 android:layout_marginTop="@dimen/company_10dp"
                 android:background="@drawable/shapre_default_edit_bg"
-                android:hint="请输入用户名称/手机号/邮箱"
+                android:hint="请输入手机号"
                 android:maxLines="1"
                 android:textCursorDrawable="@null"
                 android:textSize="@dimen/company_14sp" />

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

@@ -164,6 +164,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/ll_org_service"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/company_10dp"
@@ -178,6 +179,13 @@
                     android:textColor="@color/color_333"
                     android:textSize="@dimen/company_16sp" />
 
+                <com.ynstkz.shitu.android.view.ScrollViewWithGridView
+                    android:id="@+id/gv_service"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/company_5dp"
+                    android:numColumns="4"/>
+
             </LinearLayout>
 
             <LinearLayout
@@ -266,6 +274,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/ll_recommend_main"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/company_10dp"

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

@@ -120,7 +120,7 @@
             android:layout_height="wrap_content"
             android:textSize="@dimen/company_14sp"
             android:textColor="@color/main_color"
-            android:text="《灌灌在线用户协议》"/>
+            android:text="《仕途网用户协议》"/>
 
     </LinearLayout>
 

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

@@ -37,6 +37,16 @@
                    android:layout_centerInParent="true"
                    android:clipChildren="false"/>
 
+               <LinearLayout
+                   android:id="@+id/ll_point_main"
+                   android:layout_width="wrap_content"
+                   android:layout_height="@dimen/company_20dp"
+                   android:layout_alignParentRight="true"
+                   android:layout_alignParentBottom="true"
+                   android:layout_marginBottom="@dimen/company_5dp"
+                   android:layout_marginRight="@dimen/company_70dp"
+                   android:orientation="horizontal"/>
+
            </RelativeLayout>
 
            <com.ynstkz.shitu.android.view.ScrollViewWithGridView

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

@@ -15,8 +15,7 @@
         <ImageView
             android:id="@+id/iv_headPic"
             android:layout_width="@dimen/company_80dp"
-            android:layout_height="@dimen/company_80dp"
-            android:background="@mipmap/ic_launcher"/>
+            android:layout_height="@dimen/company_80dp"/>
 
         <RelativeLayout
             android:layout_width="match_parent"

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

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

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

@@ -6,7 +6,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/company_80dp"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingTop="@dimen/company_5dp"
         android:paddingBottom="@dimen/company_5dp">
@@ -14,12 +14,12 @@
         <ImageView
             android:id="@+id/iv_headPic"
             android:layout_width="@dimen/company_80dp"
-            android:layout_height="match_parent"
+            android:layout_height="@dimen/company_80dp"
             android:layout_centerVertical="true"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/company_10dp"
             android:layout_toRightOf="@+id/iv_headPic"
             android:layout_toLeftOf="@+id/ll_course_price"
@@ -41,6 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/tv_title"
                 android:layout_marginTop="@dimen/company_5dp"
+                android:ellipsize="end"
                 android:maxLines="3"
                 android:textSize="@dimen/company_13sp"
                 android:textColor="@color/color_666"/>
@@ -52,6 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical"
+            android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:gravity="center_vertical">
 

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

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv_lab"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:textSize="@dimen/company_14sp"
+    android:textColor="@color/color_666"
+    android:gravity="center">
 
-</LinearLayout>
+</TextView>