修改张伟服务器地址；任务中心中显示所有新手任务，并添加两种状态：去做与已完成

app/build.gradle

@@ -75,10 +75,8 @@ android {
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'false'//不用加密
-//            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
             buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-            buildConfigField "String", "APP_URL", '"http://10.8.220.5:8080/"'//张伟
-//            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
+            buildConfigField "String", "APP_URL", '"http://10.8.210.171:8080/"'//张伟
             buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
@@ -94,10 +92,8 @@ android {
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheeptest"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
-//            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
             buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
             buildConfigField "String", "APP_URL", '"http://test.sheep.kfzs.com/"'
-//            buildConfigField "String", "API_DOMAIN", '"10.8.210.229:8081"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
@@ -105,7 +101,6 @@ android {
         }
         sheep {
             applicationId "com.sheep.jiuyan.samllsheep"
-//            applicationId "com.kfzs.duanduan.bandaimi"
             manifestPlaceholders = [UMENG_CHANNEL_VALUE: "sheep",
                                     DUANDUAN_GRAPH     : "sheep",
                                     DUANDUAN_DATASHARE : "sheep",
@@ -116,11 +111,7 @@ android {
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
             buildConfigField "String", "APP_URL", '"http://ss.kfzs.com/"'
-//            buildConfigField "String", "APP_URL", '"http://10.8.220.5:8080/"'//张伟
-//            buildConfigField "String", "APP_URL", '"http://test.sheep.kfzs.com/"'//测试服地址
             buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
-//            buildConfigField "String", "API_DOMAIN", '"app.bdmoem.kfzs.com"'
-//            buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bdmoem.kfzs.com/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
             signingConfig signingConfigs.config

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

@@ -238,28 +238,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 if(userEntity == null){
                     return;
                 }
-                SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .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);
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                            }
-                        });
+                Jump2View.getInstance().goNewbieTaskList(activity, null);
                 break;
         }
     }
@@ -291,7 +270,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .load(AppUtil.getQRLink(userEntity.getShare_link(), 800))
                 .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                 .preload(800, 800);
-        if(userEntity.getNewbie_task_status() < 16){//为16时代表已经完成所有新手任务，不是新手
+        if(userEntity.getNewbie_task_status() < 15){//为15时代表已经完成所有新手任务，不是新手
             newbie_task.setVisibility(View.VISIBLE);
             if(isShowNewbieTaskDialog){
                 isShowNewbieTaskDialog = false;

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

@@ -435,10 +435,9 @@ public class Jump2View {
     /**
      * 跳转到 一分钟快速了解小绵羊 界面
      */
-    public void goNewbieTaskList(Context context, BaseMessage baseMessage){
+    public void goNewbieTaskList(Context context, Object o){
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST);
         Intent intent = new Intent(context, ActNewbieTaskList.class);
-        intent.putExtra(BaseMessage.class.getSimpleName(), baseMessage);
         context.startActivity(intent);
     }
 

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

@@ -1,23 +1,18 @@
 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;
@@ -41,7 +36,7 @@ public class ActNewbieTaskList extends BaseActivity {
     private Activity activity;
     private NewbieTaskAdp adp;
     private List<NewbieTask> etyList = new ArrayList<>();
-    private List<NewbieTask> newbieTaskList;
+    private List<NewbieTask> newbieTaskList = new ArrayList<>();
 
     @Override
     protected int getLayoutId() {
@@ -51,8 +46,6 @@ public class ActNewbieTaskList extends BaseActivity {
     @Override
     public void initView() {
         activity = this;
-        BaseMessage baseMessage = (BaseMessage) getIntent().getSerializableExtra(BaseMessage.class.getSimpleName());
-        newbieTaskList = baseMessage.getDatas(NewbieTask.class);
         TitleBarUtils.getInstance()
                 .setTitle(this, "任务中心")
                 .setTitleFinish(this);
@@ -62,7 +55,6 @@ public class ActNewbieTaskList extends BaseActivity {
         swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                etyList.clear();
                 initData();
             }
         });
@@ -75,33 +67,39 @@ 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();
-                            }
+        etyList.clear();
+        SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
+                .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);
+                        newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                        etyList.addAll(newbieTaskList);
+                        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();
-                            }
-                        });
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                        swipe_container.setRefreshing(false);
+                        etyList.addAll(newbieTaskList);
+                        adp.notifyDataSetChanged();
+                    }
+                });
+    }
+    private boolean isFirst = true;
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if(isFirst){
+            isFirst = false;
+        } else {
+            initData();
+        }
     }
-
 }

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

@@ -73,6 +73,8 @@ public class NewbieTaskAdp extends BaseAdapter {
                 doActionByTask(context, ety);
             }
         });
+        holder.newbie_task_tv.setText(ety.getFinished() ? "已完成" : "去做");
+        holder.newbie_task_tv.setEnabled(!ety.getFinished());
         return convertView;
     }
 

app/src/main/res/drawable/selector_button_full_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
   <item android:state_focused="true" android:drawable="@drawable/button_full_normal_main_click" />
   <item android:state_checked="true" android:drawable="@drawable/button_full_normal_main_click"/>
   <item android:state_selected="true" android:drawable="@drawable/button_full_normal_main_click"/>

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

@@ -57,7 +57,7 @@
             style="@style/style_button_small"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:text="领取" />
+            android:text="去做" />
 
     </RelativeLayout>
 </RelativeLayout>