Merge remote-tracking branch 'origin/sheep_develop' into sheep_tinker

.gitignore

@@ -8,4 +8,5 @@
 /captures
 .externalNativeBuild
 /.idea
-/kfzslibrary
+/kfzslibrary
+/banner

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -604,6 +604,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 banner.setVisibility(View.GONE);
             } else {
                 slideshowEtyLists.clear();
+                slideshowTitleList.clear();
                 for (SlideshowEty slideshowEty : slideshowEtyList) {
                     slideshowEty.setObjects(CommonUtil.getInstance().getValue(slideshowEty.getExt()));
                     slideshowEtyLists.add(slideshowEty);
@@ -815,6 +816,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     private void bindBanner() {
+        //结束轮播
+        banner.stopAutoPlay();
         banner.setVisibility(View.VISIBLE);
         //设置图片加载器
         banner.setImageLoader(new ImageLoader() {

app/src/main/java/com/sheep/gamegroup/model/entity/TaskAcceptedEty.java

@@ -14,6 +14,7 @@ public class TaskAcceptedEty implements Serializable{
     private int release_task_id;// 0,
     private String remarks;// "string",
     private String screenshots;// "string",
+    private int cash_task;// 1.现金任务 2福利任务
     private int status =1;// 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线,9至少完成了一个任务了
     private String uid;// 0,
     private String update_time;// 0
@@ -128,6 +129,14 @@ public class TaskAcceptedEty implements Serializable{
         this.lower_num = lower_num;
     }
 
+    public int getCash_task() {
+        return cash_task;
+    }
+
+    public void setCash_task(int cash_task) {
+        this.cash_task = cash_task;
+    }
+
     @Override
     public boolean equals(Object obj) {
         return obj instanceof TaskAcceptedEty &&
@@ -135,8 +144,20 @@ public class TaskAcceptedEty implements Serializable{
     }
 
 
-
-
+    /**
+     * 获取任务标签：现金或者福利
+     * 1.现金任务 2福利任务
+     * @return
+     */
+    public String getCashText(){
+        switch (cash_task){
+            case 1:
+                return "现金";
+            case 2:
+            default:
+                return "福利";
+        }
+    }
     public boolean isIs_running() {
         return status == 1 || status == 2;
     }

app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -221,7 +221,7 @@ public class DataUtil {
     }
 
     public boolean isNewData(String key) {
-        return !TextUtils.equals(aCache.getAsString(ApiKey.oldEqualsNew(key)), "yes");//新老数据不同，说明是新数据
+        return !TextUtils.equals(aCache.getAsString(ApiKey.oldEqualsNew(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key)), "yes");//新老数据不同，说明是新数据
     }
 
     //-----------------------------------------缓存数据部分-----------------------------------------------------结束

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -85,7 +85,7 @@ public class TaskListItemAdp extends BaseAdapter {
             return convertView;
         }
         ViewUtil.setText(holder.name_tv, ety.getRelease_task().getName());
-        ViewUtil.setText(holder.name_tv, TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
+        ViewUtil.setText(holder.date_tv, TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
         holder.price_tv.setText(returnValue(ety));
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override