添加小绵羊新手任务列表刷新功能；新手了解小绵羊的时间从60秒修改为15秒

app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -437,7 +437,7 @@ public class ActSearch extends BaseCompatActivity {
                     }
                 }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
         KFZSNetwork.addRequest(bannerRequest);
-        MobclickAgent.onEvent(SheepApp.mContext, UMConfigUtils.Event.GAME_SEARCH);
+        MobclickAgent.onEvent(SheepApp.mContext, UMConfigUtils.Event.GAME_SEARCH.getKey());
     }
 
     /**

app/src/main/java/com/kfzs/duanduan/ActWeb.java

@@ -188,7 +188,7 @@ public class ActWeb extends BaseCompatActivity {
     private void setUmengOnEvent(String extInfo) {
         Map<String, String> map = new HashMap<>();
         map.put("gameUnique", extInfo);
-        MobclickAgent.onEvent(ActWeb.this, UMConfigUtils.Event.GAME_DOWNLOAD, map);
+        MobclickAgent.onEvent(ActWeb.this, UMConfigUtils.Event.GAME_DOWNLOAD.getKey(), map);
     }
 
 

app/src/main/java/com/kfzs/duanduan/adp/AdpMainPageRecy.java

@@ -607,7 +607,7 @@ public class AdpMainPageRecy extends AdpCommonRecy<RecyleObj> {
                 Map<String, String> map = new HashMap<>();
                 map.put("BANNER_TYPE", clickedGameObj.getType() == KFIntentKeys.BANNER_TYPE_GAME ? "游戏Banner" : "广告Banner");
                 //TODO 小刁，这些事件分析以后要专门弄个静态类来统一管理
-                MobclickAgent.onEvent(mContext, UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL, map);
+                MobclickAgent.onEvent(mContext, UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL.getKey(), map);
                 switch (clickedGameObj.getType()) {
                     case KFIntentKeys.BANNER_TYPE_GAME:
                         SkipUtils.getInstance().goGameDetails(mContext, clickedGameObj.getGameId());

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

@@ -244,6 +244,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
+                                List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                                List<NewbieTask> taskList = new ArrayList<>();
+                                for (NewbieTask newbieTask : newbieTaskList) {
+                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),newbieTask.getId() - 1, 0)) {//未完成
+                                        taskList.add(newbieTask);
+                                    }
+                                }
+                                baseMessage.setData(taskList);
                                 Jump2View.getInstance().goNewbieTaskList(activity, baseMessage);
                             }
 

app/src/main/java/com/kfzs/duanduan/utils/GameStatusScanner.java

@@ -386,7 +386,7 @@ public abstract class GameStatusScanner {
     public static void setUmengOnEvent(Context mContext,String extInfo) {
         Map<String, String> map = new HashMap<>();
         map.put("gameUnique", extInfo);
-        MobclickAgent.onEvent(mContext, UMConfigUtils.Event.GAME_DOWNLOAD, map);
+        MobclickAgent.onEvent(mContext, UMConfigUtils.Event.GAME_DOWNLOAD.getKey(), map);
     }
 
     public static DownLoadInfo addNewDownloadTask(DownloadTaskService downloadTaskService,String gameName, String downloadUrl,

app/src/main/java/com/sheep/gamegroup/view/activity/ActNewbieTaskList.java

@@ -2,20 +2,30 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.widget.ListView;
 
+import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.BinaryUtil;
 import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * 新手任务
@@ -30,7 +40,8 @@ public class ActNewbieTaskList extends BaseActivity {
 
     private Activity activity;
     private NewbieTaskAdp adp;
-    private List<NewbieTask> etyList;
+    private List<NewbieTask> etyList = new ArrayList<>();
+    private List<NewbieTask> newbieTaskList;
 
     @Override
     protected int getLayoutId() {
@@ -41,7 +52,7 @@ public class ActNewbieTaskList extends BaseActivity {
     public void initView() {
         activity = this;
         BaseMessage baseMessage = (BaseMessage) getIntent().getSerializableExtra(BaseMessage.class.getSimpleName());
-        etyList = baseMessage.getDatas(NewbieTask.class);
+        newbieTaskList = baseMessage.getDatas(NewbieTask.class);
         TitleBarUtils.getInstance()
                 .setTitle(this, "新手任务")
                 .setTitleFinish(this);
@@ -72,6 +83,33 @@ public class ActNewbieTaskList extends BaseActivity {
 
     @Override
     public void initData() {
+        SheepApp.getInstance().getNetComponent().getApiService().getInfo()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                if(BuildConfig.DEBUG)
+                                    System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
+                                swipe_container.setRefreshing(false);
+                                UserEntity userEntity = baseMessage.getData(UserEntity.class);
+                                for (NewbieTask newbieTask : newbieTaskList) {
+                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),newbieTask.getId() - 1, 0)) {//未完成
+                                        etyList.add(newbieTask);
+                                    }
+                                }
+                                adp.notifyDataSetChanged();
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                swipe_container.setRefreshing(false);
+                                if(BuildConfig.DEBUG)
+                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                                etyList.addAll(newbieTaskList);
+                                adp.notifyDataSetChanged();
+                            }
+                        });
     }
 
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActUnderstandSheep.java

@@ -58,7 +58,7 @@ public class ActUnderstandSheep extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitle(this, "一分钟快速了解小绵羊")
                 .setTitleFinish(this);
-        final int count = BuildConfig.DEBUG ? 10 : 60;
+        final int count = BuildConfig.DEBUG ? 10 : 15;
         timer = RxjavaCountDownTimer.getInstance(count)
                 .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
                     @Override