Merge pull request #17 from VideoOS/merge

dev_1.3.1

Author: phoche

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/Config.java

@@ -6,7 +6,7 @@
  */
 
 public class Config {
-    public static String SDK_VERSION = "1.3.0";
+    public static String SDK_VERSION = "1.3.1";
     public static String HOST_VIDEO_OS="https://os-saas.videojj.com/os-api-saas";
     public static boolean REPORT_ABLE = true;
     public static int DEBUG_STATUS = 0;

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/media/HttpProxyCacheServer.java

@@ -168,7 +168,7 @@ public boolean isCached(String url) {
         if (info == null) {
             return false;
         }
-        return info.status == DownloadDbHelper.DownloadStatus.DOWNLOAD_SUCCESS;
+        return info.status == DownloadDbHelper.DownloadStatus.DOWNLOAD_SUCCESS&&getCacheFile(url).exists();
 //        return getCacheFile(url).exists();
     }
 

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/utils/VenvyMD5Util.java

@@ -2,6 +2,9 @@
 
 import android.text.TextUtils;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.math.BigInteger;
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -93,4 +96,27 @@ private static String SHA(final String strText, final String strType) {
 
         return strResult;
     }
+
+    public static String EncoderByMd5(File file) {
+        if (!file.isFile()) {
+            return null;
+        }
+        String encodeMd5String;
+        try {
+            MessageDigest digest = MessageDigest.getInstance("MD5");
+            FileInputStream in = new FileInputStream(file);
+            byte buffer[] = new byte[1024];
+            int len;
+            while ((len = in.read(buffer, 0, 1024)) != -1) {
+                digest.update(buffer, 0, len);
+            }
+            in.close();
+            BigInteger bigInt = new BigInteger(1, digest.digest());
+            encodeMd5String = bigInt.toString(16);
+        } catch (Exception e) {
+            e.printStackTrace();
+            encodeMd5String = null;
+        }
+        return encodeMd5String;
+    }
 }

VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/LuaUpdateInfo.java

@@ -0,0 +1,113 @@
+package cn.com.videopls.pub;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+/**
+ * Created by yanjiangbo on 2017/5/16.
+ */
+
+public class LuaUpdateInfo implements Parcelable {
+
+    private final String mVersion;
+    private final String mDownloadUrl;
+    private final String mManifestJson;
+
+    private LuaUpdateInfo(Builder builder) {
+        this.mVersion = builder.mVersion;
+        this.mDownloadUrl = builder.mDownloadUrl;
+        this.mManifestJson = builder.mManifestJson;
+    }
+
+    public String getDownloadUrl() {
+        return mDownloadUrl;
+    }
+
+    public String getVersion() {
+        return mVersion;
+    }
+
+    public String getManifestJson() {
+        return mManifestJson;
+    }
+
+    public static class Builder {
+        private String mVersion;
+        private String mDownloadUrl;
+        private String mManifestJson;
+
+        public Builder setVersion(String version) {
+            if (!TextUtils.isEmpty(version)) {
+                this.mVersion = version;
+            }
+            return this;
+        }
+
+        public Builder setDownloadUrl(String downloadUrl) {
+            if (!TextUtils.isEmpty(downloadUrl)) {
+                this.mDownloadUrl = downloadUrl;
+            }
+            return this;
+        }
+
+        public Builder setManifestJson(String manifestJson) {
+            if (!TextUtils.isEmpty(manifestJson)) {
+                this.mManifestJson = manifestJson;
+            }
+            return this;
+        }
+
+        public LuaUpdateInfo build() {
+            return new LuaUpdateInfo(this);
+        }
+
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.mVersion);
+        dest.writeString(this.mDownloadUrl);
+        dest.writeString(this.mManifestJson);
+    }
+
+    protected LuaUpdateInfo(Parcel in) {
+        this.mVersion = in.readString();
+        this.mDownloadUrl = in.readString();
+        this.mManifestJson = in.readString();
+    }
+
+    public static final Parcelable.Creator<LuaUpdateInfo> CREATOR = new Parcelable.Creator<LuaUpdateInfo>() {
+        @Override
+        public LuaUpdateInfo createFromParcel(Parcel source) {
+            return new LuaUpdateInfo(source);
+        }
+
+        @Override
+        public LuaUpdateInfo[] newArray(int size) {
+            return new LuaUpdateInfo[size];
+        }
+    };
+
+    @Override
+    public int hashCode() {
+        return TextUtils.isEmpty(mVersion) ? super.hashCode() : mVersion.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return super.equals(obj);
+        }
+        if (!(obj instanceof LuaUpdateInfo)) {
+            return super.equals(obj);
+        }
+        LuaUpdateInfo luaUpdateInfo = (LuaUpdateInfo) obj;
+        return TextUtils.equals(mVersion, luaUpdateInfo.getVersion());
+    }
+}