Skip to content

feat:兼容安卓低版本(Compatible with lower versions of Android) #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mingjiezhou wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat:兼容安卓低版本(Compatible with lower versions of Android) #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions qrcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,15 @@ var QRCode;
}

// android 2.x doesn't support Data-URI spec

function _getAndroid() {
var android = false;
var sAgent = navigator.userAgent;

if (/android/i.test(sAgent)) { // android
android = true;
var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);

android = true;
// 安卓兼容性源码修改
// var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);
var aMat = sAgent.toString().match(/android (([0-9]).?[0-9]?)/i);
if (aMat && aMat[1]) {
android = parseFloat(aMat[1]);
}
Expand Down Expand Up @@ -594,9 +595,13 @@ var QRCode;
*
* @private
*/

QRCode.prototype.makeImage = function () {
if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
// if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
if (typeof this._oDrawing.makeImage == "function") {
this._oDrawing.makeImage();
} else {
alert('你的设备版本过低，不支持二维码绘制，请更换手机后重试')
}
};

Expand Down