diff --git "a/1.5\345\242\236\345\274\272\347\211\210\345\215\207\347\272\247\345\206\205\345\256\271.txt" "b/1.5\345\242\236\345\274\272\347\211\210\345\215\207\347\272\247\345\206\205\345\256\271.txt" new file mode 100644 index 0000000..73dc3e8 --- /dev/null +++ "b/1.5\345\242\236\345\274\272\347\211\210\345\215\207\347\272\247\345\206\205\345\256\271.txt" @@ -0,0 +1,106 @@ +-----------------------shearphoto各版本升级概况---------------------- + +--------- + + +shearphoto1.5 版本升级概况 + + +1：修复PHP后端不能反馈重要错误的BUG，错误功能更加准确，纯粹为不懂JS的鸟儿服务。 + +2：修复PHP后端错漏，低级写法（免被洁辟者喷）！ + +3：优化PHP反馈serverdata的数据 + +4：前端部份：新增动态虚线截框（动态和静态截框架API接口），使外观更加漂亮，满足各种爱美人士！ + +5：加入多个API接口 如：是否历遍全图，遮层色彩，遮层透明度等。 + +提示：下一次的版本升级，将会重大功能加入，请继续支持shearphoto +----------------------------------------------------------------------------------------------------------------------- + + + +shearphoto1.4 版本升级概况 + + + + +1：加relativeUrl 接口，相对路径设置，因为TP YII CI等框架都是特别路径，把INDEX.html变换位置后就会出现图片读取出错的问题 ，对于部份不懂JS的人群确实造成一定程序二次开发困难！这个问题我也有责任，深感抱歉！ + 加入相对路径设置问题解决，具体请查看relativeUrl 接口！ + + +2：一如既往，修复已知BUG！ + +3： index.html
改为 + 防止与其他插件冲突 + +具体细节，请查看shearphoto1.4源码！ + + + 感谢大家对shearphoto的支持！ 用户反馈BUG存在，作者会一直更新到底！ 再次感谢向作者反馈BUG的用户！ + +----------------------------------------------------------------------------------------------------------------------- + + + + + +shearphoto1.3 版本升级概况 + + + + +1：FLASH AS脚本已全部重写！修正FLASH摄象拍照，摄象头没启动也能拍照的BUG！严格要求摄象头启动才能向后端请求！ + + + +2：改变FLASH摄象拍照上传数据流，原来是采用PHP流，速度非常不理想！修正后采用FORMDATA流，速度快5倍，允许拍照向后端POST参数传递，以及优化画面质量，流畅度等！ + + + +3： 原来是拍照和上传图片是分开的，修正后上传请求统一在后端文件upload.php进行 ！ + + + +4：修正图片上传后，图片类型没严格规定的BUG！ + +5：上传，截图，拍照 ，加入能定义传入POST参数！ +----------------------------------------------------------------------------------------------------------------------- + + + + + + + + + + +shearphoto1.2 版本升级概况 + + + + +1：加入移动端的拉伸和拖拽事件，方便开发人员开发移动端截图功能！ + + +2：修复已知BUG！ + + +注意，只是加入了移动端的拉伸和拖拽事件，如果你需要开发移动端截图，还需要自己进行二次开发，加入拉伸和拖拽事件只为了方便二次开发 +---------------------------------------------------------------------------------------------------------------------- + + +以后版本将会加入HTML5图片处理，包括图片特效等！ + + + + + + +开发文当，教程，下载最新版本，请到官网www.shearphoto.com + +------- + +下次开发版本，将加入H5特效处理！请密切关注www.shearphoto.com的更新 \ No newline at end of file diff --git a/css/ShearPhoto.css b/css/ShearPhoto.css index 8329b08..00439a3 100644 --- a/css/ShearPhoto.css +++ b/css/ShearPhoto.css @@ -1,4 +1,5 @@ @charset "utf-8"; +/*鍏敤寮濮*/ img,div,i,em,a,body,p,H1,ul,li { font-family:'Helvetica Neue',Helvetica,Arial,sans-serif; border-style:none; @@ -8,7 +9,8 @@ margin:0; padding:0; text-decoration:none } -/*澶撮儴閮ㄤ唤*/ +/*鍏敤缁撴潫*/ +/*澶撮儴閮ㄤ唤寮濮*/ .header { height:65px; margin-bottom:10px; @@ -58,8 +60,8 @@ height:60px; line-height:60px; margin-right:20px } -/*澶撮儴閮ㄤ唤*/ -/*鏃嬭浆*/ +/*澶撮儴閮ㄤ唤缁撴潫*/ +/*鏃嬭浆寮濮*/ #LeftRotate { margin-left:10px; margin-right:10px @@ -123,8 +125,8 @@ background:url(../images/zoom.png) no-repeat -2px -1px .hint.R { background-position: -43px -1px } -/*鏃嬭浆*/ -/*閫夋嫨鍥剧墖鏂瑰紡*/ +/*鏃嬭浆缁撴潫*/ +/*閫夋嫨鍥剧墖鏂瑰紡寮濮*/ #SelectBox { background:url(../images/bg.png); position:absolute; @@ -135,7 +137,7 @@ z-index:180 height: 74px; width: 224px; background-color: #FFF; - filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0); + filter:alpha(opacity=0); opacity:0; position: absolute; float: left; @@ -181,8 +183,8 @@ top:79% margin-left:-115px; margin-top:-40px; } -/*閫夋嫨鍥剧墖鏂瑰紡*/ -/*宸ュ叿鏉*/ +/*閫夋嫨鍥剧墖鏂瑰紡缁撴潫*/ +/*宸ュ叿鏉″紑濮*/ .Psava { clear:both; height:50px; @@ -217,7 +219,6 @@ background-position:-79px -31px #Shearbar { padding-top:20px; width:450px; - display: none; margin-right: auto; margin-left: auto; } @@ -230,17 +231,17 @@ background-position:-79px -31px } #ZoomDist #ZoomBar { --moz-border-radius:2px 2px 10px 10px; --moz-box-shadow:0 1px 3px 0 #666; -background:#09F; -border-radius:2px 2px 10px 10px; -box-shadow:0 1px 3px 0 #666; -filter:progid:DXImageTransform.Microsoft.Alpha(opacity=80); -height:20px; -left:0; -opacity:0.8; -position:absolute; -width:10px + -moz-border-radius:2px 2px 10px 10px; + -moz-box-shadow:0 1px 3px 0 #666; + background:#09F; + border-radius:2px 2px 10px 10px; + box-shadow:0 1px 3px 0 #666; + filter:alpha(opacity=80); + height:20px; + left:0; + opacity:0.8; + position:absolute; + width:10px; } #ZoomDist .progress { @@ -254,12 +255,9 @@ margin-top:4px; overflow:hidden; width:100% } -/*宸ュ叿鏉*/ -/*涓诲姛鑳界晫闈*/ +/*宸ュ叿鏉＄粨鏉*/ +/*涓诲姛鑳界晫闈㈠紑濮*/ #black { -background:#000; -filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50); -opacity:0.5; position:absolute; z-index:99 } @@ -294,82 +292,123 @@ z-index:51 } #main #movebox { -float:left; -position:absolute; -z-index:100 + position:absolute; + z-index:100; + float: left; +} +/*鍔ㄦ佽竟妗嗗紑濮*/ +#movebox #borderTop,#movebox #borderLeft,#movebox #borderRight,#movebox #borderBottom { + background:url(../images/border.gif) #FFF; + display:inline-block; + filter:alpha(opacity=50); + opacity:0.5; + overflow:hidden; + position:absolute; + z-index:104; +} +#movebox #borderTop { +height:1px; +left:0; +top:0; +width:100%; +} + +#movebox #borderLeft { +height:100%; +left:0; +top:0; +width:1px; +} + +#movebox #borderRight { +height:100%; +right:0; +top:0; +width:1px; } +#movebox #borderBottom { +bottom:0; +height:1px; +left:0; +width:100%; +} +/*鍔ㄦ佽竟妗嗙粨鏉*/ +/*鎷変几鎴鐨勫叓涓偣寮濮*/ #main #movebox #BottomRight,#main #movebox #TopRight,#main #movebox #Topleft,#main #movebox #Bottomleft,#main #movebox #Topmiddle,#main #movebox #leftmiddle,#main #movebox #Rightmiddle,#main #movebox #Bottommiddle { -background:#04B7FB; -bottom:-4px; +background:#000; +border:1px solid #FFF; +bottom:-5px; cursor:nw-resize; display:block; +filter:alpha(opacity=50); height:8px; +opacity:0.5; overflow:hidden; position:absolute; -right:-4px; +right:-5px; width:8px; -z-index:105 +z-index:105; } #main #movebox #Bottomleft { -bottom:-4px; +bottom:-5px; cursor:ne-resize; -left:-4px +left:-5px } #main #movebox #Bottommiddle { -bottom:-4px; +bottom:-5px; cursor:n-resize; left:50%; -margin-left:-4px +margin-left:-5px } #main #movebox #Rightmiddle { cursor:e-resize; -margin-top:-4px; -right:-4px; +margin-top:-5px; +right:-5px; top:50% } #main #movebox #TopRight { cursor:ne-resize; -right:-4px; -top:-4px +right:-5px; +top:-5px } #main #movebox #Topleft { cursor:nw-resize; -left:-4px; -top:-4px +left:-5px; +top:-5px } #main #movebox #Topmiddle { cursor:n-resize; left:50%; -margin-left:-4px; -top:-4px +margin-left:-5px; +top:-5px } #main #movebox #leftmiddle { cursor:e-resize; -left:-4px; -margin-top:-4px; +left:-5px; +margin-top:-5px; top:50% } - +/*鎷変几鎴鐨勫叓涓偣缁撴潫*/ #main #relat { position:relative; z-index:60 } #main #smallbox { -background:url(); -overflow:hidden; -position:relative; -z-index:100 + background:url(); + overflow:hidden; + position:relative; + z-index:100 } -/*涓诲姛鑳界晫闈*/ +/*涓诲姛鑳界晫闈㈢粨鏉*/ /*涓婃粴涓嬫粴鎻愮ず鐨凜SS*/ @@ -382,7 +421,7 @@ position:absolute; top:10px; left:0; z-index:200; -filter:progid:DXImageTransform.Microsoft.Alpha(opacity=80); +filter:alpha(opacity=80); opacity:0.8; } .point i { @@ -395,18 +434,17 @@ margin-left:20px; margin-right:10px; background:url(../images/bg_repno.png) no-repeat; } -/*涓婃粴涓嬫粴鎻愮ず鐨凜SS*/ -/*鎴浘瀹屾垚鍚庣殑CSS*/ +/*涓婃粴涓嬫粴鎻愮ず鐨凜SS缁撴潫*/ +/*鎴浘瀹屾垚鍚庣殑CSS寮濮*/ .complete { - float:left; - overflow:hidden; - padding-left:5px; - padding-top:10px; - position:absolute; - width:100%; - z-index:250; - background-image: url(../images/bg.jpg); - background-color: #CCC +background:url(../images/bg.jpg) #CCC; +float:left; +overflow:hidden; +padding-left:5px; +padding-top:10px; +position:absolute; +width:100%; +z-index:250; } .complete .completeTxt { @@ -421,7 +459,7 @@ padding-top:30px; position:absolute; right:30px; text-align:center; -width:280px +width:280px; } .complete .completeTxt a { @@ -468,9 +506,9 @@ font-size:14px width:15px; vertical-align: middle; } -/*鎴浘瀹屾垚鍚庣殑CSS*/ +/*鎴浘瀹屾垚鍚庣殑CSS缁撴潫*/ -/*寮瑰嚭鐩稿唽*/ +/*寮瑰嚭鐩稿唽寮濮*/ #photoalbum { -moz-border-radius:10px; -moz-box-shadow:3px 3px 10px 0 #000; @@ -535,11 +573,8 @@ width:100% #photoalbum ul li:hover { border:1px solid #09F } -/*寮瑰嚭鐩稿唽*/ - - - -/*寮瑰嚭鎷嶇収*/ +/*寮瑰嚭鐩稿唽缁撴潫*/ + /*寮瑰嚭鎷嶇収寮濮*/ #CamBox { -moz-border-radius:10px; border-radius:10px; @@ -621,8 +656,8 @@ margin-right: 30px; #CamBox .cambar #CamOk:hover{ background-position: -79px -31px; } -/*寮瑰嚭鎷嶇収*/ -/*搴曢儴*/ +/*寮瑰嚭鎷嶇収缁撴潫*/ +/*搴曢儴寮濮*/ .bottom { width: 1000px; padding-top: 20px; @@ -654,4 +689,4 @@ background-position: -79px -31px; border-radius:30px; -moz-border-radius:30px; } -/*搴曢儴*/ +/*搴曢儴缁撴潫*/ diff --git a/images/border.gif b/images/border.gif new file mode 100644 index 0000000..72ea7cc Binary files /dev/null and b/images/border.gif differ diff --git a/index.html b/index.html index 11bb0bc..49328b4 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ -shearphoto1.4 澶村儚鎴彇宸ュ叿,JS鎴浘 鍒囧浘鎻掍欢锛屽湪绾挎媿鐓ф埅鍥 +shearphoto澶村儚鎴彇宸ュ叿,JS鎴浘 鍒囧浘鎻掍欢锛屽湪绾挎媿鐓ф埅鍥 @@ -14,7 +14,7 @@ - +ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓-->
ShearPhoto瀹樻柟缃戠珯锛歸ww.shearphoto.com @@ -87,6 +87,19 @@
+ + + + + + + + + + + + + @@ -159,7 +172,7 @@

鍋囧锛氳繖鏄竴涓浉鍐--------璇曡瘯鐐瑰嚮鍥剧墖

鎷嶇収 璁剧疆 鍏抽棴 -
+

3
diff --git a/js/ShearPhoto.js b/js/ShearPhoto.js index e4c9470..c1d4772 100644 --- a/js/ShearPhoto.js +++ b/js/ShearPhoto.js @@ -1,4 +1,4 @@ -/*************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* +/*************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* 缁忚繃鏁20澶╃殑寮鍙戯紝shearphoto鐨勭涓涓増鏈粓浜庡畬鎴愶紝 鎴戝紑鍙憇hearphoto鐨勫叏鍥犳槸鍒囧浘锛屾埅鍥捐繖绫籛EB鎻掍欢瀹炲湪澶皯锛屾垜鐗规杩樹笓闂ㄥ湪缃戜笂涓嬭浇杩囧嚑涓叧浜庢埅鍥炬彃浠讹紝 @@ -30,16 +30,16 @@ shearphoto鐨勭敤閫旈潪甯稿箍锛宻hearphoto鎴浘鐏垫晱锛屾媺浼告垨鎷栨嫿鏃堕兘闈 shearphoto鐨勫畼鏂圭綉绔欙細www.shearphoto.com,缃戠珯鏈夊紑鍙戞枃妗ｏ紝浠ュ強shearphoto璁ㄨ鍖猴紝澶у鍙互鍦ㄥ畼缃戣繘琛屼氦娴佸績寰楁垨鑰呭畾鍒跺紑鍙 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併 - shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.5 - 鐗堟湰鍙:shearphoto1.4 + 鐗堟湰鍙:shearphoto1.5 shearphoto瀹樼綉锛歸ww.shearphoto.com shearphoto瀹樻柟QQ缇わ細461550716 2015骞8鏈7鏃 鏄庡摜鍏堢敓 +鏇存柊鎻愮ず锛歴hearphoto1.3鏃跺凡缁忓姞鍏AVA鐗堟湰锛侀渶瑕丣AVA鐨勭敤鎴疯鍒板畼缃戣繘琛屼笅杞姐 - -****************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ +****************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ window.ShearPhoto = function() { this.transform = this.DomMoveEve = this.DomUpEve = this.MoveDivEve = this.zoomEve = this.eveMold = false; @@ -213,7 +213,7 @@ ShearPhoto.prototype = { }, MovePhoto:function() { var ImgDom = this.arg.ImgDom, ImgMain = this.arg.ImgMain, also, scale, ImgMainL, ImgMainT, ImgDomL, ImgDomT; - if (this.BoxW < this.ImgWidth) { + if (this.arg.traverse && this.BoxW < this.ImgWidth) { var MinusImgWBoxW = this.ImgWidth - this.BoxW; also = this.BoxW - this.formAllW; scale = also && MinusImgWBoxW / also; @@ -224,7 +224,7 @@ ShearPhoto.prototype = { ImgMainL = 0; ImgDomL = -this.formLeft - this.Border; } - if (this.BoxH < this.ImgHeight) { + if (this.arg.traverse && this.BoxH < this.ImgHeight) { var MinusImgHBoxH = this.ImgHeight - this.BoxH; also = this.BoxH - this.formAllH; scale = also && MinusImgHBoxH / also; @@ -235,9 +235,11 @@ ShearPhoto.prototype = { ImgMainT = 0; ImgDomT = -this.formTop - this.Border; } - isNaN(ImgMainT) || (ImgMain.style.top = ImgMainT + this.ImgRotateT + "px", this.ImgMainT = ImgMainT), + if (this.arg.traverse) { + isNaN(ImgMainT) || (ImgMain.style.top = ImgMainT + this.ImgRotateT + "px", this.ImgMainT = ImgMainT), + isNaN(ImgMainL) || (ImgMain.style.left = ImgMainL + this.ImgRotateL + "px", this.ImgMainL = ImgMainL); + } isNaN(ImgDomT) || (ImgDom.style.top = ImgDomT + this.ImgRotateT + "px", this.ImgDomT = ImgDomT), - isNaN(ImgMainL) || (ImgMain.style.left = ImgMainL + this.ImgRotateL + "px", this.ImgMainL = ImgMainL), isNaN(ImgDomL) || (ImgDom.style.left = ImgDomL + this.ImgRotateL + "px", this.ImgDomL = ImgDomL); }, AmendOffset:function() { @@ -295,8 +297,8 @@ ShearPhoto.prototype = { this.formH = H - this.Mdouble; } } - this.arg.form.style.width = this.formW + "px"; - this.arg.form.style.height = this.formH + "px"; + this.arg.form.style.width = this.formW + "px", this.arg.form.style.height = this.formH + "px"; + this.ie6(this.formParent, this.formW, this.formH); }, MaxMinLimit:function(this_) { this_.ImgWidth = this_.ImgOWidth = this.width; @@ -321,7 +323,7 @@ ShearPhoto.prototype = { this_.artworkW = this_.ImgWidth, this_.artworkH = this_.ImgHeight; }, run:function(ImgUrl) { - var this_ = this, arg = this.arg,relatImgUrl=arg.relativeUrl+ImgUrl; + var this_ = this, arg = this.arg, relatImgUrl = arg.relativeUrl + ImgUrl; this.pointhandle(0, 10, "鍥剧墖宸插姞杞斤紝姝ｅ湪鍒涘缓鎴浘鐜锛岃绋嶇瓑.......", 2, "#fbeb61", "#3a414c"); var image = new Image(); this.defaultShear(); @@ -329,7 +331,7 @@ ShearPhoto.prototype = { image.onload = function() { if (!this.width > 0 || !this.height > 0) { this_.pointhandle(3e3, 10, "璇烽夋嫨姝ｇ‘鍥剧墖", 0, "#f82373", "#fff"); - return; + return; } arg.ImgMain.src = arg.ImgDom.src = relatImgUrl; this_.pointhandle(3e3, 10, "鍙互鎷栧姩鎴栨媺浼歌摑杈规杩涜鎴浘", 1, "#fbeb61", "#3a414c"); @@ -344,7 +346,6 @@ ShearPhoto.prototype = { this_.BoxH = arg.scope.offsetHeight - 2; this_.Border = arg.Border; this_.Mdouble = arg.Border * 2; - arg.form.style.border = arg.Border + "px" + " " + arg.BorderStyle + " " + arg.BorderColor; var W, H; if (arg.proportional[0]) { W = arg.proportional[1] - this_.Mdouble; @@ -357,7 +358,6 @@ ShearPhoto.prototype = { this_.formH = H; this_.formAllW = W + this_.Mdouble; this_.formAllH = H + this_.Mdouble; - arg.form.style.width = W + "px", arg.form.style.height = H + "px"; this_.formParent = arg.form.offsetParent; this_.et(); this_.setinitial(arg); @@ -406,18 +406,40 @@ ShearPhoto.prototype = { this_.pointhandle(0, 10, "鏃犳硶璇诲彇鍥剧墖銆傝妫娴媓andle.js鐨剅elativeUrl鍙傛暟鏄惁瀛樺湪闂", 0, "#f82373", "#fff"); }; image.src = relatImgUrl; - this.ImgUrl = ImgUrl; + this.ImgUrl = ImgUrl; }, config:function(arg) { - arg.relativeUrl=arg.relativeUrl.replace(/(^\s*)|(\s*$)/g,""); - arg.relativeUrl!=="" && (arg.relativeUrl +="/"); + arg.relativeUrl = arg.relativeUrl.replace(/(^\s*)|(\s*$)/g, ""); + arg.relativeUrl !== "" && (arg.relativeUrl += "/"); this.arg = arg; + arg.Shearbar.style.display = "none"; arg.scope.style.width = arg.black.style.width = arg.SelectBox.style.width = arg.scopeWidth + "px"; arg.scope.style.height = arg.black.style.height = arg.SelectBox.style.height = arg.scopeHeight + "px"; - this.pointhandle(3e3, 10, "璇烽夋嫨鏈湴鐓х墖鎴栫浉鍐岋紝杩涜鎴彇澶村儚", 2, "#307ff6", "#fff"); + var opacityFun; + if (this.transform) opacityFun = function(t, n) { + t.style.opacity = n; + }; else opacityFun = function(t, n) { + t.style.filter = "alpha(opacity=" + n * 100 + ")"; + }; + if (arg.Border > 0) { + arg.DynamicBorder[0].style.display = arg.DynamicBorder[1].style.display = arg.DynamicBorder[2].style.display = arg.DynamicBorder[3].style.display = "none"; + arg.DynamicBorder[0].style.background = arg.DynamicBorder[1].style.background = arg.DynamicBorder[2].style.background = arg.DynamicBorder[3].style.background = "#FFF"; + for (var a in arg.to) { + arg.to[a].style.border = "1px solid" + " " + arg.BorderColor; + arg.to[a].style.background = arg.BorderColor; + opacityFun(arg.to[a], 1); + } + arg.form.style.border = arg.Border + "px" + " " + arg.BorderStyle + " " + arg.BorderColor; + } + arg.black.style.background = arg.backgroundColor; + opacityFun(arg.black, arg.backgroundOpacity); arg.scope.ondragstart = function() { return false; }; + if (navigator.userAgent.indexOf("MSIE 6.0") > 0 && arg.Border === 0) this.ie6 = function(a, b, c) { + a.style.width = b + 1 + "px", a.style.height = c + 1 + "px"; + }; else this.ie6 = function() {}; + this.pointhandle(3e3, 10, "璇烽夋嫨鏈湴鐓х墖鎴栫浉鍐岋紝杩涜鎴彇澶村儚", 2, "#307ff6", "#fff"); }, zoom:function() { var this_ = this; @@ -592,12 +614,12 @@ ShearPhoto.prototype = { var L = iW - this.formAllW, T = iH - this.formAllH, Left, Top, ImgLeft, ImgTop, this_ = this; var fun = { LL:function() { - Left = this_.formLeft - L; + Left = parseFloat(this_.formLeft - L); this_.formLeft = Left; formParent.style.left = Left + "px"; }, TT:function() { - Top = this_.formTop - T; + Top = parseFloat(this_.formTop - T); this_.formTop = Top; formParent.style.top = Top + "px"; }, @@ -646,8 +668,8 @@ ShearPhoto.prototype = { this_.formAllH = iH; iW = this_.formW = iW - this_.Mdouble; iH = this_.formH = iH - this_.Mdouble; - argform.style.width = iW + "px"; - argform.style.height = iH + "px"; + argform.style.width = iW + "px", argform.style.height = iH + "px"; + this_.ie6(formParent, iW, iH); this_.MovePhoto(); }, 1); return false; @@ -672,10 +694,11 @@ ShearPhoto.prototype = { again:function() { this.arg.SelectBox.style.visibility = "visible"; this.arg.Shearbar.style.display = "none"; - this.arg.ImgDom.src = this.arg.ImgMain.src = this.arg.relativeUrl+"images/default.gif"; + this.arg.ImgDom.src = this.arg.ImgMain.src = this.arg.relativeUrl + "images/default.gif"; }, - complete:function(serverdata) {//鎴浘瀹屾垚锛宻hearphoto.php杩斿洖鏁版嵁杩囨潵 - //alert(serverdata);浣犲彲浠ヨ皟璇曚竴涓繖涓繑鍥炲寘 + complete:function(serverdata) { + //鎴浘鎴愬姛瀹屾垚鏃讹紝鐢眘hearphoto.php杩斿洖鏁版嵁杩囨潵鐨勫寘 + // alert(serverdata);//浣犲彲浠ヨ皟璇曚竴涓嬭繖涓繑鍥炲寘 var point = this.arg.scope.childNodes[0]; point.className === "point" && this.arg.scope.removeChild(point); var complete = document.createElement("div"); @@ -684,7 +707,7 @@ ShearPhoto.prototype = { this.arg.scope.insertBefore(complete, this.arg.scope.childNodes[0]); var AllImgSrc = ""; var length = serverdata.length; - for (var i = 0; i < length; i++) AllImgSrc += ''; + for (var i = 0; i < length; i++) AllImgSrc += ''; complete.innerHTML = AllImgSrc + '
鎭枩浣狅紒鎴浘鎴愬姛

浠ヤ笂鏄綘鍥剧墖鐨' + length + '绉嶅昂瀵

瀹屾垚
'; var completeA = document.getElementById("completeA"); var this_ = this; @@ -695,7 +718,8 @@ ShearPhoto.prototype = { this_.pointhandle(3e3, 10, "鎴浘瀹屾垚锛佸凡杩斿洖锛", 2, "#fbeb61", "#3a414c"); }); }, - SendPHP:function(postArgs) {//鍙戦佸潗鏍囨暟鎹粰PHP + SendPHP:function(postArgs) { + //鍙戦佸潗鏍囨暟鎹粰PHP var POSTHTML = ""; var SendPHPSmaller = function(W, H, P) { if (W < 1) { @@ -753,7 +777,8 @@ ShearPhoto.prototype = { async:true, lock:true, complete:false, - success:function(serverdata) { + success:function(serverdata) { //涓巗hearphoto.php鍚庣閫氳锛 + //alert(serverdata)//浣犲彲浠ヨ皟璇曚竴涓嬭繖涓寘 serverdata = ShearPhoto.JsonString.StringToJson(serverdata); if (serverdata === false) { this_.SendUserMsg("閿欒:璇蜂繚璇佸悗绔幆澧冭繍琛屾甯", 5e3, 0, "#f4102b", "#fff", false); @@ -763,7 +788,7 @@ ShearPhoto.prototype = { this_.SendUserMsg("閿欒:" + serverdata["erro"], 5e3, 0, "#f4102b", "#fff", false); return; } - this_.complete(serverdata); + this_.complete(serverdata);//娌℃湁閿欒鏃讹紝鎵ц鎴愬姛鍑芥暟 }, error:function(ErroMsg) { this_.SendUserMsg("閿欒:杩炴帴鍚庣澶辫触锛屽彲鑳藉師鍥狅紝瓒呮椂锛佹垨鑰呭悗绔幆澧冩棤娉曡繍琛", 5e3, 0, "#f4102b", "#fff", false); diff --git a/js/UpImg.js b/js/UpImg.js index b0303fe..b442f6e 100644 --- a/js/UpImg.js +++ b/js/UpImg.js @@ -1,4 +1,4 @@ -/*************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* +/*************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* 缁忚繃鏁20澶╃殑寮鍙戯紝shearphoto鐨勭涓涓増鏈粓浜庡畬鎴愶紝 鎴戝紑鍙憇hearphoto鐨勫叏鍥犳槸鍒囧浘锛屾埅鍥捐繖绫籛EB鎻掍欢瀹炲湪澶皯锛屾垜鐗规杩樹笓闂ㄥ湪缃戜笂涓嬭浇杩囧嚑涓叧浜庢埅鍥炬彃浠讹紝 @@ -30,16 +30,16 @@ shearphoto鐨勭敤閫旈潪甯稿箍锛宻hearphoto鎴浘鐏垫晱锛屾媺浼告垨鎷栨嫿鏃堕兘闈 shearphoto鐨勫畼鏂圭綉绔欙細www.shearphoto.com,缃戠珯鏈夊紑鍙戞枃妗ｏ紝浠ュ強shearphoto璁ㄨ鍖猴紝澶у鍙互鍦ㄥ畼缃戣繘琛屼氦娴佸績寰楁垨鑰呭畾鍒跺紑鍙 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併 - shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.5 - 鐗堟湰鍙:shearphoto1.4 + 鐗堟湰鍙:shearphoto1.5 shearphoto瀹樼綉锛歸ww.shearphoto.com shearphoto瀹樻柟QQ缇わ細461550716 2015骞8鏈7鏃 鏄庡摜鍏堢敓 +鏇存柊鎻愮ず锛歴hearphoto1.3鏃跺凡缁忓姞鍏AVA鐗堟湰锛侀渶瑕丣AVA鐨勭敤鎴疯鍒板畼缃戣繘琛屼笅杞姐 - -****************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ +****************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ ShearPhoto.frameUpImg = function(config) { this.BodyDom = document.body; diff --git a/js/handle.js b/js/handle.js index 72f98c2..7118230 100644 --- a/js/handle.js +++ b/js/handle.js @@ -1,4 +1,4 @@ -/*************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* +/*************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* 缁忚繃鏁20澶╃殑寮鍙戯紝shearphoto鐨勭涓涓増鏈粓浜庡畬鎴愶紝 鎴戝紑鍙憇hearphoto鐨勫叏鍥犳槸鍒囧浘锛屾埅鍥捐繖绫籛EB鎻掍欢瀹炲湪澶皯锛屾垜鐗规杩樹笓闂ㄥ湪缃戜笂涓嬭浇杩囧嚑涓叧浜庢埅鍥炬彃浠讹紝 @@ -30,16 +30,16 @@ shearphoto鐨勭敤閫旈潪甯稿箍锛宻hearphoto鎴浘鐏垫晱锛屾媺浼告垨鎷栨嫿鏃堕兘闈 shearphoto鐨勫畼鏂圭綉绔欙細www.shearphoto.com,缃戠珯鏈夊紑鍙戞枃妗ｏ紝浠ュ強shearphoto璁ㄨ鍖猴紝澶у鍙互鍦ㄥ畼缃戣繘琛屼氦娴佸績寰楁垨鑰呭畾鍒跺紑鍙 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併 - shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.5 - 鐗堟湰鍙:shearphoto1.4 + 鐗堟湰鍙:shearphoto1.5 shearphoto瀹樼綉锛歸ww.shearphoto.com shearphoto瀹樻柟QQ缇わ細461550716 2015骞8鏈7鏃 鏄庡摜鍏堢敓 +鏇存柊鎻愮ず锛歴hearphoto1.3鏃跺凡缁忓姞鍏AVA鐗堟湰锛侀渶瑕丣AVA鐨勭敤鎴疯鍒板畼缃戣繘琛屼笅杞姐 - -****************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ +****************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ ShearPhoto.MINGGE(function() { var publicRelat= document.getElementById("relat"); //"relat"瀵瑰儚 var publicRelatImg=publicRelat.getElementsByTagName("img"); //"relat"涓嬬殑涓ゅ紶鍥剧墖瀵瑰儚 @@ -51,7 +51,7 @@ ShearPhoto.MINGGE(function() { //鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堥噸瑕佽缃枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅 /* - relativeUrl鏈夊繀瑕佽缁嗚涓涓嬶紝杩欐槸1.4鏂板姞鍏ョ殑API + relativeUrl鏈夊繀瑕佽缁嗚涓涓嬶紝杩欐槸1.5鏂板姞鍏ョ殑API 鐩稿璺緞璁剧疆(鍚庨潰涓嶈鏈夋枩鏉)锛 褰搃ndex.html浣嶇疆鍙樺姩鏃讹紝瑕佸～鍏ユ鍊硷紝鍚﹀垯浼氭姳鍑哄浘鐗囨棤娉曡鍙栫殑鎯呭喌锛屽鏋渋ndex.html浣嶇疆涓嶅彉锛屼綘涓虹┖灏卞彲浠ャ備笓闂ㄤ负TP鍜孻II绛夋鏋惰屽姞鍏ョ殑 ---------------------------------------------------------------------------------------------------------------------- @@ -65,25 +65,28 @@ ShearPhoto.MINGGE(function() { ----------------------------------------------------------------------------- 绀轰緥2锛氬亣濡傦細index.htm 浣嶄簬 http://xxx.com/abc/shearphot/def/index.html shearphoto/file 鍒欎綅浜 http://xxx.com/abc/shearphoto/file - 閭ｄ箞relativeUrl灏辫鍐欐垚 relativeUrl:"../" + 閭ｄ箞relativeUrl灏辫鍐欐垚 relativeUrl:".." ----------------------------------------------------------------------------- index.html浣嶇疆鍙樺姩鍚庯紝璁板緱杩樿鎵嬪姩鎶 閫夋嫨鍥剧墖锛岀浉鍐岋紝鎷嶇収鐨勫悗绔鐞嗗湴鍧涔熸敼涓涓嬬浉瀵硅矾寰勫摝锛岃涓嶇劧鎶ラ敊鍙堥棶涓轰粈涔堜簡锛屽洜涓簉elativeUrl涓嶄綔鐢ㄤ簬浣犵殑鍚庣澶勭悊鍦板潃 relativeUrl鐨勮缃瘮杈冮噸瑕侊紝 琛ㄨ揪鑳藉姏鏈夐檺锛屽鏋滀笉鎳傦紝璇峰埌瀹樼綉璁哄潧 QQ缇ゅ悜浣滆呰祫璇 */ + traverse:true,//鏄惁鍦ㄦ嫋鍔ㄦ媺浼告椂鑳藉巻閬嶅叏鍥撅紝鍙塼rue false, url:"php/shearphoto.php",//鍚庣澶勭悊鍦板潃锛屼繚璇佹纭摝锛岃繖鏄父璇嗭紝杩炶繖涓湴鍧閮借兘鍐欓敊锛屼綘灏辨槸鑿淏 scopeWidth:500, //鍙嫋鍔ㄨ寖鍥村 涔熷氨鏄"main"瀵硅薄鐨勫垵濮嬪ぇ灏 scopeHeight:500, //鍙嫋鍔ㄨ寖鍥撮珮 涔熷氨鏄"main"瀵硅薄鐨勫垵濮嬪ぇ灏 - relat:publicRelat, //璇锋煡鐪 id:"relat"瀵硅薄 proportional:[3/4, 100, //鍚姩鍚庣殑鎴鍒濆瀹藉害 133.33333 //姣斾緥璁剧疆鍚庯紝杩欎釜楂樺害鏃犳晥锛岀敱瀹藉拰姣斾緥鏉ュ喅瀹 ], Min:50, //鎴鎷変几鎴栨嫋鎷戒笉鑳藉皯浜庡灏慞X Max:500, //涓寮濮嬪惎鍔ㄦ椂锛屽浘鐗囩殑瀹藉拰楂橈紝鏈夋椂鍊欏浘鐗囦細寰堝ぇ鐨勶紝蹇呴』瑕佽缃竴涓 - Border:1, //鎴鐨勮竟妗嗗ぇ灏 - BorderStyle:"solid", //鎴鐨勮竟妗嗙被鍨嬶紝鍏跺疄鏄紩鍏SS鐨刡order灞炴э紝鍜屽叆CSS鐨刡order灞炴ф槸涓鏍风殑 - BorderColor:"#04B7FB", //鎴鐨勮竟妗嗚壊褰 - /*---------------鐢ㄦ埛璁剧疆閮ㄤ唤缁撴潫-----------------------------------------------------------------------*/ + backgroundColor:"#000", //閬眰鑹 + backgroundOpacity:0.6, //閬眰閫忔槑搴-鏁板瓧0-1 鍙 + Border:0, //鎴鐨勮竟妗嗗ぇ灏 0浠ｈ〃鍔ㄦ佽竟妗嗐傚ぇ浜1琛ㄧず闈欐佽竟妗嗭紝澶т簬1鏃朵篃浠ｈ〃闈欐佽竟妗嗙殑绮楃粏鍊 + BorderStyle:"solid", //鍙綔鐢ㄤ簬闈欐佽竟妗嗭紝鎴鐨勮竟妗嗙被鍨嬶紝鍏跺疄鏄紩鍏SS鐨刡order灞炴э紝鍜屽叆CSS鐨刡order灞炴ф槸涓鏍风殑 + BorderColor:"#09F", //鍙綔鐢ㄤ簬闈欐佽竟妗嗭紝鎴鐨勮竟妗嗚壊褰 + /*---------------鐢ㄦ埛璁剧疆鎴浘鍔熻兘閮ㄤ唤缁撴潫-----------------------------------------------------------------------*/ + relat:publicRelat, //璇锋煡鐪 id:"relat"瀵硅薄 scope:document.getElementById("main"),//main鑼冨洿瀵硅薄 ImgDom:publicRelatImg[0], //鎴浘鍥剧墖瀵硅薄锛堝皬锛 ImgMain:publicRelatImg[1], //鎴浘鍥剧墖瀵硅薄锛堝ぇ锛 @@ -101,6 +104,7 @@ ShearPhoto.MINGGE(function() { Rightmiddle:document.getElementById("Rightmiddle"), Bottommiddle:document.getElementById("Bottommiddle") }, + DynamicBorder:[document.getElementById("borderTop"),document.getElementById("borderLeft"),document.getElementById("borderRight"),document.getElementById("borderBottom")], SelectBox:document.getElementById("SelectBox"), //閫夋嫨鍥剧墖鏂瑰紡鐨勫璞 Shearbar:document.getElementById("Shearbar"), //鎴浘宸ュ叿鏉″璞 UpFun:function() { //榧犳爣鍋ユ澗寮鏃舵墽琛屽嚱鏁 @@ -127,7 +131,7 @@ var up = new ShearPhoto.frameUpImg({ }); up.run(function(data) {//upload.php鎴愬姛杩斿洖鏁版嵁鍚 - //alert(data);浣犲彲浠ヨ皟璇曚竴涓繖涓繑鍥炲寘 + //alert(data);浣犲彲浠ヨ皟璇曚竴涓嬭繖涓繑鍥炲寘 data = ShearPhoto.JsonString.StringToJson(data); if (data === false) { Shear.SendUserMsg("閿欒:璇蜂繚璇佸悗绔幆澧冭繍琛屾甯", 5e3, 0, "#f4102b", "#fff", true,true); @@ -223,7 +227,7 @@ camerasImage.onclick=camerasImageOnclick; webcam.set_hook("onComplete", function(data) {//鎷嶇収鏈嶅姟鍣ㄨ繑鍥炴暟鎹簨浠 - //alert(data);浣犲彲浠ヨ皟璇曚竴涓繖涓繑鍥炲寘 + //alert(data);浣犲彲浠ヨ皟璇曚竴涓嬭繖涓繑鍥炲寘 camClose.onclick(); data = ShearPhoto.JsonString.StringToJson(data); if (data === false) { diff --git a/js/move.js b/js/move.js index 565cca4..8d4a895 100644 --- a/js/move.js +++ b/js/move.js @@ -1,4 +1,4 @@ -/*************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* +/*************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* 缁忚繃鏁20澶╃殑寮鍙戯紝shearphoto鐨勭涓涓増鏈粓浜庡畬鎴愶紝 鎴戝紑鍙憇hearphoto鐨勫叏鍥犳槸鍒囧浘锛屾埅鍥捐繖绫籛EB鎻掍欢瀹炲湪澶皯锛屾垜鐗规杩樹笓闂ㄥ湪缃戜笂涓嬭浇杩囧嚑涓叧浜庢埅鍥炬彃浠讹紝 @@ -30,16 +30,16 @@ shearphoto鐨勭敤閫旈潪甯稿箍锛宻hearphoto鎴浘鐏垫晱锛屾媺浼告垨鎷栨嫿鏃堕兘闈 shearphoto鐨勫畼鏂圭綉绔欙細www.shearphoto.com,缃戠珯鏈夊紑鍙戞枃妗ｏ紝浠ュ強shearphoto璁ㄨ鍖猴紝澶у鍙互鍦ㄥ畼缃戣繘琛屼氦娴佸績寰楁垨鑰呭畾鍒跺紑鍙 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併 - shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.5 - 鐗堟湰鍙:shearphoto1.4 + 鐗堟湰鍙:shearphoto1.5 shearphoto瀹樼綉锛歸ww.shearphoto.com shearphoto瀹樻柟QQ缇わ細461550716 2015骞8鏈7鏃 鏄庡摜鍏堢敓 +鏇存柊鎻愮ず锛歴hearphoto1.3鏃跺凡缁忓姞鍏AVA鐗堟湰锛侀渶瑕丣AVA鐨勭敤鎴疯鍒板畼缃戣繘琛屼笅杞姐 - -****************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ +****************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ ShearPhoto.MoveDiv = function() { this.arg = new Array(), this.ReckonWH = this.DivW = this.DivH = this.selectionempty = this.addevent = this.DivDownEVe = this.DomMoveEve = this.DomUpEve = this.eveMold = false; @@ -153,7 +153,7 @@ ShearPhoto.MoveDiv.prototype = { MoveScale = [ maxL, maxT ]; return function(eve) { eve = eve || window.event; - if (eve.button > 1) { + if (eve.button > 1) { this_.DomUp(this)(); return false; } @@ -177,7 +177,7 @@ ShearPhoto.MoveDiv.prototype = { return function(event) { var event = event || window.event, eventbutton = event.button, typebutton = typeof eventbutton, clientX, clientY; event.preventDefault && event.preventDefault(); - if (typebutton !== "number") { + if (typebutton !== "number") { this_.eveMold = [ "touchstart", "touchmove", "touchend", function(events, clientXY) { return events.touches[0][clientXY]; } ]; diff --git a/js/processdata.js b/js/processdata.js index 5430d5e..857a52e 100644 --- a/js/processdata.js +++ b/js/processdata.js @@ -1,4 +1,4 @@ -/*************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* +/*************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* 缁忚繃鏁20澶╃殑寮鍙戯紝shearphoto鐨勭涓涓増鏈粓浜庡畬鎴愶紝 鎴戝紑鍙憇hearphoto鐨勫叏鍥犳槸鍒囧浘锛屾埅鍥捐繖绫籛EB鎻掍欢瀹炲湪澶皯锛屾垜鐗规杩樹笓闂ㄥ湪缃戜笂涓嬭浇杩囧嚑涓叧浜庢埅鍥炬彃浠讹紝 @@ -30,16 +30,17 @@ shearphoto鐨勭敤閫旈潪甯稿箍锛宻hearphoto鎴浘鐏垫晱锛屾媺浼告垨鎷栨嫿鏃堕兘闈 shearphoto鐨勫畼鏂圭綉绔欙細www.shearphoto.com,缃戠珯鏈夊紑鍙戞枃妗ｏ紝浠ュ強shearphoto璁ㄨ鍖猴紝澶у鍙互鍦ㄥ畼缃戣繘琛屼氦娴佸績寰楁垨鑰呭畾鍒跺紑鍙 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併 - shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.5 - 鐗堟湰鍙:shearphoto1.4 + 鐗堟湰鍙:shearphoto1.5 shearphoto瀹樼綉锛歸ww.shearphoto.com shearphoto瀹樻柟QQ缇わ細461550716 2015骞8鏈7鏃 鏄庡摜鍏堢敓 +鏇存柊鎻愮ず锛歴hearphoto1.3鏃跺凡缁忓姞鍏AVA鐗堟湰锛侀渶瑕丣AVA鐨勭敤鎴疯鍒板畼缃戣繘琛屼笅杞姐 -****************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ +****************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ ShearPhoto.JsonString = { _json_:null, @@ -73,6 +74,8 @@ ShearPhoto.JsonString = { return array; }catch (e){ + alert("涓ラ噸鎶ラ敊锛氬悗绔病杩斿洖鍒癑SON锛岃屾槸涓涓叉棤鏁堝瓧绗︿覆銆俓n\n浣犳槸鍦ㄨ皟璇曞悧锛焅n\n閭ｄ箞鎸夌‘瀹氾紝鏌ョ湅閭ｄ覆鏃犳晥瀛楃涓插惂"); + alert(arrtxt);/*杩斿洖涓涓敊璇俊鎭紝alert缁欓笩鍎跨湅锛岃楦熷効涓鐩簡鐒舵槸浠涔堥敊璇紝鏈夌殑楦熷効瀹炲湪澶彍浜嗭紝闈炶杩欐牱鎵嶇湅寰楁槑鐧斤紝鏄庡摜鍏堢敓鎰熷埌楦ⅷ濂藉ぇ*/ return false; } }, diff --git a/js/webcam_ShearPhoto.js b/js/webcam_ShearPhoto.js index 4f84c0d..bbfa323 100644 --- a/js/webcam_ShearPhoto.js +++ b/js/webcam_ShearPhoto.js @@ -1,5 +1,5 @@ //鎷嶇収FLASH鐨凙S鑴氭湰宸插叏閮ㄩ噸鍐欙紝杩欐槸鎽勮薄澶存媿鐓х殑JS鎺ュ彛锛屾劅璋㈢綉鍙嬧淩OC鈥濆杩欎釜鎷嶇収FLASH鎻愪緵寮鍙戝府鍔 -/*************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* +/*************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓********* 缁忚繃鏁20澶╃殑寮鍙戯紝shearphoto鐨勭涓涓増鏈粓浜庡畬鎴愶紝 鎴戝紑鍙憇hearphoto鐨勫叏鍥犳槸鍒囧浘锛屾埅鍥捐繖绫籛EB鎻掍欢瀹炲湪澶皯锛屾垜鐗规杩樹笓闂ㄥ湪缃戜笂涓嬭浇杩囧嚑涓叧浜庢埅鍥炬彃浠讹紝 @@ -31,17 +31,18 @@ shearphoto鐨勭敤閫旈潪甯稿箍锛宻hearphoto鎴浘鐏垫晱锛屾媺浼告垨鎷栨嫿鏃堕兘闈 shearphoto鐨勫畼鏂圭綉绔欙細www.shearphoto.com,缃戠珯鏈夊紑鍙戞枃妗ｏ紝浠ュ強shearphoto璁ㄨ鍖猴紝澶у鍙互鍦ㄥ畼缃戣繘琛屼氦娴佸績寰楁垨鑰呭畾鍒跺紑鍙 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併 - shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歴hearphoto1.5 - 鐗堟湰鍙:shearphoto1.4 + 鐗堟湰鍙:shearphoto1.5 shearphoto瀹樼綉锛歸ww.shearphoto.com shearphoto瀹樻柟QQ缇わ細461550716 2015骞8鏈7鏃 鏄庡摜鍏堢敓 +鏇存柊鎻愮ず锛歴hearphoto1.3鏃跺凡缁忓姞鍏AVA鐗堟湰锛侀渶瑕丣AVA鐨勭敤鎴疯鍒板畼缃戣繘琛屼笅 -****************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ +****************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓*******/ window.webcam = { - version:"shearphoto1.4", + version:"shearphoto1.5", // globals ie:!!navigator.userAgent.match(/MSIE/), protocol:location.protocol.match(/https/i) ? "https" :"http", @@ -109,7 +110,7 @@ window.webcam = { if (this.ie) { html += ''; } else { - html += ''; + html += ''; } this.loaded = false; return html; diff --git a/php/shearphoto.config.php b/php/shearphoto.config.php index 5f7028a..3645060 100644 --- a/php/shearphoto.config.php +++ b/php/shearphoto.config.php @@ -8,14 +8,14 @@ array(150,true),//@鍙傛暟1瑕佺敓鎴愮殑瀹 锛堥珮搴︿笉鐢ㄨ锛岀郴缁熶細鎸夋瘮渚嬪仛浜嬶級锛 @鍙傛暟2锛氭槸鍚︿负璇ュ浘鍔犳按鍗帮紝water鍙傛暟瑕佹湁姘村嵃鍦板潃鎵嶆湁鏁坱rue鎴杅alse array(100,true),//@鍙傛暟1瑕佺敓鎴愮殑瀹 锛堥珮搴︿笉鐢ㄨ锛岀郴缁熶細鎸夋瘮渚嬪仛浜嬶級锛 @鍙傛暟2锛氭槸鍚︿负璇ュ浘鍔犳按鍗帮紝water鍙傛暟瑕佹湁姘村嵃鍦板潃鎵嶆湁鏁坱rue鎴杅alse array(70,true)),//浣犲彲浠ョ户缁鍔犲寮犵収鐗 -"water"=>"../images/waterimg2.png",//鍙帴鍙桺NG姘村嵃锛屽綋鐒朵綘瀵筆HP鐔熺粌锛屼綘鍙互瀵逛富绋嬪簭杩涜淇敼 +"water"=>"../images/waterimg2.png",//鍙帴鍙桺NG姘村嵃锛屽綋鐒朵綘瀵筆HP鐔熺粌锛屼綘鍙互瀵逛富绋嬪簭杩涜淇敼鏀寔鍏朵粬绫诲瀷姘村嵃,涓嶈灏"water"=>flase "water_scope"=>100, //鍥剧墖灏戜簬澶氬皯涓嶆坊鍔犳按鍗帮紒娌″～姘村嵃鍦板潃锛岃繖閲屼笉璧蜂换浣曚綔鐢 "temp"=>ShearURL."file".DIRECTORY_SEPARATOR."temp", //绛夊緟鎴浘鐨勫ぇ鍥炬枃浠躲傚氨鏄笂浼犲浘鐗囩殑涓存椂鐩綍锛屾埅鍥惧悗锛屽浘鐗囦細琚垹闄 "tempSaveTime"=>600,//涓存椂鍥剧墖锛堜篃灏辨槸temp鍐呯殑鍥剧墖锛変繚瀛樻椂闂达紝闇瑕佹案涔呬繚瀛樿璁句负0銆傚崟浣嶇 "saveURL"=>ShearURL."file".DIRECTORY_SEPARATOR."shearphoto_file",//鍚庨潰涓嶈鍔犳枩鏉狅紝绯荤粺浼氳嚜鍔ㄧ粰琛ヤ笂锛佷笉瑕佷娇鐢ㄤ腑鏂 "filename"=>uniqid("shearphoto_")."_".mt_rand(100,999)."_"//鏂囦欢鍚嶅瓧瀹氫箟锛佽鐢熸垚澶氫釜鏂囦欢鏃 绯荤粺浼氳嚜鍔ㄥ湪鍚庨潰琛0 1 2 3.....; ); -/*************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓,瀹岀編鍏煎linux鍜學INDOW鏈嶅姟鍣********* +/*************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓,瀹岀編鍏煎linux鍜學INDOW鏈嶅姟鍣********* 缁忚繃鏁20澶╃殑寮鍙戯紝shearphoto鐨勭涓涓増鏈粓浜庡畬鎴愶紝 鎴戝紑鍙憇hearphoto鐨勫叏鍥犳槸鍒囧浘锛屾埅鍥捐繖绫籛EB鎻掍欢瀹炲湪澶皯锛屾垜鐗规杩樹笓闂ㄥ湪缃戜笂涓嬭浇杩囧嚑涓叧浜庢埅鍥炬彃浠讹紝 @@ -47,14 +47,14 @@ shearphoto鐨勫畼鏂圭綉绔欙細www.shearphoto.com,缃戠珯鏈夊紑鍙戞枃妗ｏ紝浠ュ強shearphoto璁ㄨ鍖猴紝澶у鍙互鍦ㄥ畼缃戣繘琛屼氦娴佸績寰楁垨鑰呭畾鍒跺紑鍙 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併 - shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歋hearPhoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛宻hearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛歋hearPhoto1.5 - 鐗堟湰鍙:ShearPhoto1.4 + 鐗堟湰鍙:ShearPhoto1.5 shearphoto瀹樼綉锛歸ww.shearphoto.com shearphoto瀹樻柟QQ缇わ細461550716 2015骞8鏈7鏃 鏄庡摜鍏堢敓 +鏇存柊鎻愮ず锛歴hearphoto1.3鏃跺凡缁忓姞鍏AVA鐗堟湰锛侀渶瑕丣AVA鐨勭敤鎴疯鍒板畼缃戣繘琛屼笅杞姐 - -****************ShearPhoto1.4 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓,瀹岀編鍏煎linux鍜學INDOW鏈嶅姟鍣*******/ +****************ShearPhoto1.5 鍏嶈垂锛屽紑婧愶紝鍏煎鐩墠鎵鏈夋祻瑙堝櫒锛岀函鍘熺敓JS鍜孭HP缂栧啓,瀹岀編鍏煎linux鍜學INDOW鏈嶅姟鍣*******/ ?> \ No newline at end of file diff --git a/php/shearphoto.php b/php/shearphoto.php index ee44c46..a55cc33 100644 --- a/php/shearphoto.php +++ b/php/shearphoto.php @@ -1,5 +1,5 @@ rotate($src, $JSconfig["R"]); - - - $dest = imagecreatetruecolor($JSconfig["IW"], $JSconfig["IH"]); + $dest = imagecreatetruecolor($JSconfig["IW"], $JSconfig["IH"]); imagecopy($dest, $src, 0, 0, $JSconfig["X"], $JSconfig["Y"], $w, $h); - imagedestroy($src); - return $this->compression($dest, $PHPconfig, $JSconfig["IW"], $JSconfig["IH"], $type, $strtype, $JSconfig); + imagedestroy($src); + return $this->compression($dest, $PHPconfig, $JSconfig, $type, $strtype); } protected function CreateArray($PHPconfig, $JSconfig, $strtype) { $arr = array(); @@ -158,11 +157,8 @@ protected function CreateArray($PHPconfig, $JSconfig, $strtype) { $proportion = $JSconfig["IW"] / $JSconfig["IH"]; } - if (isset($PHPconfig["water"]) && $PHPconfig["water"] && file_exists($PHPconfig["water"])) { - $water_or = true; - }else{ - $water_or=false; - } + $water_or = isset($PHPconfig["water"]) && $PHPconfig["water"] && file_exists($PHPconfig["water"]); + if(!file_exists($PHPconfig["saveURL"])) if(!mkdir($PHPconfig["saveURL"],0777,true)){ $this->erro = "鐩綍鏉冮檺鏈夐棶棰"; @@ -173,29 +169,29 @@ protected function CreateArray($PHPconfig, $JSconfig, $strtype) { $height = $v[0] / $proportion; $strtype == ".jpeg" and $strtype = ".jpg"; $file_url = $PHPconfig["saveURL"] .DIRECTORY_SEPARATOR. $PHPconfig["filename"] . $k . $strtype; - $water = ($v[1] === true && $water_or === true) ? true : false; $arr[$k] = array( $v[0], $height, $file_url, - $water + ($v[1] === true and $water_or === true and $v[0] > $PHPconfig["water_scope"] and $height > $PHPconfig["water_scope"]) ); } - return $arr; + return array($water_or,$arr); } - protected function compression($DigShear,$PHPconfig, $w, $h, $type, $strtype, $JSconfig) { + protected function compression($DigShear,$PHPconfig, $JSconfig, $type, $strtype) { require 'zip_img.php'; $arrimg=$this->CreateArray($PHPconfig, $JSconfig, $strtype); - if(!$arrimg) return false; - $zip_photo = new zip_img(array( + if(!$arrimg[1]) return false; + $arrimg[0] and $arrimg[0]= $PHPconfig["water"]; + $zip_photo = new zip_img(array( "dest" => $DigShear, - "water" => $PHPconfig["water"], + "water" => $arrimg[0], "water_scope" => $PHPconfig["water_scope"], - "w" => $w, - "h" => $h, + "w" => $JSconfig["IW"], + "h" => $JSconfig["IH"], "type" => $type, "strtype" => $strtype, - "zip_array" => $arrimg + "zip_array" => $arrimg[1] )); return $zip_photo->run(); } @@ -205,16 +201,14 @@ protected function compression($DigShear,$PHPconfig, $w, $h, $type, $strtype, $J $Shear =new ShearPhoto;//绫诲疄渚嬪紑濮 $result = $Shear->run($ShearPhoto["JSdate"],$ShearPhoto["config"]);//浼犲叆鍙傛暟杩愯 if($result===false){ //鍒囧浘澶辫触鏃 - echo '{"erro":"'.$Shear->erro.'"}'; //鎶婇敊璇彂缁橨S /璇峰寙闅忔剰鏇存敼"erro"鐨勭紪鍐欐柟寮忥紝鍚﹀垯JS鍑洪敊 + echo '{"erro":"'.$Shear->erro.'"}'; //鎶婇敊璇彂缁橨S /璇峰寙闅忔剰鏇存敼"erro"鐨勭紪鍐欐柟寮忥紝鍚﹀垯JS鍑洪敊 } else //鍒囧浘鎴愬姛鏃 { $dirname=pathinfo($ShearPhoto["JSdate"]["url"]); $ShearPhotodirname=$dirname["dirname"].DIRECTORY_SEPARATOR."shearphoto.lock";//璁よ瘉鍒犻櫎鐨勫瘑閽 file_exists($ShearPhotodirname) && @unlink($ShearPhoto["JSdate"]["url"]);//瀵嗛挜瀛樺湪锛屽綋鐒跺氨鍒犳帀鍘熷浘 - $result = json_encode($result); - echo str_replace(array("\\\\","\/",ShearURL,"\\"),array("\\","/","","/"),$result);//鍘绘帀鏃犵敤鐨勫瓧绗︿慨姝RL鍦板潃锛屽啀鎶婃暟鎹紶寮熺粰JS - /* + /* 鍒版绋嬪簭宸茶繍琛屽畬姣曪紝骞舵垚鍔燂紒浣犲彲浠ュ湪杩欓噷鎰夊揩鍦板啓涓嬩綘鐨勯昏緫浠ｇ爜 $result[X]["ImgUrl"] //鍥剧墖璺緞 X鏄暟瀛 $result[X]["ImgName"] //鍥剧墖鏂囦欢鍚嶅瓧 X鏄暟瀛 @@ -222,6 +216,8 @@ protected function compression($DigShear,$PHPconfig, $w, $h, $type, $strtype, $J $result[X]["ImgHeight"] //鍥剧墖楂樺害 X鏄暟瀛 鐢╲ar_dump($result)灞曞紑锛屼綘渚夸竴鐩簡鐒讹紒 */ - //ShearPhoto 浣滆:鏄庡摜鍏堢敓 QQ399195513 - } + //ShearPhoto 浣滆:鏄庡摜鍏堢敓 QQ399195513 + $str_result = json_encode($result); + echo str_replace( "\/","/",$str_result);//鍘绘帀鏃犵敤鐨勫瓧绗︿慨姝RL鍦板潃锛屽啀鎶婃暟鎹紶寮熺粰JS + } ?> \ No newline at end of file diff --git a/php/upload.php b/php/upload.php index a92e549..ce3ca0e 100644 --- a/php/upload.php +++ b/php/upload.php @@ -1,5 +1,5 @@ 2 * 1024 * 1024, //鏂囦欢澶у皬闄愬埗璁剧疆 M鍗曚綅 @@ -55,15 +57,9 @@ ); /*璁剧疆閮ㄤ唤缁撴潫*/ ini_set('max_execution_time', $ini_set['out_time']); -function errobug() { - $e = error_get_last(); - $e['type'] > 0 and $e['type'] != 8 and HandleError(); -} function HandleError($erro = '绯荤粺閿欒') { die('{"erro":"'.$erro.'"}'); } -register_shutdown_function('errobug'); //娉ㄥ唽FUNCTION,鎺ユ敹绯荤粺鑷村懡閿欒 -error_reporting(0); //鍏抽棴閿欒鎻愮ず if (!isset($_FILES['UpFile'])) { HandleError(); } @@ -108,11 +104,12 @@ function HandleError($erro = '绯荤粺閿欒') { file_exists($ini_set['list']) or @mkdir($ini_set['list'], 511,true); if (!move_uploaded_file($_FILES['UpFile']['tmp_name'], $UpFile['file_url'])) { - HandleError('鏂囦欢淇濆瓨澶辫触'); + HandleError('move_uploaded_file鍑芥暟鏃犳硶鎵ц锛岃妫鏌ワ紒'); } +$UpFile['file_url']=str_replace(array(ShearURL,"\\"),array("","/"),$UpFile['file_url']); /* 鏉ュ埌杩欓噷鏃讹紝宸茬粡浠ｈ〃涓婁紶鎴愬姛锛屼綘鍙互鍦ㄨ繖閲屽敖鎯呭啓鐨勪綘閫昏緫 +$UpFile['file_url']灏辨槸閭ｅ紶涓存椂寰呮埅鍥剧墖鐨勮矾寰勶紒 */ - -echo('{"success":"'.str_replace(array("\\\\","\/",ShearURL,"\\"),array("\\","/","","/"),$UpFile['file_url']).'"}'); +echo('{"success":"'.$UpFile['file_url'].'"}'); ?> \ No newline at end of file diff --git a/php/zip_img.php b/php/zip_img.php index 6797922..8d05239 100644 --- a/php/zip_img.php +++ b/php/zip_img.php @@ -1,5 +1,5 @@ arg = $arg; - if (isset($arg["water"]) and $arg["water"] and file_exists($arg["water"])) { - list($W, $H, $type) = getimagesize($arg["water"]); + if ($arg["water"]) { + list($W, $H, $type) = @getimagesize($arg["water"]); if ($type == 3) { $this->waterimg = array( imagecreatefrompng($arg["water"]) , @@ -78,19 +77,17 @@ final function __construct($arg) { protected function zip_img($dest, $width, $height, $save_url, $water) { $createsrc = imagecreatetruecolor($width, $height); imagecopyresampled($createsrc, $dest, 0, 0, 0, 0, $width, $height, $this->arg["w"], $this->arg["h"]); - $water === true and $createsrc = $this->add_water($createsrc, $width, $height); + $water and $createsrc = $this->add_water($createsrc, $width, $height); $this->saveimg($createsrc,$save_url,$width, $height); } protected function add_water($src, $width, $height) { - if ($this->waterimg and is_numeric($this->arg["water_scope"]) and $width > $this->arg["water_scope"] and $height > $this->arg["water_scope"]) { - imagecopy($src, $this->waterimg[0], $width - $this->waterimg[1] - 10, $height - $this->waterimg[2] - 10, 0, 0, $this->waterimg[1], $this->waterimg[2]); - } + imagecopy($src, $this->waterimg[0], $width - $this->waterimg[1] - 10, $height - $this->waterimg[2] - 10, 0, 0, $this->waterimg[1], $this->waterimg[2]); return $src; } protected function saveimg($createsrc, $save_url,$width, $height) { @call_user_func($this->GDfun, $createsrc, $save_url); imagedestroy($createsrc); - array_push($this->result,array("ImgUrl"=>$save_url, "ImgName"=>basename($save_url),"ImgWidth"=>$width,"ImgHeight"=>$height)); + array_push($this->result,array("ImgUrl"=>str_replace(array(ShearURL,"\\"),array("","/"),$save_url), "ImgName"=>basename($save_url),"ImgWidth"=>$width,"ImgHeight"=>$height)); } final function __destruct() { @imagedestroy($this->arg["dest"]); @@ -99,6 +96,7 @@ final function __destruct() { public function run() { $dest = $this->arg["dest"]; $zip_array = $this->arg["zip_array"]; + $water =$this->waterimg and is_numeric($this->arg["water_scope"]); foreach ($zip_array as $k => $v) { list($width, $height, $save_url, $water) = $v; $this->zip_img($dest, $width, $height, $save_url, $water); diff --git "a/\344\275\234\350\200\205\345\257\204\350\257\255.html" "b/\344\275\234\350\200\205\345\257\204\350\257\255.html" index b9d23d3..f7d5c72 100644 --- "a/\344\275\234\350\200\205\345\257\204\350\257\255.html" +++ "b/\344\275\234\350\200\205\345\257\204\350\257\255.html" @@ -52,16 +52,17 @@

3锛氬湪绾跨編宸ュ垏鍥剧瓑 浣犱篃鍙互鍔犲叆shearphoto瀹樻柟QQ缇わ細461550716锛屽垎浜笌鎴戣繘琛屼氦娴併
- shearphoto鏄睘浜庡ぇ瀹剁殑锛shearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛shearphoto1.4 + shearphoto鏄睘浜庡ぇ瀹剁殑锛shearphoto鍒涢犲喘鏂版埅鍥剧幆澧冿紝甯屾湜澶у鍠滄shearphoto 鏈▼搴忕増鏈彿锛shearphoto1.5