|
3 | 3 | * |
4 | 4 | * React Native QRCode generation component. Can generate standard QRCode image or base64 image data url text. Cross-browser QRCode generator for pure javascript. Support Dot style, Logo, Background image, Colorful, Title etc. settings. support binary mode. |
5 | 5 | * |
6 | | - * Version 3.9.1 |
| 6 | + * Version 3.9.3 |
7 | 7 | * |
8 | 8 | |
9 | 9 | * |
@@ -1181,12 +1181,23 @@ Drawing.prototype.draw = function(oQRCode) { |
1181 | 1181 |
|
1182 | 1182 | lColor = "rgba(0,0,0,0)"; |
1183 | 1183 | if (row == 6) { |
1184 | | - dColor = _htOption.timing_H || _htOption.timing || _htOption.colorDark; |
| 1184 | + // dColor = _htOption.timing_H || _htOption.timing || _htOption.colorDark; |
| 1185 | + if (_htOption.autoColor) { |
| 1186 | + dColor = _htOption.timing_H || _htOption.timing || _htOption.autoColorDark; |
| 1187 | + lColor = _htOption.timing_H || _htOption.timing || _htOption.autoColorLight; |
| 1188 | + } else { |
| 1189 | + dColor = _htOption.timing_H || _htOption.timing || _htOption.colorDark; |
| 1190 | + } |
1185 | 1191 | } else if (col == 6) { |
1186 | | - dColor = _htOption.timing_V || _htOption.timing || |
1187 | | - _htOption.colorDark; |
| 1192 | + // dColor = _htOption.timing_V || _htOption.timing || _htOption.colorDark; |
| 1193 | + if (_htOption.autoColor) { |
| 1194 | + dColor = _htOption.timing_V || _htOption.timing || _htOption.autoColorDark; |
| 1195 | + lColor = _htOption.timing_V || _htOption.timing || _htOption.autoColorLight; |
| 1196 | + } else { |
| 1197 | + dColor = _htOption.timing_V || _htOption.timing || |
| 1198 | + _htOption.colorDark; |
| 1199 | + } |
1188 | 1200 | } else { |
1189 | | - |
1190 | 1201 | if (_htOption.autoColor) { |
1191 | 1202 | dColor = _htOption.autoColorDark; |
1192 | 1203 | lColor = _htOption.autoColorLight; |
@@ -1220,8 +1231,15 @@ Drawing.prototype.draw = function(oQRCode) { |
1220 | 1231 | nowDotScale = _htOption.dotScaleAO; |
1221 | 1232 | } else if (eye.type == 'AI') { |
1222 | 1233 | nowDotScale = _htOption.dotScaleAI; |
| 1234 | + } |
| 1235 | + |
| 1236 | + if (_htOption.backgroundImage && _htOption.autoColor) { |
| 1237 | + dColor = ((eye.type == 'AO') ? _htOption.AI : _htOption.AO) || |
| 1238 | + _htOption.autoColorDark; |
| 1239 | + lColor = _htOption.autoColorLight; |
1223 | 1240 | } else { |
1224 | | - nowDotScale = 1; |
| 1241 | + dColor = ((eye.type == 'AO') ? _htOption.AI : _htOption.AO) || |
| 1242 | + dColor; |
1225 | 1243 | } |
1226 | 1244 |
|
1227 | 1245 | // _oContext.fillRect(nLeft, _htOption.titleHeight + nTop, nWidth, nHeight); |
|
0 commit comments