C2 Icon 修正

This commit is contained in:
ciaochaos 2020-09-01 23:22:50 +08:00
parent 26871b5ab7
commit 8c56cb347b
2 changed files with 674 additions and 732 deletions

View File

@ -169,13 +169,13 @@ let defaultDrawIcon = function ({ qrcode, params, title, icon }) {
const iconEnabled = getExactValue(icon.enabled, 0); const iconEnabled = getExactValue(icon.enabled, 0);
const {src, scale} = icon; const {src, scale} = icon;
const iconSize = Number(nCount * (scale > 33 ? 33 : scale) / 100); const iconSize = Number(nCount * (scale > 33 ? 33 : scale) / 100 * 3);
const iconXY = (nCount - iconSize) / 2; const iconXY = (nCount*3 - iconSize) / 2;
if (icon && iconEnabled) { if (icon && iconEnabled) {
const randomIdDefs = getIdNum(); const randomIdDefs = getIdNum();
const randomIdClips = getIdNum(); const randomIdClips = getIdNum();
pointList.push(<path d={sq25} stroke="#FFF" strokeWidth={100/iconSize * 1} fill="#FFF" transform={'translate('+String(iconXY)+','+String(iconXY)+') ' + 'scale(' + String(iconSize/100) + ',' + String(iconSize/100) + ')'} />); pointList.push(<path d={sq25} stroke="#FFF" strokeWidth={100/iconSize * 3} fill="#FFF" transform={'translate('+String(iconXY)+','+String(iconXY)+') ' + 'scale(' + String(iconSize/100) + ',' + String(iconSize/100) + ')'} />);
pointList.push( pointList.push(
<g key={id++}> <g key={id++}>
<defs> <defs>
@ -208,8 +208,8 @@ let builtinDrawIcon = function ({ qrcode, params, title, icon }) {
const iconMode = getExactValue(icon.enabled, 0); const iconMode = getExactValue(icon.enabled, 0);
const {src, scale} = icon; const {src, scale} = icon;
const iconSize = Number(nCount * (scale > 33 ? 33 : scale) / 100); const iconSize = Number(nCount * (scale > 33 ? 33 : scale) / 100 * 3);
const iconXY = (nCount - iconSize) / 2; const iconXY = (nCount*3 - iconSize) / 2;
const WeChatIconSmall = ( const WeChatIconSmall = (
<g> <g>
@ -255,7 +255,7 @@ let builtinDrawIcon = function ({ qrcode, params, title, icon }) {
if (icon && iconMode) { if (icon && iconMode) {
const randomIdDefs = getIdNum(); const randomIdDefs = getIdNum();
const randomIdClips = getIdNum(); const randomIdClips = getIdNum();
pointList.push(<path d={sq25} stroke="#FFF" strokeWidth={100/iconSize * 1} fill="#FFF" transform={'translate('+String(iconXY)+','+String(iconXY)+') ' + 'scale(' + String(iconSize/100) + ',' + String(iconSize/100) + ')'} />); pointList.push(<path d={sq25} stroke="#FFF" strokeWidth={100/iconSize * 3} fill="#FFF" transform={'translate('+String(iconXY)+','+String(iconXY)+') ' + 'scale(' + String(iconSize/100) + ',' + String(iconSize/100) + ')'} />);
pointList.push( pointList.push(
<g key={id++}> <g key={id++}>
<defs> <defs>

File diff suppressed because one or more lines are too long