|
|
@@ -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;
|
|
|
}
|
|
|
}
|