Skip to content

php / maf

Go to a project
Commit 504f9026 by doszhang
Options

dos

parent 5ca132f6
Showing with 18 additions and 15 deletions
Application/Common/Conf/config.php
...@@ -13,7 +13,7 @@ return array( ...@@ -13,7 +13,7 @@ return array(
'AUTH_CLIENT_ID' => 'third', 'AUTH_CLIENT_ID' => 'third',
'AUTH_CLIENT_PASSWORD' => 'zhida_third_oauth', 'AUTH_CLIENT_PASSWORD' => 'zhida_third_oauth',
/* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */ /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
'__CDN__' => 'https://static3.izhida.cn/cdn1/maf/v1.0.5', '__CDN__' => 'https://static3.izhida.cn/cdn1/maf/v1.0.6',
// '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里 // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
'URL_MODEL' => 3, 'URL_MODEL' => 3,
'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage', 'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',
......
Public/static/js/common.js
...@@ -398,20 +398,23 @@ function createPoster(callback) { ...@@ -398,20 +398,23 @@ function createPoster(callback) {
let posterImg = new Image(); let posterImg = new Image();
posterImg.src = 'https://maf.izhida.cn/Public/static/image2/poster' + resultType + '.png'; posterImg.src = 'https://maf.izhida.cn/Public/static/image2/poster' + resultType + '.png';
posterImg.onload = function () { posterImg.onload = function () {
posterCtx.drawImage(posterImg, 0, 0, posterCanvas.width, posterCanvas.height); setTimeout(function () {
let headimg = new Image(); posterCtx.drawImage(posterImg, 0, 0, posterCanvas.width, posterCanvas.height);
headimg.src = window.getImageUrl + '?url=' + encodeURI(user_header_url); let headimg = new Image();
headimg.onload = function () { headimg.src = window.getImageUrl + '?url=' + encodeURI(user_header_url);
// posterCtx.drawImage(headimg, designPxToRealPx(canvasArr[resultType - 1][5]), designPxToRealPx(canvasArr[resultType - 1][4]), designPxToRealPx(52), designPxToRealPx(52)); headimg.onload = function () {
drawRoundedRect(posterCtx, designPxToRealPx(canvasArr[resultType - 1][5] - 6), designPxToRealPx(canvasArr[resultType - 1][4] - 6), designPxToRealPx(52) * 2, designPxToRealPx(52) * 2, designPxToRealPx(5) * 2, // posterCtx.drawImage(headimg, designPxToRealPx(canvasArr[resultType - 1][5]), designPxToRealPx(canvasArr[resultType - 1][4]), designPxToRealPx(52), designPxToRealPx(52));
true, canvasArr[resultType - 1][6]); drawRoundedRect(posterCtx, designPxToRealPx(canvasArr[resultType - 1][5] - 6), designPxToRealPx(canvasArr[resultType - 1][4] - 6), designPxToRealPx(52) * 2, designPxToRealPx(52) * 2, designPxToRealPx(5) * 2,
drawRoundRectImg(posterCtx, designPxToRealPx(5) * 2, designPxToRealPx(canvasArr[resultType - 1][5]), designPxToRealPx(canvasArr[resultType - 1][4]), designPxToRealPx(46) * 2, designPxToRealPx(46) * 2, headimg); true, canvasArr[resultType - 1][6]);
txtDraw(posterCtx, '@' + window.nickname, designPxToRealPx(canvasArr[resultType - 1][5] + 128), designPxToRealPx(canvasArr[resultType - 1][4] + 84), designPxToRealPx(20), 'normal', canvasArr[resultType - 1][6]); drawRoundRectImg(posterCtx, designPxToRealPx(5) * 2, designPxToRealPx(canvasArr[resultType - 1][5]), designPxToRealPx(canvasArr[resultType - 1][4]), designPxToRealPx(46) * 2, designPxToRealPx(46) * 2, headimg);
$('.posterImg').attr('src', getManBase64(posterCanvas)); txtDraw(posterCtx, '@' + window.nickname, designPxToRealPx(canvasArr[resultType - 1][5] + 128), designPxToRealPx(canvasArr[resultType - 1][4] + 84), designPxToRealPx(20), 'normal', canvasArr[resultType - 1][6]);
posterStatus = true; $('.posterImg').attr('src', getManBase64(posterCanvas));
$('.dialog').hide(); posterStatus = true;
callback(); $('.dialog').hide();
} callback();
}
}, 500);
} }
}, 2000); }, 2000);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment