Merge pull request #16 from Live2D/feature/fix_encode

Fix encode.
Live2D · Nov 8, 2018 · 47e93ff · 47e93ff
2 parents b2b7dc3 + 46a8e08
commit 47e93ff
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/Framework/utils/cubismjson.ts b/Framework/utils/cubismjson.ts
@@ -316,11 +316,28 @@ export namespace Live2DCubismFramework
          */
         public arrayBufferToString(buffer: ArrayBuffer): string
         {
-            let encodedString: string = String.fromCharCode.apply(null, new Uint8Array(buffer));
-            let decodedString: string = decodeURIComponent(escape(encodedString));
-            return decodedString;
+            let uint8Array: Uint8Array = new Uint8Array(buffer);
+            let str: string = "";
+
+            for(let i: number = 0, len: number = uint8Array.length; i < len; ++i)
+            {
+                str += ("%" + this.pad(uint8Array[i].toString(16)));
+            }
+
+            str = decodeURIComponent(str);
+            return str;
         }
 
+        /**
+         * エンコード、パディング
+         */
+        private pad(n: string): string
+        {
+            return n.length < 2
+                ? "0" + n
+                : n;
+        };
+
         /**
          * JSONのパースを実行する
          * @param buffer    パース対象のデータバイト