for sdk

app/src/main/AndroidManifest.xml

@@ -320,6 +320,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
             android:launchMode="singleTask"
+            android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" />
         <activity
@@ -419,6 +420,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.RealNameAuthenAct"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:theme="@style/AppActionTheme" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
@@ -513,6 +515,7 @@
             android:theme="@style/AppActionTheme" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActMyMoney"
+            android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" />
         <activity
@@ -775,6 +778,7 @@
             android:theme="@style/AppActionTheme" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActMyWelfare"
+            android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" />
         <activity

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -1108,6 +1108,9 @@ public interface ApiService {
     @GET("app/gift_bag/my_gift_bag")
     Observable<BaseMessage> getMyGiftBagList(@Query("page") int page, @Query("per_page") int per_page);
 
+    @GET("app/gift_bag/my_gift_bag")
+    Observable<BaseMessage> getMyGiftBagList(@Header("Authorization") String token, @Query("page") int page, @Query("per_page") int per_page);
+
     /**
      * 领取礼包
      */

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

@@ -2224,7 +2224,7 @@ public class Jump2View {
     /**
      * 进入我的礼包界面
      */
-    public void goMyWelfare(Activity activity, boolean... flags) {
+    public void goMyWelfare(Context activity, boolean... flags) {
         Intent intent = new Intent(activity, ActMyWelfare.class);
         if (flags != null && flags.length > 0 && flags[0]) {
             intent.putExtra("showCenter", true);
@@ -2233,6 +2233,17 @@ public class Jump2View {
         GAME_MY_WELFARE.onEvent();
     }
 
+    public void goMyWelfare(Context activity, String token, boolean... flags) {
+        Intent intent = new Intent(activity, ActMyWelfare.class);
+        intent.putExtra("token", token);
+        if (flags != null && flags.length > 0 && flags[0]) {
+            intent.putExtra("showCenter", true);
+        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        activity.startActivity(intent);
+        GAME_MY_WELFARE.onEvent();
+    }
+
     /**
      * 进入验证手机号
      */

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

@@ -56,7 +56,11 @@ public class ActMyWelfare extends BaseActivity {
         indicator.setVisibility(View.GONE);
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
 //        mAdapter.add(new FgtMyDownloadWelfareList(), "下载奖励");
-        mAdapter.add(new FgtMyGift(), "我的礼包");
+        FgtMyGift fgt = new FgtMyGift();
+        if(getIntent().hasExtra("token")){
+            fgt.setToken(getIntent().getStringExtra("token"));
+        }
+        mAdapter.add(fgt, "我的礼包");
 //        mAdapter.add(new FgtWelfareUseRecord(), "使用记录");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);

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

@@ -60,6 +60,7 @@ public class MiddleSchemeAct extends Activity {
                 Uri uri = intent.getData();
                 if (uri != null) {
                     if (SheepApp.getInstance().mActivityCount == 0
+                            && !"my_gift".equals(uri.getQueryParameter("type"))
                             && !"game_coupon".equals(uri.getQueryParameter("type"))
                             && !"game_detail".equals(uri.getQueryParameter("type"))
                             && !"makegold".equals(uri.getQueryParameter("type"))
@@ -119,6 +120,15 @@ public class MiddleSchemeAct extends Activity {
                                 "代金券中心"),
                         true);
                 break;
+            case "game_role_mall":
+                Jump2View.getInstance().goWeb(context, new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME), "游戏交易商城"));
+                break;
+            case "yy_shop":
+                Jump2View.getInstance().gotoYYShop(context);
+                break;
+            case "my_gift":
+                Jump2View.getInstance().goMyWelfare(context, json, true);
+                break;
             case "discountrecharge": {
                 String[] paras = json.split(",");
                 int discountId = Integer.parseInt(paras[0]);
@@ -135,7 +145,7 @@ public class MiddleSchemeAct extends Activity {
                 String[] paras = json.split(",");
                 String token = paras[0];
                 int orient = -1;
-                if(paras.length==2){
+                if (paras.length == 2) {
                     orient = Integer.parseInt(paras[1]);
                 }
                 Jump2View.getInstance().gotoGameGoldCoins(token, orient);

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.fragment;
 
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -19,6 +20,14 @@ import rx.functions.Action1;
  * realicing@sina.com
  */
 public class FgtMyGift extends BaseListFragment2<GiftBagApp> implements Action1<Integer> {
+
+    private String token;
+
+    public FgtMyGift setToken(String token) {
+        this.token = token;
+        return this;
+    }
+
     @Override
     public void call(Integer integer) {
         switch (integer){
@@ -45,7 +54,11 @@ public class FgtMyGift extends BaseListFragment2<GiftBagApp> implements Action1<
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.getMyGiftBagList(page, per_page);
+        if(TextUtils.isEmpty(token)){
+            return apiService.getMyGiftBagList(page, per_page);
+        } else {
+            return apiService.getMyGiftBagList(token, page, per_page);
+        }
     }
 
     @Override