Преглед на файлове

homeList使用服务器的图片

zengjiebin преди 7 години
родител
ревизия
b8c0fc9cf4

BIN
app/libs/ad-htxd-201901071720.aar


+ 2 - 6
app/src/main/java/com/sheep/gamegroup/module/skin/util/SkinUtil.java

@@ -48,12 +48,10 @@ public class SkinUtil {
 
     //恢复默认皮肤
     public static void restoreDefaultTheme() {
-        curPlugin = null;
         // 恢复应用默认皮肤
         SkinCompatManager.getInstance().restoreDefaultTheme();
     }
 
-    public static Plugin curPlugin;
     public static final String KEY_CUR_SKIN_MD5 = "cur_skin";//当前正在使用的皮肤的key
     //切换皮肤
     public static void changeSkin(Action1<Object> action1) {
@@ -84,7 +82,6 @@ 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;
                         }
@@ -98,7 +95,6 @@ public class SkinUtil {
                             @Override
                             public void onSuccess() {
                                 LogUtil.println(SkinUtil.class.getSimpleName(), "changeSkin", "loadSkin", skinName, "onSuccess");
-                                curPlugin = willLoadPlugin;
                                 PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, md5);
                                 action1.call(null);
                             }
@@ -140,7 +136,7 @@ public class SkinUtil {
     }
 
     public static String getSkinPath(String skinName) {
-        return SheepPluginUtil.getFileByName(skinName, curPlugin).getAbsolutePath();
+        return SheepPluginUtil.getFileByName(skinName, getSkinByTime()).getAbsolutePath();
     }
     //获取应用图标
     public static int getAppIcon(){
@@ -152,6 +148,6 @@ public class SkinUtil {
      * @return
      */
     public static boolean isLoadNewYearSkin(){
-        return curPlugin == Plugin.skin_new_year;
+        return getSkinByTime() == Plugin.skin_new_year;
     }
 }

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

@@ -1493,15 +1493,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
      */
     private void addNewTask() {
         boolean isNewYear = SkinUtil.isLoadNewYearSkin();
-        if(isNewYear) {//新年皮肤,加载网络图片
-            int max = 11;
-            int i = 0;
-            for (HomeListEntity homeListEntity : homeListEntitys) {
-                int position = i == 8 ? 12 : i;//position为8的图片上传成功了却下载不了,实在是。。。
-                homeListEntity.setIcon(ViewUtil.getNetImgByNameAndSuffix("ic_new_year_" + position + ".png"));
-                i = (i + 1) % (max + 1);
-            }
-        }
 
         if (CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListList != null) {
             HomeListEntity homeListEntityNewTask = new HomeListEntity();