Prechádzať zdrojové kódy

使用春节皮肤时启动图片切换为百万豪礼图标

zengjiebin 7 rokov pred
rodič
commit
51ec4695d1
20 zmenil súbory, kde vykonal 177 pridanie a 95 odobranie
  1. 12 0
      app/src/main/AndroidManifest.xml
  2. 73 0
      app/src/main/java/com/sheep/gamegroup/module/skin/util/SkinUtil.java
  3. 3 2
      app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushReceiver.java
  4. 2 3
      app/src/main/java/com/sheep/gamegroup/util/MainTab.java
  5. 1 1
      app/src/main/java/com/sheep/gamegroup/util/TestUtil.java
  6. 14 13
      app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java
  7. 2 1
      app/src/main/java/com/sheep/gamegroup/util/share/ShareLinkConfig.java
  8. 2 0
      app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java
  9. 1 2
      app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java
  10. 2 1
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java
  11. 2 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java
  12. 2 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java
  13. 2 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
  14. 1 2
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyFriend.java
  15. 1 2
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java
  16. BIN
      app/src/main/res/drawable-xxhdpi/icon_new_year.png
  17. 4 33
      app/src/main/res/layout/new_year_x_ask_getmoney_act_layout.xml
  18. 5 32
      app/src/main/res/layout/x_ask_getmoney_act_layout.xml
  19. BIN
      app/src/main/res/mipmap-xhdpi/icon_new_year.png
  20. 48 0
      app/src/main/res/values/dd_styles.xml

+ 12 - 0
app/src/main/AndroidManifest.xml

@@ -191,6 +191,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity-alias
+            android:name=".NewYearSplashAct"
+            android:enabled="false"
+            android:icon="@mipmap/icon_new_year"
+            android:label="@string/app_name"
+            android:targetActivity="com.sheep.gamegroup.view.activity.SplashAct">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
         <activity
             android:name="com.sheep.gamegroup.view.activity.MiddleSchemeAct"
             android:configChanges="keyboardHidden|screenSize|orientation"

+ 73 - 0
app/src/main/java/com/sheep/gamegroup/module/skin/util/SkinUtil.java

@@ -1,6 +1,8 @@
 package com.sheep.gamegroup.module.skin.util;
 
 import android.app.Activity;
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
 import com.sheep.gamegroup.absBase.AbsObserver;
@@ -11,6 +13,9 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.Md5Util;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.TestUtil;
+import com.sheep.gamegroup.view.activity.SplashAct;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.io.File;
@@ -63,6 +68,7 @@ public class SkinUtil {
             if(TextUtils.isEmpty(curSkinMd5) || !TextUtils.isEmpty(curSkinName)){
                 PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, "");
                 restoreDefaultTheme();
+                changeDefaultIcon();
             }
             action1.call(null);
             return;
@@ -83,6 +89,7 @@ public class SkinUtil {
                         String skinName = SheepPluginUtil.getFileName(willLoadPlugin);
                         String curSkinName = SkinPreference.getInstance().getSkinName();
                         if(curSkinMd5 != null && TextUtils.equals(md5, curSkinMd5) && TextUtils.equals(skinName, curSkinName)){//已经加载皮肤
+                            curPlugin = willLoadPlugin;
                             action1.call(null);
                             return;
                         }
@@ -97,6 +104,8 @@ public class SkinUtil {
                             public void onSuccess() {
                                 LogUtil.println(SkinUtil.class.getSimpleName(), "changeSkin", "loadSkin", skinName, "onSuccess");
                                 curPlugin = willLoadPlugin;
+                                if(isLoadNewYearSkin())
+                                    changeIcon();
                                 PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, md5);
                                 action1.call(null);
                             }
@@ -142,4 +151,68 @@ public class SkinUtil {
     public static String getSkinPath(String skinName) {
         return SheepPluginUtil.getFileByName(skinName, curPlugin).getAbsolutePath();
     }
+
+    public static void changeIcon() {
+        //拿到我们注册的MainActivity组件
+        ComponentName defaultComponent = new ComponentName(SheepApp.getInstance(), SplashAct.class.getName());  //拿到默认的组件
+        //拿到我注册的别名test组件
+        ComponentName testComponent = new ComponentName(SheepApp.getInstance(), BuildConfig.APPLICATION_ID + ".NewYearSplashAct");
+        if(!TestUtil.isDev())
+            disableComponent(defaultComponent);
+        enableComponent(testComponent);
+    }
+
+    public static void changeDefaultIcon() {
+        //拿到我们注册的MainActivity组件
+        ComponentName defaultComponent = new ComponentName(SheepApp.getInstance(), SplashAct.class.getName());  //拿到默认的组件
+        //拿到我注册的别名test组件
+        ComponentName testComponent = new ComponentName(SheepApp.getInstance(), BuildConfig.APPLICATION_ID + ".NewYearSplashAct");
+        enableComponent(defaultComponent);
+        disableComponent(testComponent);
+    }
+    /**
+     * 启用组件
+     *
+     * @param componentName
+     */
+    private static void enableComponent(ComponentName componentName) {
+        PackageManager packageManager = SheepApp.getInstance().getPackageManager();
+        int state = packageManager.getComponentEnabledSetting(componentName);
+        if (state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
+            //已经启用
+            return;
+        }
+        packageManager.setComponentEnabledSetting(componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                PackageManager.DONT_KILL_APP);
+    }
+
+    /**
+     * 禁用组件
+     *
+     * @param componentName
+     */
+    private static void disableComponent(ComponentName componentName) {
+        PackageManager packageManager = SheepApp.getInstance().getPackageManager();
+        int state = packageManager.getComponentEnabledSetting(componentName);
+        if (state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+            //已经禁用
+            return;
+        }
+        packageManager.setComponentEnabledSetting(componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+    }
+    //获取应用图标
+    public static int getAppIcon(){
+        return isLoadNewYearSkin() ? R.mipmap.icon_new_year : R.mipmap.icon;
+    }
+
+    /**
+     * 是否加载的是春节皮肤
+     * @return
+     */
+    public static boolean isLoadNewYearSkin(){
+        return curPlugin == Plugin.skin_new_year;
+    }
 }

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushReceiver.java

@@ -13,6 +13,7 @@ import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.view.activity.MiddleAct;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -159,9 +160,9 @@ public class SheepJpushReceiver extends BroadcastReceiver {
 
             notificationBuilder
                     //下拉显示的大图标
-    //                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.icon))
+    //                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), SkinUtil.getAppIcon()))
     //                .setSmallIcon(R.mipmap.remenyx)//系统状态栏显示的小图标 remenyx
-                    .setSmallIcon(R.drawable.icon)
+                    .setSmallIcon(SkinUtil.getAppIcon())
                     .setTicker(title)
                     .setDefaults(Notification.DEFAULT_VIBRATE)
                     .setWhen(System.currentTimeMillis())

+ 2 - 3
app/src/main/java/com/sheep/gamegroup/util/MainTab.java

@@ -2,12 +2,11 @@ package com.sheep.gamegroup.util;
 
 import android.support.v4.app.Fragment;
 
-import com.sheep.gamegroup.module.plugin.model.Plugin;
+import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyNewYear;
 import com.sheep.gamegroup.view.fragment.FgtFind;
-import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.R;
@@ -53,7 +52,7 @@ public enum MainTab {
     FgtMainAskGetMoney(R.string.main_tab_invite) {
         @Override
         public Fragment getFragment() {
-            return SkinUtil.curPlugin == Plugin.skin_new_year ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
+            return SkinUtil.isLoadNewYearSkin() ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
         }
 
         @Override

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

@@ -844,7 +844,7 @@ public class TestUtil {
      * umen 分享
      */
     private void testUmen(Activity context) {
-        UMImage umImage = new UMImage(context, R.mipmap.icon);
+        UMImage umImage = new UMImage(context, SkinUtil.getAppIcon());
         new ShareAction(context)
                 .withText("hehe")
                 .withMedia(umImage)

+ 14 - 13
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -85,6 +85,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.game.fragment.FgtMyGameList;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsResp;
 import com.sheep.gamegroup.util.glide.RoundedCornersTransformation;
@@ -182,7 +183,7 @@ public class ViewUtil {
 
         GlideImageLoader.saveAndSetRqImageDisHardConfig(iv_qr, link, 800);
         Glide.with(activity)
-                .load(R.drawable.icon)
+                .load(SkinUtil.getAppIcon())
                 .apply(new RequestOptions().disallowHardwareConfig().override(G.WIDTH / 8))
                 .into(iv_qr_small);
 
@@ -852,7 +853,7 @@ public class ViewUtil {
      */
     private static void shareAction(Activity activity, String title, String content, String url, SHARE_MEDIA media, final ShareCallback callback) {
         /* 缩略图 */
-        UMImage image = new UMImage(activity, R.drawable.icon);
+        UMImage image = new UMImage(activity, SkinUtil.getAppIcon());
         /* URL */
         UMWeb web = new UMWeb(url);
         /* 标题 */
@@ -1712,7 +1713,7 @@ public class ViewUtil {
     public static void centerImage(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1738,7 +1739,7 @@ public class ViewUtil {
     public static void setBlur(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1753,7 +1754,7 @@ public class ViewUtil {
             if(object instanceof String) {
                 String pictures = object.toString();
                 if (TextUtils.isEmpty(pictures)) {
-                    imageView.setImageResource(R.mipmap.icon);
+                    imageView.setImageResource(SkinUtil.getAppIcon());
                 } else {
                     if (pictures.contains(";")) {
                         pictures = pictures.split(";")[0];
@@ -1769,7 +1770,7 @@ public class ViewUtil {
     public static void setViewWH(ImageView imageView, String pictures, int width) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1823,7 +1824,7 @@ public class ViewUtil {
     public static void setImagePath(ImageView imageView, String paths) {
         if (imageView != null) {
             if (TextUtils.isEmpty(paths)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (paths.contains(";")) {
                     paths = paths.split(";")[0];
@@ -1836,7 +1837,7 @@ public class ViewUtil {
     public static void setImagePath(ImageView imageView, String paths, int radio) {
         if (imageView != null) {
             if (TextUtils.isEmpty(paths)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (paths.contains(";")) {
                     paths = paths.split(";")[0];
@@ -1849,7 +1850,7 @@ public class ViewUtil {
     public static void setImageLoading(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1862,7 +1863,7 @@ public class ViewUtil {
     public static void setImage(ImageView imageView, String pictures, int radius) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1874,7 +1875,7 @@ public class ViewUtil {
     public static void roundedCornersImage1(ImageView imageView, String pictures, int radius) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1887,7 +1888,7 @@ public class ViewUtil {
     public static void setGameImage(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1900,7 +1901,7 @@ public class ViewUtil {
     public static void setGameImage(ImageView imageView, String pictures, int radius) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];

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

@@ -15,6 +15,7 @@ import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.StringUtils;
@@ -263,7 +264,7 @@ public class ShareLinkConfig {
             } else if(iconResId > 0){
                 umImage = new UMImage(SheepApp.getInstance(), iconResId);
             } else {
-                umImage = new UMImage(SheepApp.getInstance(), R.mipmap.icon);
+                umImage = new UMImage(SheepApp.getInstance(), SkinUtil.getAppIcon());
             }
             umWeb = new UMWeb(realUrl);
             umWeb.setTitle(title);

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java

@@ -37,6 +37,7 @@ import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.PictureInvitationEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.transformer.ScaleTransformer;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
@@ -229,6 +230,7 @@ public class ActInvitation extends BaseUMActivity {
             final ImageView image_bottom = itemView.findViewById(R.id.image_bottom);
             final ImageView image_logo = itemView.findViewById(R.id.image_logo);
             final TextView image_tip = itemView.findViewById(R.id.image_tip);
+            image_logo.setImageResource(SkinUtil.getAppIcon());
             final RequestListener<Drawable> listener = new RequestListener<Drawable>() {
                 @Override
                 public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {

+ 1 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -5,7 +5,6 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
 import com.sheep.gamegroup.absBase.BaseUMActivity;
-import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyNewYear;
@@ -36,7 +35,7 @@ public class AskGetMoneyAct extends BaseUMActivity{
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
         if(fragment == null){
-            fragment = SkinUtil.curPlugin == Plugin.skin_new_year ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
+            fragment = SkinUtil.isLoadNewYearSkin() ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
             transaction.add(R.id.frame_container, fragment, "tag");
             transaction.commitAllowingStateLoss();
         }else {

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
@@ -158,7 +159,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
 
         Glide.with(SheepApp.getInstance())
                 .load(taskEty.getIcon())
-                .apply(new RequestOptions().placeholder(R.drawable.icon)
+                .apply(new RequestOptions().placeholder(SkinUtil.getAppIcon())
                         .dontAnimate())
                 .into(iconIv);
 

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -13,6 +13,7 @@ import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
@@ -62,7 +63,7 @@ public class NewbieTaskAdp extends BaseAdapter {
         return 0;
     }
 
-    private final static int[] ids = {R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, R.drawable.icon, R.drawable.newbie_task_6};
+    private final static int[] ids = {R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, SkinUtil.getAppIcon(), R.drawable.newbie_task_6};
 
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -14,6 +14,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TimeUtil;
@@ -101,7 +102,7 @@ public class TaskListItemAdp extends BaseAdapter {
         setTaskStatusText(ety, holder.detail_task_tv,holder.desc_tv);
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
-                .apply(new RequestOptions().placeholder(R.mipmap.icon))
+                .apply(new RequestOptions().placeholder(SkinUtil.getAppIcon()))
                 .into(holder.icon_iv);
         return convertView;
     }

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -28,6 +28,7 @@ import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.Release_task;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
@@ -401,7 +402,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
                 Glide.with(context)
                         .load(item.getIcon())
-                        .apply(new RequestOptions().placeholder(R.mipmap.icon))
+                        .apply(new RequestOptions().placeholder(SkinUtil.getAppIcon()))
                         .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
 
 

+ 1 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyFriend.java

@@ -8,7 +8,6 @@ import android.widget.TextView;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Friend;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ListUtil;
@@ -54,7 +53,7 @@ public class FgtAskGetMoneyFriend extends BaseFragment {
 
     @Override
     public int getLayoutId() {
-        return SkinUtil.curPlugin == Plugin.skin_new_year ? R.layout.new_year_fgt_askgetmoney_friend : R.layout.fgt_askgetmoney_friend;
+        return SkinUtil.isLoadNewYearSkin() ? R.layout.new_year_fgt_askgetmoney_friend : R.layout.fgt_askgetmoney_friend;
     }
 
     @Override

+ 1 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java

@@ -16,7 +16,6 @@ import com.sheep.gamegroup.model.entity.AskTop;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
@@ -72,7 +71,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
 
     @Override
     public int getLayoutId() {
-        return SkinUtil.curPlugin == Plugin.skin_new_year ? R.layout.new_year_fgt_askgetmoney_rank : R.layout.fgt_askgetmoney_rank;
+        return SkinUtil.isLoadNewYearSkin() ? R.layout.new_year_fgt_askgetmoney_rank : R.layout.fgt_askgetmoney_rank;
     }
 
     @Override

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


+ 4 - 33
app/src/main/res/layout/new_year_x_ask_getmoney_act_layout.xml

@@ -31,48 +31,19 @@
 
             <TextView
                 android:id="@+id/ask_act_rule"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_left_radius_12"
-                android:gravity="center"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:text="活动规则"
-                android:textColor="#ffffffff"
-                android:textSize="10sp"
+                style="@style/style_agm_act_rule_tv"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/ask_act_code"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_left_radius_12"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="10dp"
-                android:text="我的邀请码:976873"
-                android:textColor="#ffffffff"
-                android:textSize="10sp"
+                style="@style/style_agm_act_code_tv"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/ask_act_code_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_right_radius_12"
-                android:gravity="center"
-                android:paddingStart="7dp"
-                android:paddingEnd="10dp"
-                android:text="复制"
-                android:textColor="#ffffffff"
-                android:textSize="10sp"
+                style="@style/style_agm_act_code_copy_tv"
                 app:layout_constraintStart_toEndOf="@id/ask_act_code"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -226,7 +197,7 @@
 
                     <TextView
                         android:id="@+id/ask_invite_tv"
-                        style="@style/style_button_purple"
+                        style="@style/style_new_year_button_purple"
                         android:text="立即邀请" />
 
                 </LinearLayout>

+ 5 - 32
app/src/main/res/layout/x_ask_getmoney_act_layout.xml

@@ -161,46 +161,19 @@
 
             <TextView
                 android:id="@+id/ask_act_rule"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
+                style="@style/style_agm_act_rule_tv"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_left_radius_12"
-                android:gravity="center"
-                android:paddingEnd="6dp"
-                android:paddingStart="10dp"
-                android:text="活动规则"
-                android:textColor="#ffffffff"
-                android:textSize="10sp" />
+                android:layout_alignParentTop="true" />
             <TextView
                 android:id="@+id/ask_act_code"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_right_radius_12"
-                android:gravity="center"
-                android:paddingEnd="10dp"
-                android:paddingStart="6dp"
-                android:text="我的邀请码:976873"
-                android:textColor="#ffffffff"
-                android:textSize="10sp" />
+                style="@style/style_agm_act_code_tv"/>
             <TextView
                 android:id="@+id/ask_act_code_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="20dp"
                 android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/selector_button_orange"
-                android:gravity="center"
-                android:paddingEnd="12dp"
-                android:paddingStart="12dp"
-                android:text="复制"
-                android:textColor="#ffffffff"
-                android:textSize="10sp" />
+                android:layout_toEndOf="@id/ask_act_code"
+                style="@style/style_agm_act_code_copy_tv"/>
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>
 </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>

BIN
app/src/main/res/mipmap-xhdpi/icon_new_year.png


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

@@ -18,6 +18,15 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
         <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_full_purple</item>
+        <item name="android:textColor">@color/btn_color_main</item>
+        <item name="android:layout_margin">@dimen/dp_10</item>
+        <item name="android:textSize">@dimen/text_size_15</item>
+    </style>
+    <style name="style_new_year_button_purple">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:gravity">center</item>
         <item name="android:background">@drawable/new_year_selector_button_full_purple</item>
         <item name="android:textColor">@color/tc_ask_make_money_btn</item>
         <item name="android:layout_margin">@dimen/dp_10</item>
@@ -530,4 +539,43 @@
         <item name="android:paddingTop">4dp</item>
         <item name="android:textSize">@dimen/text_size_12</item>
     </style>
+
+    <style name="style_agm_act_rule_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_marginTop">28dp</item>
+        <item name="android:background">@drawable/sp_bg_purple_left_radius_12</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingStart">10dp</item>
+        <item name="android:paddingEnd">6dp</item>
+        <item name="android:text">活动规则</item>
+        <item name="android:textColor">#ffffffff</item>
+        <item name="android:textSize">10sp</item>
+    </style>
+    <style name="style_agm_act_code_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:layout_marginTop">28dp</item>
+        <item name="android:background">@drawable/sp_bg_purple_left_radius_12</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingStart">6dp</item>
+        <item name="android:paddingEnd">10dp</item>
+        <item name="android:text">我的邀请码:976873</item>
+        <item name="android:textColor">#ffffffff</item>
+        <item name="android:textSize">10sp</item>
+    </style>
+    <style name="style_agm_act_code_copy_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_marginStart">2dp</item>
+        <item name="android:layout_marginTop">28dp</item>
+        <item name="android:background">@drawable/sp_bg_purple_right_radius_12</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingStart">7dp</item>
+        <item name="android:paddingEnd">10dp</item>
+        <item name="android:text">复制</item>
+        <item name="android:textColor">#ffffffff</item>
+        <item name="android:textSize">10sp</item>
+    </style>
 </resources>