Merge branch 'master' of github.com:alibaba/Virtualview-Android

Author: longerian

virtualview/src/main/java/com/tmall/wireless/vaf/virtualview/loader/BinaryLoader.java

@@ -33,6 +33,8 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.lang.reflect.Array;
+import java.util.Arrays;
 
 /**
  * Created by gujicheng on 16/8/4.
@@ -104,13 +106,12 @@ public int loadFromBuffer(byte[] buf, boolean override) {
 
             if (buf.length > 27) {
                 // check tag
-                int tagLen = Common.TAG.length();
-                String tag = new String(buf, 0, tagLen);
-                if (TextUtils.equals(Common.TAG, tag)) {
+                byte[] tagArray = Arrays.copyOfRange(buf, 0, Common.TAG.length());
+                if (Arrays.equals(Common.TAG.getBytes(), tagArray)) {
                     CodeReader reader = new CodeReader();
 
                     reader.setCode(buf);
-                    reader.seekBy(tagLen);
+                    reader.seekBy(Common.TAG.length());
 
                     // check version
                     int majorVersion = reader.readShort();
@@ -185,7 +186,7 @@ public int loadFromBuffer(byte[] buf, boolean override) {
                         Log.e(TAG, "version dismatch");
                     }
                 } else {
-                    Log.e(TAG, "loadFromBuffer failed tag is invalidate:" + tag);
+                    Log.e(TAG, "loadFromBuffer failed tag is invalidate.");
                 }
             } else {
                 Log.e(TAG, "file len invalidate:" + buf.length);

virtualview/src/main/java/com/tmall/wireless/vaf/virtualview/loader/UiCodeLoader.java

@@ -65,7 +65,7 @@ public boolean loadFromBuffer(CodeReader reader, int pageId, int patchVersion) {
 
         int count = reader.readInt();
         //count should be 1
-        Log.w(TAG, "load view count: " + count);
+//        Log.w(TAG, "load view count: " + count);
         short nameSize = reader.readShort();
         String name = new String(reader.getCode(), reader.getPos(), nameSize, Charset.forName("UTF-8"));
         CodeReader oldCodeReader = mTypeToCodeReader.get(name);
@@ -88,7 +88,7 @@ public boolean forceLoadFromBuffer(CodeReader reader, int pageId, int patchVersi
 
         int count = reader.readInt();
         //count should be 1
-        Log.w(TAG, "load view count: " + count);
+//        Log.w(TAG, "load view count: " + count);
         short nameSize = reader.readShort();
         String name = new String(reader.getCode(), reader.getPos(), nameSize, Charset.forName("UTF-8"));
         ret = loadFromBufferInternally(reader, nameSize, name);
@@ -97,7 +97,7 @@ public boolean forceLoadFromBuffer(CodeReader reader, int pageId, int patchVersi
 
     private boolean loadFromBufferInternally(CodeReader reader, short nameSize, String name) {
         boolean ret = true;
-        Log.w(TAG, "load view name " + name);
+//        Log.w(TAG, "load view name " + name);
         mTypeToCodeReader.put(name, reader);
         reader.seekBy(nameSize);