stanley-king 4 years ago
parent
commit
1afe9911bb

+ 2 - 2
data/logic/queue.logic.php

@@ -106,7 +106,7 @@ class queueLogic
 
     private function create_shareimage($uid)
     {
-        $back_img = BASE_RESOURCE_PATH . '/mobile/member/images/share.png';
+        $back_img = BASE_RESOURCE_PATH . '/mobile/member/images/share.jpg';
         $passwd = util::passwd;
         $name = md5("{$uid}.{$passwd}") . ".png";
         $mini_path = BASE_UPLOAD_PATH . DS . ATTACH_MINI_QRCODE . DS . $name;
@@ -125,7 +125,7 @@ class queueLogic
         if($dest == false) return false;
 
         imagecopy($dest,$back, 0, 0, 0,0, imagesx($back), imagesy($back));
-        imagecopyresized($dest,$mini, 30, 648, 0,0, 168,168,imagesx($mini), imagesy($mini));
+        imagecopyresized($dest,$mini, 30, 750, 0,0, 168,168,imagesx($mini), imagesy($mini));
         imagepng($dest, $dest_img);
         return true;
     }

BIN
data/resource/mobile/member/images/share.jpg


BIN
data/resource/mobile/member/images/share.png


+ 10 - 2
helper/calc_helper.php

@@ -248,10 +248,18 @@ class CalcPrice implements ICalc
             if(empty($next)) {
                 $discount = $cur['discount'];
                 $tip = "您已领补贴{$discount}元";
-            } else {
+            }
+            else
+            {
                 $count = $next['num'] - $left_invitees;
                 $discount = $next['discount'];
-                $tip = "已领补贴{$cur['discount']}元,再分享{$count}人,可领补贴{$discount}元";
+
+                if(empty($cur)) {
+                    $tip = "分享{$count}人,可领补贴{$discount}元";
+                }
+                else {
+                    $tip = "已领补贴{$cur['discount']}元,再分享{$count}人,可领补贴{$discount}元";
+                }
             }
 
             return $tip;

+ 2 - 2
test/TestGD.php

@@ -31,7 +31,7 @@ class TestGD extends TestCase
 
     private function create_shareimage($uid)
     {
-        $back_img = BASE_RESOURCE_PATH . '/mobile/member/images/share.png';
+        $back_img = BASE_RESOURCE_PATH . '/mobile/member/images/share.jpg';
         $passwd = util::passwd;
         $name = md5("{$uid}.{$passwd}") . ".png";
         $mini_path = BASE_UPLOAD_PATH . DS . ATTACH_MINI_QRCODE . DS . $name;
@@ -44,7 +44,7 @@ class TestGD extends TestCase
 
         $dest = imagecreatetruecolor(imagesx($back), imagesy($back));
         imagecopy($dest,$back, 0, 0, 0,0, imagesx($back), imagesy($back));
-        imagecopyresized($dest,$mini, 30, 648, 0,0, 168,168,imagesx($mini), imagesy($mini));
+        imagecopyresized($dest,$mini, 30, 750, 0,0, 168,168,imagesx($mini), imagesy($mini));
         imagepng($dest, $dest_img);
     }
 

+ 54 - 1
test/TestQRcode.php

@@ -35,8 +35,17 @@ class TestQRcode extends TestCase
 
     public function testMakeChannel()
     {
-        $channels = [1000,1001];
+        $channels = [1000,1001]; //第一次1000块钱的线上推广
+        $leaflets = [2000,2001]; //传单
+        $group = [3000,3001,3002]; //传单
+        $ald = [4000,4001,4002]; //传单
 
+
+        $this->makeChannelCode($group);
+    }
+
+    private function makeChannelCode($channels)
+    {
         foreach ($channels as $channel)
         {
             $resp = thrid_author\signaturer::instance()->minicode("/pages/index/index?channel={$channel}",430);
@@ -49,9 +58,53 @@ class TestQRcode extends TestCase
                 }
                 else {
                     Log::record("Create channel image success.",Log::DEBUG);
+                    $share_path = BASE_ROOT_PATH . "/test/channel/share-{$channel}.png";
+                    $this->create_shareimage($save_path,$share_path);
                 }
             }
         }
+
+        return false;
+    }
+
+    private function create_shareimage($mini_path,$share_path)
+    {
+        $back_img = BASE_RESOURCE_PATH . '/mobile/member/images/share.jpg';
+        $back = $this->create_image($back_img);
+        $mini = $this->create_image($mini_path);
+
+        $dest = imagecreatetruecolor(imagesx($back), imagesy($back));
+        imagecopy($dest,$back, 0, 0, 0,0, imagesx($back), imagesy($back));
+        imagecopyresized($dest,$mini, 30, 750, 0,0, 168,168,imagesx($mini), imagesy($mini));
+        imagepng($dest, $share_path);
+    }
+    private function create_image($file)
+    {
+        $imagetype = exif_imagetype($file);
+        if ($imagetype === false) {
+            return false;
+        }
+
+        switch ($imagetype)
+        {
+            case IMAGETYPE_GIF:
+                $image = @imagecreatefromgif($file);
+                break;
+            case IMAGETYPE_JPEG:
+            case IMAGETYPE_JPEG2000:
+                $image = @imagecreatefromjpeg($file);
+                break;
+            case IMAGETYPE_PNG:
+                $image = @imagecreatefrompng($file);
+                break;
+            case IMAGETYPE_BMP:
+                $image = @imagecreatefrombmp($file);
+                break;
+            default:
+                return false;
+        }
+
+        return $image;
     }
 
     public function testSendInviter()