Fixed: Android 4.5 以下 JPEGEncoder 不起作用

Jamesun921 · May 31, 2015 · 2f93ba0 · 2f93ba0
1 parent 6199fb0
commit 2f93ba0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/dist/lrz.mobile.min.js b/dist/lrz.mobile.min.js
diff --git a/dist/lrz.pc.min.js b/dist/lrz.pc.min.js
diff --git a/src/demo/index.html b/src/demo/index.html
@@ -77,8 +77,8 @@
 </footer>
 
 <script src="../lib/mobileFix.mini.js?v=ab833c8"></script>
-<script src="../lib/exif.js?v=c65d9ea"></script>
-<script src="../lrz.js?v=a36e904"></script>
-<script src="index.js?v=1aae8b1"></script>
+<script src="../lib/exif.js?v=b26c6d5"></script>
+<script src="../lrz.js?v=a18ef30"></script>
+<script src="index.js?v=27300bb"></script>
 </body>
 </html>
diff --git a/src/lrz.js b/src/lrz.js
@@ -129,13 +129,12 @@
                       ctx.drawImage(img, 0, 0, resize.w, resize.h);
                   }
 
-                  if (ua.os.family === 'Android' && ua.os.version < 4.5) {
+                  if (ua.os.family === 'Android' && ua.os.version.slice(0, 3) < 4.5) {
                     var encoder = new JPEGEncoder();
                     results.base64 = encoder.encode(ctx.getImageData(0, 0, canvas.width, canvas.height), that.defaults.quality * 100);
                   } else {
                     results.base64 = canvas.toDataURL('image/jpeg', that.defaults.quality);
                   }
-                  results.base64 = canvas.toDataURL('image/jpeg', that.defaults.quality);
 
                   // 执行回调
                   _callback(results);