Parcourir la source

添加圣诞主题

zengjiebin il y a 7 ans
Parent
commit
8c987e58fd
34 fichiers modifiés avec 339 ajouts et 89 suppressions
  1. 15 15
      app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java
  2. 61 61
      app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java
  3. 32 6
      app/src/main/java/com/sheep/gamegroup/util/MainTab.java
  4. 2 1
      app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java
  5. 2 1
      app/src/main/java/com/sheep/gamegroup/view/dialog/DialogGameOrTaskOrGift.java
  6. 5 3
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java
  7. 7 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java
  8. 5 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java
  9. BIN
      app/src/main/res/drawable-xxhdpi/christmas_homepage_faxian.png
  10. BIN
      app/src/main/res/drawable-xxhdpi/christmas_homepage_faxian_click.png
  11. BIN
      app/src/main/res/drawable-xxhdpi/christmas_homepage_wode.png
  12. BIN
      app/src/main/res/drawable-xxhdpi/christmas_homepage_wode_click.png
  13. BIN
      app/src/main/res/drawable-xxhdpi/christmas_homepage_zhuanqian.png
  14. BIN
      app/src/main/res/drawable-xxhdpi/christmas_homepage_zhuanqian_click.png
  15. BIN
      app/src/main/res/drawable-xxhdpi/christmas_tab_click_yaoqing.png
  16. BIN
      app/src/main/res/drawable-xxhdpi/christmas_tab_game.png
  17. BIN
      app/src/main/res/drawable-xxhdpi/christmas_tab_game_blue.png
  18. BIN
      app/src/main/res/drawable-xxhdpi/christmas_tab_yaoqing.png
  19. 8 0
      app/src/main/res/drawable/christmas_drawable_selector_askgetmoney.xml
  20. 8 0
      app/src/main/res/drawable/christmas_drawable_selector_find.xml
  21. 8 0
      app/src/main/res/drawable/christmas_drawable_selector_game_center.xml
  22. 8 0
      app/src/main/res/drawable/christmas_drawable_selector_personalcenter.xml
  23. 8 0
      app/src/main/res/drawable/christmas_drawable_selector_task.xml
  24. 12 0
      app/src/main/res/drawable/christmas_shape_red_stroke_rectangle_no_lb.xml
  25. 1 1
      app/src/main/res/drawable/shape_red_stroke_rectangle_no_lb.xml
  26. 113 0
      app/src/main/res/layout/christmas_dialog_game_or_task_or_gift.xml
  27. 30 0
      app/src/main/res/layout/christmas_x_msg_dialog_btn_purple_blue.xml
  28. 1 1
      app/src/main/res/layout/homepage_act_layout.xml
  29. BIN
      app/src/main/res/mipmap-xxhdpi/christmas_bg_pc_top.png
  30. BIN
      app/src/main/res/mipmap-xxhdpi/christmas_bg_qiangrew.png
  31. BIN
      app/src/main/res/mipmap-xxhdpi/christmas_huanyig.png
  32. BIN
      app/src/main/res/mipmap-xxhdpi/christmas_lanse.png
  33. BIN
      app/src/main/res/mipmap-xxhdpi/christmas_red_package_floatbtn.png
  34. 13 0
      app/src/main/res/values/dd_styles.xml

+ 15 - 15
app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,26 +21,26 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        ProcessRecordDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
         AccountDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
+        ProcessRecordDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
+        SearchRecordDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        ProcessRecordDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
         AccountDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
+        ProcessRecordDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
+        SearchRecordDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AccountDao.class);
-        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(SearchRecordDao.class);
     }
 
     public DaoSession newSession() {

+ 61 - 61
app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.Account;
-import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AccountDao;
-import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
     private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig accountDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
 
-    private final ProcessRecordDao processRecordDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AccountDao accountDao;
-    private final SearchRecordDao searchRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
+    private final ProcessRecordDao processRecordDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
+    private final SearchRecordDao searchRecordDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
         acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         accountDao = new AccountDao(accountDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
 
-        registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(Account.class, accountDao);
-        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(SearchRecord.class, searchRecordDao);
     }
     
     public void clear() {
-        processRecordDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
         accountDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
+        processRecordDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
 }

+ 32 - 6
app/src/main/java/com/sheep/gamegroup/util/MainTab.java

@@ -9,6 +9,7 @@ import com.sheep.gamegroup.view.fragment.FgtNull;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.view.fragment.FgtMainAudit;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 
 /**
@@ -23,9 +24,13 @@ public enum MainTab {
             return new FgtSmallSheep();
         }
         @Override
-        public int getDrawableId() {
+        public int getNormalDrawableId() {
             return R.drawable.drawable_selector_task;
         }
+        @Override
+        public int getChristmasDrawableId() {
+            return R.drawable.christmas_drawable_selector_task;
+        }
     },
 //    FgtMainAudit(R.string.main_tab_audit) {
 //        @Override
@@ -45,9 +50,13 @@ public enum MainTab {
         }
 
         @Override
-        public int getDrawableId() {
+        public int getNormalDrawableId() {
             return R.drawable.drawable_selector_game_center;
         }
+        @Override
+        public int getChristmasDrawableId() {
+            return R.drawable.christmas_drawable_selector_game_center;
+        }
     },
     FgtMainAskGetMoney(R.string.main_tab_invite) {
         @Override
@@ -56,9 +65,13 @@ public enum MainTab {
         }
 
         @Override
-        public int getDrawableId() {
+        public int getNormalDrawableId() {
             return R.drawable.drawable_selector_askgetmoney;
         }
+        @Override
+        public int getChristmasDrawableId() {
+            return R.drawable.christmas_drawable_selector_askgetmoney;
+        }
     },
     Fgt_Find(R.string.main_tab_find) {
         @Override
@@ -67,9 +80,13 @@ public enum MainTab {
         }
 
         @Override
-        public int getDrawableId() {
+        public int getNormalDrawableId() {
             return R.drawable.drawable_selector_find;
         }
+        @Override
+        public int getChristmasDrawableId() {
+            return R.drawable.christmas_drawable_selector_find;
+        }
     },
     FgtPersonnalCenter(R.string.personal_center) {
         @Override
@@ -78,9 +95,14 @@ public enum MainTab {
         }
 
         @Override
-        public int getDrawableId() {
+        public int getNormalDrawableId() {
             return R.drawable.drawable_selector_personalcenter;
         }
+
+        @Override
+        public int getChristmasDrawableId() {
+            return R.drawable.christmas_drawable_selector_personalcenter;
+        }
     }
 //    ,
     //    Bp(R.string.tab_viewpager_borrowplay) {
@@ -108,5 +130,9 @@ public enum MainTab {
         return stringId;
     }
 
-    public abstract int getDrawableId();
+    public int getDrawableId(){
+        return Config.USE_CHRISTMAS_THEME ? getChristmasDrawableId() : getNormalDrawableId();
+    }
+    public abstract int getNormalDrawableId();
+    public abstract int getChristmasDrawableId();
 }

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -89,6 +89,7 @@ import com.sheep.gamegroup.view.dialog.DialogPayGame;
 import com.sheep.gamegroup.view.dialog.DialogProgress;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -355,7 +356,7 @@ public class ViewUtil {
      * @param mActivity 当前Activity,
      */
     public void showRobDutyDialog(final Activity mActivity, RobTask robTask) {
-        showRobDutyDialog(mActivity, robTask, R.layout.dialog_game_or_task_or_gift, null);
+        showRobDutyDialog(mActivity, robTask, Config.getGameOrTaskOrGiftLayoutId(), null);
     }
 
     /**

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogGameOrTaskOrGift.java

@@ -27,6 +27,7 @@ import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.adapter.GiftCenterAdapter;
 import com.sheep.gamegroup.view.adapter.WelfareAdapter;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -205,7 +206,7 @@ public class DialogGameOrTaskOrGift {
     private AlertDialog mAlertDialog;
 
     public AlertDialog showDialog() {
-        View view = View.inflate(activity, R.layout.dialog_game_or_task_or_gift, null);
+        View view = View.inflate(activity, Config.getGameOrTaskOrGiftLayoutId(), null);
         mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(view)
                 .create();

+ 5 - 3
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -2,7 +2,6 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.ActionBar;
 import android.app.Activity;
-import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.support.v7.widget.GridLayoutManager;
@@ -19,7 +18,6 @@ import android.widget.TextView;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.model.entity.AgentEntity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.UserTaskExistsNew;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -32,9 +30,9 @@ import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
-import com.sheep.gamegroup.view.activity.ActMsg;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.gamegroup.view.adapter.AdpUserCenterModule;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -148,6 +146,10 @@ public class FgtPersonalCenter extends BaseFragment {
             img_baseactivity_title.setVisibility(View.INVISIBLE);
             txt_baseactivity_title.setVisibility(View.INVISIBLE);
         }
+        if(Config.USE_CHRISTMAS_THEME) {
+            View homeTopView = (View) img_baseactivity_title.getParent().getParent();
+            homeTopView.setBackgroundResource(R.mipmap.christmas_bg_pc_top);
+        }
         ViewUtil.setText(audit_activity, getString(R.string.audit_activity, ViewUtil.INDENT));
         ViewUtil.setVisibility(audit_activity_oval, false);
         ViewUtil.setText(audit_success, getString(R.string.audit_success, ViewUtil.INDENT));

+ 7 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -58,6 +58,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.BulletinEnty;
 import com.sheep.gamegroup.model.entity.CashAwarsEntity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.model.entity.Lp;
 import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
 import com.sheep.gamegroup.model.entity.RecyleObj;
@@ -88,6 +89,7 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 import com.sheep.gamegroup.view.activity.ActMsg;
 import com.sheep.gamegroup.view.activity.NotificationsUtils;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
@@ -96,6 +98,7 @@ import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -710,6 +713,10 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         });
         //上面的搜索
         ViewUtil.setVisibility(home_search_msg_tv, false);
+        if(Config.USE_CHRISTMAS_THEME){
+//            LayoutParamsUtil.resetLayoutParams(ivDuty, new Lp().setWidth(G.getRealPix(57)).setHeight(G.getRealPix(62)));
+            ivDuty.setImageResource(R.mipmap.christmas_red_package_floatbtn);
+        }
     }
 
     private int curPosition = 0;

+ 5 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -6,4 +6,9 @@ package com.sheep.jiuyan.samllsheep;
 
 public class Config {
     public final static String BUGLY_APPID = "0dd998212c";
+    public static boolean USE_CHRISTMAS_THEME = true;//是否使用圣诞主题
+
+    public static int getGameOrTaskOrGiftLayoutId() {
+        return USE_CHRISTMAS_THEME ? R.layout.christmas_dialog_game_or_task_or_gift : R.layout.dialog_game_or_task_or_gift;
+    }
 }

BIN
app/src/main/res/drawable-xxhdpi/christmas_homepage_faxian.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_homepage_faxian_click.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_homepage_wode.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_homepage_wode_click.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_homepage_zhuanqian.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_homepage_zhuanqian_click.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_tab_click_yaoqing.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_tab_game.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_tab_game_blue.png


BIN
app/src/main/res/drawable-xxhdpi/christmas_tab_yaoqing.png


+ 8 - 0
app/src/main/res/drawable/christmas_drawable_selector_askgetmoney.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/christmas_tab_click_yaoqing" android:state_activated="true"/>
+    <item android:drawable="@drawable/christmas_tab_click_yaoqing" android:state_pressed="true"/>
+    <item android:drawable="@drawable/christmas_tab_yaoqing"/>
+
+</selector>

+ 8 - 0
app/src/main/res/drawable/christmas_drawable_selector_find.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/christmas_homepage_faxian_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/christmas_homepage_faxian_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/christmas_homepage_faxian"/>
+
+</selector>

+ 8 - 0
app/src/main/res/drawable/christmas_drawable_selector_game_center.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/christmas_tab_game_blue" android:state_activated="true"/>
+    <item android:drawable="@drawable/christmas_tab_game_blue" android:state_pressed="true"/>
+    <item android:drawable="@drawable/christmas_tab_game"/>
+
+</selector>

+ 8 - 0
app/src/main/res/drawable/christmas_drawable_selector_personalcenter.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/christmas_homepage_wode_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/christmas_homepage_wode_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/christmas_homepage_wode"/>
+
+</selector>

+ 8 - 0
app/src/main/res/drawable/christmas_drawable_selector_task.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/christmas_homepage_zhuanqian_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/christmas_homepage_zhuanqian_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/christmas_homepage_zhuanqian"/>
+
+</selector>

+ 12 - 0
app/src/main/res/drawable/christmas_shape_red_stroke_rectangle_no_lb.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
+    <stroke
+        android:width="1px"
+        android:color="#FDDD36" />
+
+</shape>

+ 1 - 1
app/src/main/res/drawable/shape_red_stroke_rectangle_no_lb.xml

@@ -7,6 +7,6 @@
         android:bottomRightRadius="10dp"/>
     <stroke
         android:width="1px"
-        android:color="#FD2D54" />
+        android:color="@color/red_FD2D54" />
 
 </shape>

+ 113 - 0
app/src/main/res/layout/christmas_dialog_game_or_task_or_gift.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/dialog_content"
+        android:layout_width="344dp"
+        android:layout_height="418dp"
+        android:layout_centerInParent="true"
+        android:background="@mipmap/christmas_bg_qiangrew"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/dialog_iv"
+            android:layout_width="@dimen/content_padding_65"
+            android:layout_height="@dimen/content_padding_65"
+            android:layout_marginTop="120dp"
+            android:src="@drawable/loading_01" />
+
+        <TextView
+            android:id="@+id/dialog_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="永恒仙域"
+            android:textColor="#ffffff"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/dialog_iv_2"
+            android:layout_width="80dp"
+            android:layout_height="@dimen/content_padding_65"
+            android:layout_marginTop="90dp"
+            android:src="@mipmap/change_make_money"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/dialog_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/cur_xian_jin_amount"
+            android:textColor="#999999"
+            android:textSize="11sp"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:id="@+id/dialog_amount_container"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/dialog_amount_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="+1元"
+                android:textColor="#ffffff"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <View
+                android:id="@+id/dialog_line"
+                android:layout_width="5dp"
+                android:layout_height="1dp" />
+
+            <TextView
+                android:id="@+id/dialog_gift_tv"
+                style="@style/christmas_style_xian_jin"
+                android:text="现金" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/dialog_gift_code_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="50dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="50dp"
+            android:text="@string/gift_bag_code"
+            android:textColor="#fffd2d54"
+            android:textSize="11sp"
+            android:visibility="invisible" />
+
+        <TextView
+            android:id="@+id/dialog_gift_info_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="50dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="50dp"
+            android:text="*领取礼包并复制礼包码后可进入游戏中粘贴礼包码兑换礼包"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textColor="#ffffffff"
+            android:textSize="11sp"
+            android:visibility="invisible" />
+
+        <include layout="@layout/christmas_x_msg_dialog_btn_purple_blue" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/dialog_close"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:layout_below="@+id/dialog_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="20dp"
+        android:src="@mipmap/close" />
+
+</RelativeLayout>

+ 30 - 0
app/src/main/res/layout/christmas_x_msg_dialog_btn_purple_blue.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="40dp"
+    android:layout_marginEnd="40dp"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/dialog_btn_left"
+        style="@style/style_button"
+        android:background="@mipmap/christmas_huanyig"
+        android:layout_width="0dp"
+        android:layout_weight="5"
+        android:text="换一个" />
+
+    <View
+        android:id="@+id/dialog_btn_center"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_weight="1" />
+
+    <TextView
+        android:id="@+id/dialog_btn_right"
+        style="@style/style_button"
+        android:background="@mipmap/christmas_lanse"
+        android:layout_width="0dp"
+        android:layout_weight="5"
+        android:text="立即赚钱" />
+</LinearLayout>

+ 1 - 1
app/src/main/res/layout/homepage_act_layout.xml

@@ -146,7 +146,7 @@
 
         <ImageView
             android:id="@+id/iv_rob_duty"
-            android:layout_width="65dp"
+            android:layout_width="wrap_content"
             android:layout_height="60dp"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"

BIN
app/src/main/res/mipmap-xxhdpi/christmas_bg_pc_top.png


BIN
app/src/main/res/mipmap-xxhdpi/christmas_bg_qiangrew.png


BIN
app/src/main/res/mipmap-xxhdpi/christmas_huanyig.png


BIN
app/src/main/res/mipmap-xxhdpi/christmas_lanse.png


BIN
app/src/main/res/mipmap-xxhdpi/christmas_red_package_floatbtn.png


+ 13 - 0
app/src/main/res/values/dd_styles.xml

@@ -466,4 +466,17 @@
         <item name="android:textSize">9sp</item>
         <item name="android:background">@drawable/shape_red_stroke_rectangle_no_lb</item>
     </style>
+    <!--现金、福利 textView样式-->
+    <style name="christmas_style_xian_jin">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">#FDDD36</item>
+        <item name="android:paddingTop">1dp</item>
+        <item name="android:paddingBottom">1dp</item>
+        <item name="android:paddingStart">5dp</item>
+        <item name="android:paddingEnd">5dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textSize">9sp</item>
+        <item name="android:background">@drawable/christmas_shape_red_stroke_rectangle_no_lb</item>
+    </style>
 </resources>