消息中心可回到主页审核模块

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -5,6 +5,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.view.dialog.DialogLoading;
 
 import butterknife.ButterKnife;
@@ -53,6 +54,15 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Object action = DataUtil.getInstance().getAction(getClass().getSimpleName());
+        if(action != null){
+            doNextAction(action);
+        }
+    }
+
     protected abstract int getLayoutId();
 
     public abstract void initView();
@@ -64,6 +74,9 @@ public abstract class BaseActivity extends AppCompatActivity {
     public void initData(){
 
     }
+    public void doNextAction(Object action){
+
+    }
 
 
 }

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

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.SystemNotification;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -494,5 +495,19 @@ public class DataUtil {
         bundle.putString(t.getClass().getSimpleName(), JSONObject.toJSONString(t));
     }
 
+
     //-----------------------------------------数据转换部分-----------------------------------------------------结束
+    //-----------------------------------------下一动作部分-----------------------------------------------------结束
+    private Map<String, Object> nextActionMap = new HashMap<>();
+    public void addNextAction(String key, Object item) {
+        nextActionMap.put(key, item);
+    }
+
+    public Object getAction(String key) {
+        Object action = nextActionMap.get(key);
+        if(action != null)
+            nextActionMap.remove(key);
+        return action;
+    }
+    //-----------------------------------------下一动作部分-----------------------------------------------------结束
 }

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

@@ -12,8 +12,10 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.model.entity.SystemNotification;
 import com.sheep.gamegroup.view.adapter.ViewPagerFragmentAdapter;
 import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.view.fragment.FgtAudit;
 import com.sheep.gamegroup.view.fragment.FgtFind;
 import com.sheep.gamegroup.util.MainTab;
 import com.kfzs.duanduan.utils.StatusBarUtils;
@@ -23,6 +25,7 @@ import com.sheep.gamegroup.model.entity.Container;
 import com.sheep.gamegroup.util.DrawablesHelper;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -257,6 +260,22 @@ public class ActMain extends BaseActivity {
         if (container != null && container.getT() != null)
             container.getT().call(1);
     }
+    @Override
+    public void doNextAction(Object action){
+        if(action instanceof SystemNotification){
+            int auditPosition = MainTab.FgtMainAudit.ordinal();
+            view_pager_container.setCurrentItem(auditPosition, false);
+            FgtMainAudit fragment = (FgtMainAudit) fragmentList.get(auditPosition);
+            switch (((SystemNotification) action).getType()){//5:任务成功 6:任务失败
+                case 5:
+                    fragment.setCurrentItem(1, false);//审核成功在位置1
+                    break;
+                case 6:
+                    fragment.setCurrentItem(2, false);//审核失败在位置2
+                    break;
+            }
+        }
+    }
 
     @Override
     protected void onPause() {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -184,6 +184,10 @@ public class FgtMainAudit extends BaseFragment {
         }
     }
 
+    public void setCurrentItem(int item, boolean smoothScroll) {
+        if(pager != null)
+            pager.setCurrentItem(item, smoothScroll);
+    }
     @Subscribe
     public void onEventMainThread(BigEvent event) {
         switch (event.getEventTypes()) {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMsgCenter.java

@@ -15,8 +15,10 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.ActMsg;
 import com.sheep.gamegroup.view.adapter.MessageLeftAdapter;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -102,6 +104,11 @@ public class FgtMsgCenter extends BaseListFragment<SystemNotification> implement
             case 4:
                 Jump2View.getInstance().goTaskDetailView(activity, item.getRelation_id());
                 break;
+            case 5:
+            case 6:
+                activity.finish();
+                DataUtil.getInstance().addNextAction(ActMain.class.getSimpleName(), item);
+                break;
             case 1:
             case 2:
             default: