取消了对 typecho 版本的要求，增加了 2x 水印的支持。

internelp · Sep 21, 2018 · 1e1a37c · 1e1a37c
1 parent 30fae51
commit 1e1a37c
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 45 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/Plugin.php b/Plugin.php
@@ -1,73 +1,87 @@
 <?php
 /**
- * Typecho 图片水印插件。
+ * Typecho 图片水印（觉得好用去我的网站点广告支持一下 O(∩_∩)O谢谢）。
  * 
  * @package waterMark
  * @author 应用侠
- * @version 1.0.0
+ * @version 1.0.1
  * @link https://www.appgao.com
- * @dependence 17.10.30
  */
 
-
-
 class waterMark_Plugin implements Typecho_Plugin_Interface {
 
-
     public static function activate() {
-    	Typecho_Plugin::factory('Widget_Upload')->upload = array('waterMark_Plugin', 'render');
-    	// Typecho_Plugin::factory('Widget_Upload')->modify = array('waterMark_Plugin', 'render');
+        Typecho_Plugin::factory('Widget_Upload')->upload = array('waterMark_Plugin', 'render');
+        // Typecho_Plugin::factory('Widget_Upload')->modify = array('waterMark_Plugin', 'render');
     }
 
     public static function deactivate(){
     }
 
     public static function config(Typecho_Widget_Helper_Form $form) {
 
-	    /** 配置欢迎话语 */
-	    $waterMarkImg = new Typecho_Widget_Helper_Form_Element_Text('waterMarkImg', NULL, '/usr/plugins/waterMark/watermark.png', _t('水印路径（png，相对路径）'));
-	    // $waterMarkOpacity = new Typecho_Widget_Helper_Form_Element_Text('waterMarkOpacity', NULL, '80', _t('水印透明度（0-100）'));
-	    $waterMarkPos = new Typecho_Widget_Helper_Form_Element_Text('waterMarkPos', NULL, '0', _t('水印位置（九宫格位置填写0-9，1-9为位置，0为随机。）'));
-	    $waterMarkAllow = new Typecho_Widget_Helper_Form_Element_Text('waterMarkAllow', NULL, 'jpg,png', _t('水印图片格式，直接填写格式以半角逗号分隔，gif加水印后会失去动画效果。'));
-	    $waterMarkquality = new Typecho_Widget_Helper_Form_Element_Text('waterMarkquality', NULL, '100', _t('图片质量（0-100）'));
-	    $form->addInput($waterMarkImg);
-	    // $form->addInput($waterMarkOpacity);
-	    $form->addInput($waterMarkPos);
-	    $form->addInput($waterMarkAllow);
-	    $form->addInput($waterMarkquality);
+        /** 配置欢迎话语 */
+        $waterMarkImg = new Typecho_Widget_Helper_Form_Element_Text('waterMarkImg', NULL, '/usr/plugins/waterMark/watermark.png', _t('水印路径（png，相对路径）'));
+        $waterMarkImg2x = new Typecho_Widget_Helper_Form_Element_Text('waterMarkImg2x', NULL, '/usr/plugins/waterMark/watermark2x.png', _t('针对大图片设定的水印，建议尺寸为默认水印的2倍'));
+        $minPixels = new Typecho_Widget_Helper_Form_Element_Text('minPixels', NULL, '50000', _t('使用水印最低像素数（默认为250*200=50000，即 长*宽>50000 的图片将使用水印）'));
+        $waterMarkImg2xMinPixels = new Typecho_Widget_Helper_Form_Element_Text('waterMarkImg2xMinPixels', NULL, '786432', _t('使用2x 水印最低像素数（默认为1024*768=786432））'));
+        $waterMarkPos = new Typecho_Widget_Helper_Form_Element_Text('waterMarkPos', NULL, '0', _t('水印位置（九宫格位置填写0-9，1-9为位置，0为随机。）'));
+        $waterMarkAllow = new Typecho_Widget_Helper_Form_Element_Text('waterMarkAllow', NULL, 'jpg,png', _t('水印图片格式，直接填写格式以半角逗号分隔，gif加水印后会失去动画效果。'));
+        $waterMarkquality = new Typecho_Widget_Helper_Form_Element_Text('waterMarkquality', NULL, '100', _t('图片质量（0-100）'));
+        $form->addInput($waterMarkImg);
+        $form->addInput($waterMarkImg2x);
+        $form->addInput($minPixels);
+        $form->addInput($waterMarkImg2xMinPixels);
+        $form->addInput($waterMarkPos);
+        $form->addInput($waterMarkAllow);
+        $form->addInput($waterMarkquality);
     }
 
     public static function personalConfig(Typecho_Widget_Helper_Form $form){}
 
     public static function render($img){
 
-    	if ($img->attachment->isImage){
+        if ($img->attachment->isImage){
 
-    		$waterMarkImg = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkImg;
-    		// $waterMarkOpacity = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkOpacity;
-    		$waterMarkPos = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkPos;
-			$waterMarkAllow = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkAllow;
-			$waterMarkquality = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkquality;
-    		$type = $img->attachment->type;
-
+            $srcImg = __TYPECHO_ROOT_DIR__ . $img->attachment->path;
+            $minPixels = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->minPixels;
+            $waterMarkImg2xMinPixels = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkImg2xMinPixels;
+
+            list($srcData['width'], $srcData['height'], $srcData['type'] ,$srcData['attr']) = getimagesize($srcImg);
 
-    		if ($type == 'jpeg') {
-    			$type = 'jpg';
-    		}
+            $pixelCount = $srcData['width'] * $srcData['height'];
 
-    		if (stripos($waterMarkAllow,$type) !== false){
-    			$srcImg = __TYPECHO_ROOT_DIR__ . $img->attachment->path;
-    			$waterImg = __TYPECHO_ROOT_DIR__ . $waterMarkImg;
-    			if (rename($srcImg,$srcImg.'.tmp')){
-    				$destImg = $srcImg;
-    				$srcImg = $srcImg.'.tmp';
-    				require_once("imgfunc.php");
-    				ImgWaterMark("", 1,$srcImg,$waterMarkPos,$waterImg, '', 12, '#FF0000',  100 , $waterMarkquality, $destImg);
-                    unlink($srcImg);
-    			}
-    		}
-    	}
-	}
+            // 判断尺寸是否达到添加水印条件，并选择是否是2x 水印
+            if ( $pixelCount > $minPixels ) {
+                // 有水印
+                $waterMarkImg = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkImg;
+
+                if ( $pixelCount > $waterMarkImg2xMinPixels ) {
+                    // 2x水印
+                    $waterMarkImg = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkImg2x;
+                } 
+
+                $waterMarkPos = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkPos;
+                $waterMarkAllow = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkAllow;
+                $waterMarkquality = Typecho_Widget::widget('Widget_Options')->plugin('waterMark')->waterMarkquality;
+                $type = $img->attachment->type;
+
+                if ($type == 'jpeg') {
+                    $type = 'jpg';
+                }
+
+                if (stripos($waterMarkAllow,$type) !== false){
+                    $waterImg = __TYPECHO_ROOT_DIR__ . $waterMarkImg;
+                    if (rename($srcImg,$srcImg.'.tmp')){
+                        $destImg = $srcImg;
+                        $srcImg = $srcImg.'.tmp';
+                        require_once("imgfunc.php");
+                        ImgWaterMark("", 1,$srcImg,$waterMarkPos,$waterImg, '', 12, '#FF0000',  100 , $waterMarkquality, $destImg);
+                        unlink($srcImg);
+                    }
+                }
+            }
+        }
+    }
 }
-?>
 
diff --git a/Readme.md b/Readme.md
@@ -1,6 +1,6 @@
 ## Typecho 图片水印插件
 
-本插件仅支持 png \ gif 格式的图片作为水印。
+本插件仅支持 png \ jpg 格式的图片作为水印。
 
 推荐使用 png 格式的图片作为水印，以保证水印的质量。
 
@@ -17,4 +17,10 @@ waterMark/
 └── watermark.png
 ```
 
+## 更新
+
+**2018-9-21**
+- 取消了对 typecho 版本的要求
+- 增加了 2x 水印的支持
+
 访问：https://www.appgao.com/Programming/typecho-watermark.html
diff --git a/imgfunc.php b/imgfunc.php
diff --git a/watermark.png b/watermark.png
diff --git a/watermark2x.png b/watermark2x.png