md5保存方法更新

app/src/main/java/com/sheep/gamegroup/module/plugin/util/SheepPluginUtil.java

@@ -67,8 +67,6 @@ public class SheepPluginUtil {
                                     return null;
                                 }
                             }
-                            //保存当前插件对应的md5
-                            DataUtil.getInstance().putData(getKey(plugin), clientPackage.getMd_5());
                             return clientPackage.getDowload_url();
                         }
                         return null;

app/src/main/java/com/sheep/gamegroup/module/skin/util/SkinUtil.java

@@ -8,10 +8,13 @@ import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
 import com.sheep.gamegroup.util.DataUtil;
 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.jiuyan.samllsheep.SheepApp;
 
+import java.io.File;
+
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
@@ -67,13 +70,14 @@ public class SkinUtil {
                 .subscribe(new AbsObserver<Plugin>() {
                     @Override
                     public void onNext(Plugin plugin) {
-                        if(!SheepPluginUtil.getFile(plugin).exists()){//检查文件是否存在
+                        File file = SheepPluginUtil.getFile(plugin);
+                        if(!file.exists()){//检查文件是否存在
                             action1.call(null);
                             return;
                         }
-                        Object md5 = DataUtil.getInstance().getData(SheepPluginUtil.getKey(plugin));
+                        String md5 = Md5Util.getFileMD5(file);
                         String skinName = SheepPluginUtil.getFileName(curPlugin);
-                        if(curSkinMd5 != null && md5 instanceof String && TextUtils.equals(md5.toString(), curSkinMd5)){//已经加载皮肤
+                        if(curSkinMd5 != null && TextUtils.equals(md5, curSkinMd5)){//已经加载皮肤
                             action1.call(null);
                             return;
                         }
@@ -87,8 +91,7 @@ public class SkinUtil {
                             @Override
                             public void onSuccess() {
                                 LogUtil.println(SkinUtil.class.getSimpleName(), "changeSkin", "loadSkin", skinName, "onSuccess");
-                                if(md5 instanceof String)
-                                    PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, md5.toString());
+                                PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, md5);
                                 action1.call(null);
                             }