21:04

app_modular/appme/src/main/java/com/uas/appme/pedometer/adapter/UUAttentionAdapter.java

@@ -86,6 +86,11 @@ public class UUAttentionAdapter extends BaseAdapter{
             }
         }
 
+        if (model.getAttrank().get(position).getPrised())
+            viewHolder.prise_im.setImageResource(R.drawable.praised);
+        else
+            viewHolder.prise_im.setImageResource(R.drawable.praise);
+/*
         //点赞后的红色图标显示
         if (!ListUtils.isEmpty(model.getPricelist())){
             for (int i = 0; i < model.getPricelist().size(); i++) {
@@ -96,7 +101,7 @@ public class UUAttentionAdapter extends BaseAdapter{
                     viewHolder.prise_im.setImageResource(R.drawable.praise);
                 }
             }
-        }
+        }*/
 
         viewHolder.prise_im.setOnClickListener(new View.OnClickListener() {
             @Override

app_modular/appme/src/main/java/com/uas/appme/pedometer/adapter/UURankingAdapter.java

@@ -8,7 +8,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.common.data.ListUtils;
-import com.core.app.MyApplication;
 import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.uas.appme.R;
@@ -75,14 +74,18 @@ public class UURankingAdapter extends BaseAdapter{
             viewHolder.steps_tv.setTextColor(mContext.getResources().getColor(R.color.green));
         viewHolder.steps_tv.setText(model.getToalrank().get(position).getAs_uusteps());
         viewHolder.prise_tv.setText(model.getToalrank().get(position).getAs_prise());
-//        viewHolder.photo_img.setImageResource(CommonUtil.getNumByString(model.getToalrank().get(position).getAs_userid()));
         AvatarHelper.getInstance().display(CommonUtil.getNumByString(model.getToalrank().get(position).getAs_userid()) + "", viewHolder.photo_img, true, false);//显示圆角图片
-        if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getToalrank().get(position).getAs_userid())
-                && Integer.valueOf(model.getToalrank().get(position).getAs_prise()) > 0)
+//        if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getToalrank().get(position).getAs_userid())
+//                && Integer.valueOf(model.getToalrank().get(position).getAs_prise()) > 0)  //显示自己是否被赞
+//            viewHolder.prise_im.setImageResource(R.drawable.praised);
+//        else
+//            viewHolder.prise_im.setImageResource(R.drawable.praise);
+
+        if (model.getToalrank().get(position).getPrised())
             viewHolder.prise_im.setImageResource(R.drawable.praised);
         else
             viewHolder.prise_im.setImageResource(R.drawable.praise);
-        //点赞后的红色图标显示
+       /* //点赞后的红色图标显示
         if (!ListUtils.isEmpty(model.getPricelist())){
             for (int i = 0; i < model.getPricelist().size(); i++) {
                 if (model.getPricelist().get(i).getAp_userid().equals(model.getToalrank().get(position).getAs_userid())){
@@ -92,7 +95,7 @@ public class UURankingAdapter extends BaseAdapter{
                     viewHolder.prise_im.setImageResource(R.drawable.praise);
                 }
             }
-        }
+        }*/
         viewHolder.prise_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app_modular/appme/src/main/java/com/uas/appme/pedometer/bean/StepsRankingBean.java

@@ -56,6 +56,16 @@ public class StepsRankingBean {
         private String as_username;
         private String as_uusteps;
         private int rank;
+        private Boolean prised;
+
+
+        public Boolean getPrised() {
+            return prised;
+        }
+
+        public void setPrised(Boolean prised) {
+            this.prised = prised;
+        }
 
         public String getAs_prise() {
             return as_prise;
@@ -132,6 +142,16 @@ public class StepsRankingBean {
         private String as_username;
         private String as_uusteps;
         private int rank;
+        private Boolean prised;
+
+
+        public Boolean getPrised() {
+            return prised;
+        }
+
+        public void setPrised(Boolean prised) {
+            this.prised = prised;
+        }
 
         public String getAs_prise() {
             return as_prise;

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -171,30 +171,74 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                     ToastMessage("数据获取异常，请稍后再试");
                     return;
                 }else
-                    try {
-                    mStepsRankingBean = JSON.parseObject(o.toString(),StepsRankingBean.class);
-                    if (mStepsRankingBean.getToalrank() != null){
-                        mRankAdapter.setModel(mStepsRankingBean);
-                        mAllPtlv.setAdapter(mRankAdapter);
-                        mRankAdapter.notifyDataSetChanged();
+                    handleData(o.toString());
+            }
+        }));
+
+
+    }
+
+    private void handleData(String s) {
+        try {
+            mStepsRankingBean = JSON.parseObject(s.toString(),StepsRankingBean.class);
+            if (mStepsRankingBean == null) return;
+
+            if (!ListUtils.isEmpty(mStepsRankingBean.getPricelist())){
+                if (!ListUtils.isEmpty(mStepsRankingBean.getAttrank())){
+                    for (int i = 0; i < mStepsRankingBean.getAttrank().size(); i++) {
+                        if (mStepsRankingBean.getPricelist().contains(mStepsRankingBean.getAttrank().get(i).getAs_userid()))
+                            mStepsRankingBean.getAttrank().get(i).setPrised(true);
+                        else
+                            mStepsRankingBean.getAttrank().get(i).setPrised(false);
+
+                        if (i==mStepsRankingBean.getAttrank().size()-1){
+                            mAttenAdapter.setModel(mStepsRankingBean);
+                            mAttentionPtlv.setAdapter(mAttenAdapter);
+                            mAttenAdapter.notifyDataSetChanged();
+                        }
+                    }
+                }
+
+                if (!ListUtils.isEmpty(mStepsRankingBean.getToalrank())){
+                    for (int i = 0; i < mStepsRankingBean.getToalrank().size(); i++) {
+                        if (mStepsRankingBean.getPricelist().contains(mStepsRankingBean.getToalrank().get(i).getAs_userid()))
+                            mStepsRankingBean.getToalrank().get(i).setPrised(true);
+                        else
+                            mStepsRankingBean.getToalrank().get(i).setPrised(false);
+
+                        if (i==mStepsRankingBean.getToalrank().size()-1){
+                            mRankAdapter.setModel(mStepsRankingBean);
+                            mAllPtlv.setAdapter(mRankAdapter);
+                            mRankAdapter.notifyDataSetChanged();
+                        }
                     }
-                    if (mStepsRankingBean.getAttrank() != null){
+                }
+
+            }else {
+                for (int i = 0; i < mStepsRankingBean.getAttrank().size(); i++) {
+                    mStepsRankingBean.getAttrank().get(i).setPrised(false);
+                    if (i==mStepsRankingBean.getToalrank().size()-1){
                         mAttenAdapter.setModel(mStepsRankingBean);
                         mAttentionPtlv.setAdapter(mAttenAdapter);
                         mAttenAdapter.notifyDataSetChanged();
                     }
-
-                    if (mStepsRankingBean.getAttrank().size()>0)
-                        mAttentionLl.setVisibility(View.VISIBLE);
-                    showMyInfo();
-                    LogUtil.prinlnLongMsg("mStepsRankingBean", JSON.toJSONString(mStepsRankingBean)+"");
-                }catch (Exception e){
-                    e.printStackTrace();
+                }
+                for (int i = 0; i < mStepsRankingBean.getToalrank().size(); i++) {
+                    mStepsRankingBean.getToalrank().get(i).setPrised(false);
+                    if (i==mStepsRankingBean.getToalrank().size()-1){
+                        mRankAdapter.setModel(mStepsRankingBean);
+                        mAllPtlv.setAdapter(mRankAdapter);
+                        mRankAdapter.notifyDataSetChanged();
+                    }
                 }
             }
-        }));
-
-
+            if (mStepsRankingBean.getAttrank().size()>0)
+                mAttentionLl.setVisibility(View.VISIBLE);
+            showMyInfo();
+            LogUtil.prinlnLongMsg("mStepsRankingBean", JSON.toJSONString(mStepsRankingBean)+"");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     private void showMyInfo() {