修改测试反馈问题

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

@@ -51,6 +51,12 @@ public class CourseDetailActivity extends TitleBarActivity {
     ImageView ivShare;
     @Bind(R.id.tv_course_marketprice)
     TextView tvCourseMarketprice;
+    @Bind(R.id.tv_enrollmentArea)
+    TextView tvEnrollmentArea;
+    @Bind(R.id.tv_requirement)
+    TextView tvRequirement;
+    @Bind(R.id.tv_view_count)
+    TextView tvViewCount;
 
     private String courseId;
     private CourseDetilBean courseDetilBean;
@@ -121,7 +127,7 @@ public class CourseDetailActivity extends TitleBarActivity {
         ivCollect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(isLogin()){
+                if (isLogin()) {
                     if (!isCollect) {
                         collectCourse(courseId + "");
                     } else {
@@ -175,12 +181,15 @@ public class CourseDetailActivity extends TitleBarActivity {
             return;
         }
         CourseDetilBean.DataBean dataBean = courseDetilBean.getData();
+        tvViewCount.setText("收藏：" + courseDetilBean.getData().getViewCount() + "次");
         tvTitle.setText(dataBean.getTitle());
         tvOrgName.setText(dataBean.getTitle());
         tvOrgDesc.setText(dataBean.getDetail());
         tvPrice.setText("￥" + dataBean.getPrice() + "元");
         tvCourseMarketprice.setText("市场价￥" + dataBean.getMarketPrice());
         isCollect = courseDetilBean.getData().isCollect();
+        tvEnrollmentArea.setText(courseDetilBean.getData().getEnrollmentArea());
+        tvRequirement.setText(courseDetilBean.getData().getRequirement());
         initCollectIcon();
     }
 

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

@@ -235,7 +235,6 @@ public class OrgDetailActivity extends TitleBarActivity {
                         showToast(orgDetailBean.getMsg());
                     }
                 }
-                svMain.smoothScrollTo(0,0);
             }
         });
     }

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

@@ -1,6 +1,5 @@
 package com.ynstkz.shitu.android.bean;
 
-import com.google.gson.annotations.SerializedName;
 import com.ynstkz.shitu.android.base.BaseBean;
 
 import java.io.Serializable;
@@ -23,40 +22,95 @@ public class CourseDetilBean extends BaseBean{
 
     public static class DataBean implements Serializable{
 
-        private String courseId;
+        private int marketPrice;
+        private boolean isNormal;
+        private int collectCount;
+        private boolean isCollect;
+        private String enrollmentArea;
+        private String memberName;
+        private String lon;
+        private String requirement;
         private String title;
-        private String detail;
         private String coursePic;
+        private String phone;
         private int price;
-        private int marketPrice;
-        private String memberId;
-        private String createTime;
-        private String updateTime;
-        private int isDelete;
-        private boolean isCollect;
+        private String detail;
+        private int courseId;
+        private String introduction;
+        private String lat;
+        private int memberId;
+        private String viewCount;
 
-        public String getCourseId() {
-            return courseId;
+        public int getMarketPrice() {
+            return marketPrice;
         }
 
-        public void setCourseId(String courseId) {
-            this.courseId = courseId;
+        public void setMarketPrice(int marketPrice) {
+            this.marketPrice = marketPrice;
         }
 
-        public String getTitle() {
-            return title;
+        public int getCollectCount() {
+            return collectCount;
         }
 
-        public void setTitle(String title) {
-            this.title = title;
+        public void setCollectCount(int collectCount) {
+            this.collectCount = collectCount;
         }
 
-        public String getDetail() {
-            return detail;
+        public boolean isNormal() {
+            return isNormal;
         }
 
-        public void setDetail(String detail) {
-            this.detail = detail;
+        public void setNormal(boolean normal) {
+            isNormal = normal;
+        }
+
+        public boolean isCollect() {
+            return isCollect;
+        }
+
+        public void setCollect(boolean collect) {
+            isCollect = collect;
+        }
+
+        public String getEnrollmentArea() {
+            return enrollmentArea;
+        }
+
+        public void setEnrollmentArea(String enrollmentArea) {
+            this.enrollmentArea = enrollmentArea;
+        }
+
+        public String getMemberName() {
+            return memberName;
+        }
+
+        public void setMemberName(String memberName) {
+            this.memberName = memberName;
+        }
+
+        public String getLon() {
+            return lon;
+        }
+
+        public void setLon(String lon) {
+            this.lon = lon;
+        }
+
+        public String getRequirement() {
+            return requirement;
+        }
+
+        public void setRequirement(String requirement) {
+            this.requirement = requirement;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
         }
 
         public String getCoursePic() {
@@ -67,6 +121,14 @@ public class CourseDetilBean extends BaseBean{
             this.coursePic = coursePic;
         }
 
+        public String getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+
         public int getPrice() {
             return price;
         }
@@ -75,52 +137,52 @@ public class CourseDetilBean extends BaseBean{
             this.price = price;
         }
 
-        public int getMarketPrice() {
-            return marketPrice;
+        public String getDetail() {
+            return detail;
         }
 
-        public void setMarketPrice(int marketPrice) {
-            this.marketPrice = marketPrice;
+        public void setDetail(String detail) {
+            this.detail = detail;
         }
 
-        public String getMemberId() {
-            return memberId;
+        public int getCourseId() {
+            return courseId;
         }
 
-        public void setMemberId(String memberId) {
-            this.memberId = memberId;
+        public void setCourseId(int courseId) {
+            this.courseId = courseId;
         }
 
-        public String getCreateTime() {
-            return createTime;
+        public String getIntroduction() {
+            return introduction;
         }
 
-        public void setCreateTime(String createTime) {
-            this.createTime = createTime;
+        public void setIntroduction(String introduction) {
+            this.introduction = introduction;
         }
 
-        public String getUpdateTime() {
-            return updateTime;
+        public String getLat() {
+            return lat;
         }
 
-        public void setUpdateTime(String updateTime) {
-            this.updateTime = updateTime;
+        public void setLat(String lat) {
+            this.lat = lat;
         }
 
-        public int getIsDelete() {
-            return isDelete;
+        public int getMemberId() {
+            return memberId;
         }
 
-        public void setIsDelete(int isDelete) {
-            this.isDelete = isDelete;
+        public void setMemberId(int memberId) {
+            this.memberId = memberId;
         }
 
-        public boolean isCollect() {
-            return isCollect;
+        public String getViewCount() {
+            return viewCount;
         }
 
-        public void setCollect(boolean collect) {
-            isCollect = collect;
+        public void setViewCount(String viewCount) {
+            this.viewCount = viewCount;
         }
     }
 }

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

@@ -99,6 +99,7 @@
                     android:layout_marginTop="@dimen/company_15dp">
 
                     <TextView
+                        android:id="@+id/tv_view_count"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/color_666"
@@ -141,6 +142,62 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                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: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_gravity="center_vertical"
+                    android:textColor="@color/color_666"
+                    android:textSize="@dimen/company_12sp"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                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: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_requirement"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/color_666"
+                    android:textSize="@dimen/company_12sp"/>
+
+            </LinearLayout>
+
         </LinearLayout>
 
     </ScrollView>

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

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