소스 검색

修改测试人员提出的问题

316044749 7 년 전
부모
커밋
e9992d5d18
2개의 변경된 파일32개의 추가작업 그리고 10개의 파일을 삭제
  1. 26 10
      app/src/main/java/com/ynstkz/shitu/android/activity/OrgDetailActivity.java
  2. 6 0
      app/src/main/res/layout/org_detail_service_item.xml

+ 26 - 10
app/src/main/java/com/ynstkz/shitu/android/activity/OrgDetailActivity.java

@@ -9,6 +9,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -28,12 +29,12 @@ import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.CourseItemBean;
 import com.ynstkz.shitu.android.bean.EvaluateListBean;
 import com.ynstkz.shitu.android.bean.OrgDetailBean;
-import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.data.UrlCat;
 import com.ynstkz.shitu.android.exter.GlideRoundTransform;
 import com.ynstkz.shitu.android.helper.UmengShareHelper;
 import com.ynstkz.shitu.android.view.ListViewForScrollView;
+import com.ynstkz.shitu.android.view.ScrollViewWithGridView;
 
 import java.util.Date;
 import java.util.List;
@@ -84,6 +85,10 @@ public class OrgDetailActivity extends TitleBarActivity {
     ImageView ivShare;
     @Bind(R.id.ll_comment_main)
     LinearLayout llCommentMain;
+    @Bind(R.id.gv_service)
+    ScrollViewWithGridView gvService;
+    @Bind(R.id.ll_org_service)
+    LinearLayout llOrgService;
 
     private int memberId;
     private boolean isCollect;
@@ -153,7 +158,7 @@ public class OrgDetailActivity extends TitleBarActivity {
         ivCollect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(!isCollect){
+                if (!isCollect) {
                     collectOrg(memberId + "");
                 } else {
                     cacelCollectOrg(memberId + "");
@@ -244,13 +249,24 @@ public class OrgDetailActivity extends TitleBarActivity {
             orgCourseListAdapter.notifyDataSetChanged();
         }
 
+        //特色服务
+        if (!TextUtils.isEmpty(dataBean.getService())) {
+            llOrgService.setVisibility(View.VISIBLE);
+            ArrayAdapter<String> mOrgDetailServiceAdapter = new ArrayAdapter<String>(OrgDetailActivity.this,
+                    R.layout.org_detail_service_item, dataBean.getService().split("\\|"));
+            gvService.setAdapter(mOrgDetailServiceAdapter);
+            mOrgDetailServiceAdapter.notifyDataSetChanged();
+        } else {
+            llOrgService.setVisibility(View.GONE);
+        }
+
         //评论列表
         List<EvaluateListBean> evaluateList = dataBean.getEvaluateList();
-        if(evaluateList != null && evaluateList.size() > 0){
+        if (evaluateList != null && evaluateList.size() > 0) {
             tvCommentList.setText(evaluateList.size() + "条评论");
             llCommentMain.setVisibility(View.VISIBLE);
             llCommentMain.removeAllViews();
-            for(int i=0; i<evaluateList.size(); i++){
+            for (int i = 0; i < evaluateList.size(); i++) {
                 EvaluateListBean evaluateListBean = evaluateList.get(i);
                 View view = LayoutInflater.from(this).inflate(R.layout.item_orgdetail_comment, null);
                 ImageView ivHeadPic = view.findViewById(R.id.iv_headPic);
@@ -260,8 +276,8 @@ public class OrgDetailActivity extends TitleBarActivity {
                 TextView tvCommentContent = view.findViewById(R.id.tv_comment_content);
                 GridView gvCommentPic = view.findViewById(R.id.gv_comment_pic);
 
-                if(!TextUtils.isEmpty(evaluateListBean.getHeadPic())){
-                    if(evaluateListBean.getHeadPic().startsWith("http")){
+                if (!TextUtils.isEmpty(evaluateListBean.getHeadPic())) {
+                    if (evaluateListBean.getHeadPic().startsWith("http")) {
                         Glide.with(this).load(evaluateListBean.getHeadPic()).asBitmap()
                                 .transform(new GlideRoundTransform(this)).into(ivHeadPic);
                     } else {
@@ -272,7 +288,7 @@ public class OrgDetailActivity extends TitleBarActivity {
                     ivHeadPic.setImageResource(R.drawable.default_head_icon);
                 }
                 tvUsername.setText(evaluateListBean.getUserName());
-                tvTime.setText(DateUtil.format(new Date(evaluateListBean.getCreateTime()),DateUtil.DATE_TIME_FORMAT_YYYY年MM月DD日));
+                tvTime.setText(DateUtil.format(new Date(evaluateListBean.getCreateTime()), DateUtil.DATE_TIME_FORMAT_YYYY年MM月DD日));
                 rbScore.setProgress(evaluateListBean.getScore());
                 tvCommentContent.setText(evaluateListBean.getContent());
 
@@ -357,8 +373,8 @@ public class OrgDetailActivity extends TitleBarActivity {
     /**
      * 初始化收藏图标
      */
-    private void initCollectIcon(){
-        if(!isCollect){
+    private void initCollectIcon() {
+        if (!isCollect) {
             ivCollect.setImageResource(R.drawable.collect_icon);
         } else {
             ivCollect.setImageResource(R.drawable.collect_press_icon);
@@ -370,7 +386,7 @@ public class OrgDetailActivity extends TitleBarActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case 10:
-                if(resultCode == RESULT_OK) {
+                if (resultCode == RESULT_OK) {
                     getOrgDetail(memberId);
                 }
         }

+ 6 - 0
app/src/main/res/layout/org_detail_service_item.xml

@@ -0,0 +1,6 @@
+<?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">
+
+</LinearLayout>