修改极光推送 跳转

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

@@ -496,7 +496,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
             boolean dontShowNewbieTaskDialog = newbie_task_record != null && newbie_task_record.isDontShowNewbieTaskDialog();//默认可以显示对话框
             if (
-                !BuildConfig.DEBUG &&
+//                !BuildConfig.DEBUG &&
                     dontShowNewbieTaskDialog) {
                 newbie_task.setVisibility(View.VISIBLE);
                 return;

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

@@ -7,7 +7,7 @@ import java.io.Serializable;
  * realicing@sina.com
  */
 public class NewbieTask implements Serializable{
-    private double amount;
+    private String amount;
 
     private int status;//0 初始状态 1 提交审核 2 成功 3审核失败
 
@@ -23,10 +23,10 @@ public class NewbieTask implements Serializable{
 
     private int user_task_id;
 
-    public void setAmount(double amount){
+    public void setAmount(String amount){
         this.amount = amount;
     }
-    public double getAmount(){
+    public String getAmount(){
         return this.amount;
     }
 

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

@@ -138,8 +138,11 @@ public class MiddleAct extends Activity {
                             Jump2View.getInstance().goWeb(activity, msg.getUrl(), TextUtils.isEmpty(msg.getTitle()) ? bundle.getString(JPushInterface.EXTRA_ALERT) : msg.getTitle());
                             break;
 
-                        case 1://跳转到首页: id 0，小绵羊 1，个人中心 （以后可能有2，借着玩，也有可能位置会变化）
-                            Jump2View.getInstance().goHomePageView(activity, msg.getId() % MainTab.values().length);
+                        case 1://跳转到首页: id 0，小绵羊 1，游戏
+                            if(msg.getId() == 0)
+                                Jump2View.getInstance().goHomePageView(activity, msg.getId() % MainTab.values().length);
+                            else if(msg.getId() == 1)
+                                Jump2View.getInstance().goMainGame(activity);
                             break;
                         case 2://公告: title 标题   msg 内容
                             Jump2View.getInstance().goNotice(activity, TextUtils.isEmpty(msg.getTitle()) ? bundle.getString(JPushInterface.EXTRA_ALERT) : msg.getTitle(), msg.getMsg(), msg.getTime() == 0 ? System.currentTimeMillis() : msg.getTime());

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

@@ -11,6 +11,7 @@ import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
+import java.util.Locale;
 
 import static com.sheep.gamegroup.view.adapter.NewbieTaskAdp.doActionByTask;
 
@@ -79,22 +80,24 @@ public class DialogNewbieTaskAdp extends BaseAdapter {
 
 
     private static void setTextSure(TextView dialog_sure, NewbieTask newbieTask, int index) {
+        String tip = newbieTask.getName();
         switch (newbieTask.getId()){
             case 1://了解小绵羊奖励
-                dialog_sure.setText((index+1)+".点击了解小绵羊（+"+newbieTask.getAmount()+"元）");
+                tip = "%d.点击了解小绵羊（+%s元）";
                 break;
             case 2:
-                dialog_sure.setText((index+1)+".完成首次提现（+"+newbieTask.getAmount()+"元）");
+                tip = "%d.完成首次提现（+%s元）";
                 break;
             case 3:
-                dialog_sure.setText((index+1)+".成功邀请好友注册（+"+newbieTask.getAmount()+"元）");
+                tip = "%d.成功邀请好友注册（+%s元）";
                 break;
             case 4:
-                dialog_sure.setText((index+1)+".首次做任务赚钱（额外奖+"+newbieTask.getAmount()+"元）");
+                tip = "%d.首次做任务赚钱（额外奖+%s元）";
                 break;
             case 6://加入官方QQ群
-                dialog_sure.setText((index+1)+".加入官方QQ群（+"+newbieTask.getAmount()+"元）");
+                tip = "%d.加入官方QQ群（+%s元）";
                 break;
         }
+        dialog_sure.setText(String.format(Locale.CHINA,tip,index+1, newbieTask.getAmount()));
     }
 }