添加元旦活动相关功能；

登录界面修改

app/src/main/AndroidManifest.xml

@@ -918,10 +918,16 @@
             android:name="com.sheep.gamegroup.module.login.ReLoginNameAct"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme"></activity>
+        <!-- 小绵羊3.4.7 新增界面 -->
         <activity
             android:name="com.sheep.gamegroup.module.user.activity.ActVip"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme"/>
+        <!-- 小绵羊3.4.7 新增界面 -->
+        <activity
+            android:name="com.sheep.gamegroup.module.user.activity.ActUserAddrInfo"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppActionTheme"/>
     </application>
 
 </manifest>

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

@@ -97,6 +97,7 @@ public class WebParams implements Serializable {
             if (TextUtils.equals(SheepApp.getInstance().getConnectAddress().getName(), "sheep")) {
                 switch (title) {
                     case "幸运大转盘":
+                    case "元旦活动":
                         showTitle = false;
                         break;
                 }
@@ -104,6 +105,7 @@ public class WebParams implements Serializable {
                 switch (title) {
                     case "3.4.5大转盘":
                     case "娱乐抽奖":
+                    case "元旦活动":
                         showTitle = false;
                         break;
                 }

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

@@ -2571,4 +2571,19 @@ public class Jump2View {
                 break;
         }
     }
+
+    /**
+     * 小绵羊3.4.7新增 -- 跳转  界面我的收件信息 界面
+     * @param activity
+     */
+    public void goActUserAddrInfo(Activity activity) {
+        CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_USER_ADDRESS_URL, url -> {
+            if(url == null){
+                G.showToast(R.string.coming_soon);
+                return;
+            }
+            WebParams webParams = new WebParams(url).setShowTitle(false);
+            goWeb(activity, webParams);
+        });
+    }
 }

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

@@ -187,7 +187,9 @@ public class UMConfigUtils {
         SHARE_TO_QZONE("分享到QQ空间"),
         TASK_SAVE_QR("二维码小程序 -> 保存二维码"),
         EXCHANGE_CMCC("移动积分兑换界面"),
-        SEARCH_APP_OR_TASK("从主页进入搜索游戏或任务的搜索界面"),;
+        SEARCH_APP_OR_TASK("从主页进入搜索游戏或任务的搜索界面"),
+        USER_INFO_ADDR("个人中心 -> 个人资料 -> 我的收件信息"),
+        ;
         private String tag;
 
         Event(String tag) {

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

@@ -223,7 +223,7 @@ public class ActGcGameAppDetail extends BaseActivity {
         fgtGcGameAppWelfare = FgtGcGameAppWelfare.newInstance(id);
         fgtGcGameAppWelfare.setSmartRefreshLayout(refresh);
         fgtGcGameAppWelfare.loadData(gameEntity);
-        mAdapter.add(fgtGcGameAppWelfare, "福利");
+        mAdapter.add(fgtGcGameAppWelfare, "礼包");
         mAdapter.notifyDataSetChanged();
         viewPager.setOffscreenPageLimit(mAdapter.getCount());
     }

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

@@ -69,6 +69,7 @@ import static com.sheep.gamegroup.util.ViewUtil.getNetImgByName;
 /**
  * Created by realicing on 2018/9/7.
  * realicing@sina.com
+ * 邀请赚钱分享界面
  */
 public class ActInvitation extends BaseUMActivity {
     @BindView(R.id.ask_share_list)

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

@@ -310,6 +310,9 @@ public class ActWebX5 extends BaseActWeb {
                     String order_no = StringUtils.getQueryParameter(url, Config.YF_SHOP_ORDER_NUMBER_KEY);
                     Jump2View.getInstance().goActPay(ActWebX5.this, order_no, SpUtils.getToken(SheepApp.getInstance()));
                     return true;
+                } else if (url.startsWith(Config.SHEEP)) {
+                    MiddleSchemeAct.parseAndJumpUri(ActWebX5.this, Uri.parse(url));
+                    return true;
                 } else if (url.startsWith("weixin://wap/pay?")) {
                     try {
                         Intent intent = new Intent();

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

@@ -8,8 +8,6 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONObject;
-import com.kfzs.cfyl.share_library.util.Constant;
-import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.SlideshowEty;
@@ -22,8 +20,6 @@ import com.sheep.jiuyan.samllsheep.bean.UserCenterModule;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
-import java.util.ArrayList;
-
 /**
  * Created by realicing on 2018/5/10.
  * realicing@sina.com
@@ -53,33 +49,34 @@ public class MiddleSchemeAct extends Activity {
                     // 完整的url信息
                     if (TestUtil.isTest())
                         G.showToast(uri.toString());
-                    parseUri(uri);
+                    parseAndJumpUri(this, uri);
                 }
                 finish();
                 break;
         }
     }
 
-    private void parseUri(Uri uri) {
+    //解析并跳转
+    public static void parseAndJumpUri(Activity activity, Uri uri) {
         String type = uri.getQueryParameter("type");
         if(type == null){
 //            尝试获取game_id
             //sheep://small.kfzs.com/xmy?game_id=1385&code=976873
-            tryGoSplashAct(uri);
+            tryGoSplashAct(activity, uri);
             return;
         }
         //尝试解密数据
         String json = BaseMessageConverter.decrypt(uri.getQueryParameter("data"));
         switch (type){
             default://尝试获取game_id
-                tryGoSplashAct(uri);
+                tryGoSplashAct(activity, uri);
                 break;
             //sheep://small.kfzs.com/xmy?type=jhl&data={"Jump":"1"}
             case "jump_home_list"://跳转homeList
             case "jhl":
                 try {
                     HomeListEntity item = JSONObject.parseObject(json, HomeListEntity.class);
-                    CommonUtil.getInstance().goNative(this, item, "view");
+                    CommonUtil.getInstance().goNative(activity, item, "view");
                 } catch (Exception e) {
                     e.printStackTrace();
                     if(TestUtil.isTest() && TextUtils.isEmpty(e.getMessage()))
@@ -91,7 +88,7 @@ public class MiddleSchemeAct extends Activity {
             case "jum":
                 try {
                     UserCenterModule item = JSONObject.parseObject(json, UserCenterModule.class);
-                    CommonUtil.getInstance().goNative(this, item, "view");
+                    CommonUtil.getInstance().goNative(activity, item, "view");
                 } catch (Exception e) {
                     e.printStackTrace();
                     if(TestUtil.isTest() && TextUtils.isEmpty(e.getMessage()))
@@ -103,7 +100,7 @@ public class MiddleSchemeAct extends Activity {
             case "jss":
                 try {
                     SlideshowEty item = JSONObject.parseObject(json, SlideshowEty.class);
-                    CommonUtil.getInstance().clickBanner(this, item);
+                    CommonUtil.getInstance().clickBanner(activity, item);
                 } catch (Exception e) {
                     e.printStackTrace();
                     if(TestUtil.isTest() && TextUtils.isEmpty(e.getMessage()))
@@ -111,6 +108,7 @@ public class MiddleSchemeAct extends Activity {
                 }
                 break;
             //sheep://small.kfzs.com/xmy?type=run_app&packageName=com.realicing.android.upgrade.sheep&className=com.realicing.android.upgrade.sheep.MainActivity
+            //sheep://small.kfzs.com/xmy?type=run&className=com.sheep.gamegroup.view.activity.ActInvitation 邀请赚钱界面
             case "run_app":
             case "run":
                 String packageName = uri.getQueryParameter("packageName");
@@ -118,13 +116,13 @@ public class MiddleSchemeAct extends Activity {
                 boolean packageNameIsEmpty = TextUtils.isEmpty(packageName);
                 boolean classNameIsEmpty = TextUtils.isEmpty(className);
                 if(packageNameIsEmpty && classNameIsEmpty){
-                    tryGoSplashAct(uri);
+                    tryGoSplashAct(activity, uri);
                 } else if(packageNameIsEmpty){
-                    runApp(getPackageName(), className);
+                    runApp(activity, activity.getPackageName(), className);
                 } else if(classNameIsEmpty) {
-                    PackageUtil.startApp(this, packageName);
+                    PackageUtil.startApp(activity, packageName);
                 } else {
-                    runApp(packageName, className);
+                    runApp(activity, packageName, className);
                 }
                 break;
         }
@@ -153,11 +151,11 @@ public class MiddleSchemeAct extends Activity {
 //                        finish();
 //                    }
     }
-    private void runApp(String packageName, String className){
+    public static void runApp(Activity activity, String packageName, String className){
         try {
             Intent intent = new Intent();
             intent.setClassName(packageName, className);
-            startActivity(intent);
+            activity.startActivity(intent);
         } catch (Exception e) {
             e.printStackTrace();
             if(TestUtil.isTest() && TextUtils.isEmpty(e.getMessage()))
@@ -175,11 +173,11 @@ public class MiddleSchemeAct extends Activity {
      * ActMain checkScheme query: code=976873
      * ActMain checkScheme code: 976873
      */
-    private void tryGoSplashAct(Uri uri) {
+    public static void tryGoSplashAct(Activity activity, Uri uri) {
         String game_id = uri.getQueryParameter("game_id");
         if(!TextUtils.isEmpty(game_id))//有game_id时设置game_id的回调到主页，用于展示会长推广弹出框
             ActionUtil.getInstance().addNextAction(SHOW_DIALOG_GAME_OR_GIFT_TASK, game_id);
-        Jump2View.getInstance().newTaskTopStartAct(this, SplashAct.class, null);
+        Jump2View.getInstance().newTaskTopStartAct(activity, SplashAct.class, null);
 
     }
 

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

@@ -41,6 +41,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_PHONE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_QQ;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_TX_WX;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_WX;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_ADDR;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_AVATAR;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_LOGINNAME;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_NAME;
@@ -177,7 +178,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
             R.id.personal_info_phone_container, R.id.personal_info_bind_tx_wx_container,
             R.id.personal_info_bind_qq_container, R.id.personal_info_bind_wx_container,
             R.id.personal_info_authentication_container, R.id.llayout_birthday,
-            R.id.personal_info_loginname_container})
+            R.id.personal_info_loginname_container, R.id.personal_info_addr_container})
 
     public void onClick(View view) {
         if (userEntity == null) {
@@ -218,6 +219,10 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 Jump2View.getInstance().goBindPhone(activity, null);
                 BIND_PHONE.onEvent();
                 break;
+            case R.id.personal_info_addr_container:   //跳转到 我的收件信息 界面
+                Jump2View.getInstance().goActUserAddrInfo(activity);
+                USER_INFO_ADDR.onEvent();
+                break;
             case R.id.personal_info_bind_tx_wx_container:  //跳转到绑定提现微信号的界面
                 CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
                     @Override

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

@@ -11,6 +11,7 @@ import com.sheep.gamegroup.model.entity.GameInfoList;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.TestUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdpGcGameAppActivityRecommend;
 import com.sheep.gamegroup.view.adapter.AdpGcGameAppArticleRecommend;
 import com.sheep.gamegroup.view.adapter.AdpGcGameAppGiftBag;
@@ -29,7 +30,7 @@ import io.reactivex.schedulers.Schedulers;
 /**
  * Created by realicing on 2018/11/1.
  * realicing@sina.com
- * 玩转游戏 福利
+ * 玩转游戏 礼包
  */
 public class FgtGcGameAppWelfare extends BaseRefreshLoadMoreFragment {
 
@@ -70,7 +71,7 @@ public class FgtGcGameAppWelfare extends BaseRefreshLoadMoreFragment {
         if (gameEntity.isGift()) {
             gameInfoListArrayList.add(new GameInfoList("礼包推荐", new AdpGcGameAppGiftBag(SheepApp.getInstance(), gameEntity.getHas_gift_bag(), gameEntity)).setSort(SORT_GIFT));
         }
-        recyclerView.getAdapter().notifyDataSetChanged();
+        ViewUtil.notifyDataSetChanged(recyclerView);
     }
 
 
@@ -93,7 +94,7 @@ public class FgtGcGameAppWelfare extends BaseRefreshLoadMoreFragment {
                 return gameInfoList.getSort() == SORT_ACTIVITY || gameInfoList.getSort() == SORT_ARTICLE;
             }
         });
-        recyclerView.getAdapter().notifyDataSetChanged();
+        ViewUtil.notifyDataSetChanged(recyclerView);
         //文章推荐
         SheepApp.getInstance().getNetComponent().getApiService().getDetailArticleRecommend(appId)
                 .subscribeOn(Schedulers.io())
@@ -104,7 +105,7 @@ public class FgtGcGameAppWelfare extends BaseRefreshLoadMoreFragment {
                         List<Article> newList = baseMessage.getDatas(Article.class);
                         if (!ListUtil.isEmpty(newList)) {
                             gameInfoListArrayList.add(new GameInfoList("文章推荐", new AdpGcGameAppArticleRecommend(getContext(), newList)).setSort(SORT_ARTICLE));
-                            recyclerView.getAdapter().notifyDataSetChanged();
+                            ViewUtil.notifyDataSetChanged(recyclerView);
                         }
                         refreshOrLoadMoreComplete();
                     }
@@ -125,7 +126,7 @@ public class FgtGcGameAppWelfare extends BaseRefreshLoadMoreFragment {
                         List<Article> newList = baseMessage.getDatas(Article.class);
                         if (!ListUtil.isEmpty(newList)) {
                             gameInfoListArrayList.add(new GameInfoList("活动推荐", new AdpGcGameAppActivityRecommend(getContext(), newList)).setSort(SORT_ACTIVITY));
-                            recyclerView.getAdapter().notifyDataSetChanged();
+                            ViewUtil.notifyDataSetChanged(recyclerView);
                         }
                         refreshOrLoadMoreComplete();
                     }

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -7,6 +7,7 @@ package com.sheep.jiuyan.samllsheep;
 public class Config {
     public final static String BUGLY_APPID = "0dd998212c";
     public static final String SHEEP_PAY = "sheeppay://";
+    public static final String SHEEP = "sheep://";
     public static boolean USE_CHRISTMAS_THEME = true;//是否使用圣诞主题
 
     public static int getGameOrTaskOrGiftLayoutId() {
@@ -32,5 +33,7 @@ public class Config {
     public static final String KEY_LMJC_URL = "lmjc_url";
     //充值VIP地址的 key
     public static final String KEY_BUY_VIP_URL = "buy_vip_url";
+    //用户收货地址的 key
+    public static final String KEY_USER_ADDRESS_URL = "user_address_url";
 
 }

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

@@ -182,6 +182,21 @@
             </LinearLayout>
 
             <View style="@style/style_item_line_3_0" />
+            <LinearLayout
+                android:id="@+id/personal_info_addr_container"
+                style="@style/style_item_container">
+
+                <TextView
+                    style="@style/style_item_label"
+                    android:text="@string/my_addr_info" />
+
+
+                <TextView
+                    android:id="@+id/personal_info_addr"
+                    style="@style/style_item_end_next" />
+            </LinearLayout>
+
+            <View style="@style/style_item_line_3_0" />
 
             <LinearLayout
                 android:id="@+id/personal_info_bind_tx_wx_container"

app/src/main/res/values/gamegroup_string.xml

@@ -4,6 +4,7 @@
     <string name="friend">已邀请好友数</string>
 
     <string name="phone">手机号</string>
+    <string name="my_addr_info">我的收件信息</string>
     <string name="bind_qq">绑定QQ号</string>
     <string name="bind_wx">绑定微信号</string>
     <string name="bind_tx_wx">提现微信号</string>