dever 6 years ago
parent
commit
25f7195d0d

+ 14 - 0
content/lib/Article.php

@@ -71,6 +71,20 @@ class Article
             }
         }
 
+        if (strstr($data['content'], 'gif')) {
+            # gif
+            preg_match_all('/<img(.*?)src="(.*?)\.gif" (.*?)\/>/', $content, $matches);
+
+            if (isset($matches[2])) {
+                foreach ($matches[2] as $k => $v) {
+                    $content = str_replace($matches[0][$k], '{replace}'.count($replace).'{replace}', $content);
+                    $pic = $v;
+
+                    $replace[] = array('type' => 8, 'pic' => $pic . '.gif');
+                }
+            }
+        }
+
         if (strstr($data['content'], 'data-file')) {
             # 音频
             preg_match_all('/<img src="(.*?)" style="(.*?)" data-file="(.*?)" \/>/', $content, $matches);

+ 10 - 1
h5/assets/mobile/article.html

@@ -5,7 +5,13 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
   <title><{$info['name']}> - <{$config['name']}></title>
-<link href="css/global.css?v=d4ecd76d" rel="stylesheet"><link href="css/article.css?v=d4ecd76d" rel="stylesheet"></head>
+<link href="css/global.css?v=d4ecd76d" rel="stylesheet"><link href="css/article.css?v=d4ecd76d" rel="stylesheet">
+<style>
+.emoji {
+  width:16px;
+}
+</style>
+</head>
 
 <body>
   <header style="display:none;">
@@ -270,4 +276,7 @@
     })
 </script>
 
+<script type="text/javascript" src="script/lib/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="js/emoji.js?v=d4ecd76d"></script>
+
 </html>

+ 12 - 0
main/assets/mobile/content.html

@@ -92,6 +92,18 @@
             <div class="tit" style="display:none;"><{$v['name']}></div>
         </div>
 
+        <{elseif($v['type'] == 8):}>
+        <!--gif图片-->
+        <div class="p-img">
+            <div class="gif-img">
+                <img class="img" src="<{$v['pic']}>" alt="">
+                <a href="jstyle://link?id=<{$k}>&link=<{$v['pic']}>&type=share" class="ico-gif-share" ></a>
+                <a href="jstyle://link?id=<{$k}>&link=<{$v['pic']}>&type=download" class="ico-gif-download" ></a>
+            </div>
+            <!--视频/图片标题-->
+            <div class="tit" style="display:none;">段宜恩:强大精神力的猫系偶像</div>
+        </div>
+
         <{endif}>
 
         <{endloop}>

File diff suppressed because it is too large
+ 0 - 0
main/assets/mobile/css/feature.css


+ 1 - 0
main/assets/mobile/css/feature.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/feature.css?v=d0d368f3","sourceRoot":""}

+ 1 - 1
main/assets/mobile/css/global.css

@@ -1,2 +1,2 @@
 body{font-family:Roboto,Droid Sans,Helvetica,Helvetica Neue,Heiti SC,sans-serif}abbr,address,article,aside,audio,b,blockquote,body,canvas,caption,cite,code,dd,del,details,dfn,div,dl,dt,em,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,p,pre,q,samp,section,small,span,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,ul,var,video{margin:0;padding:0;border:none;outline:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}address,caption,cite,code,dfn,td,th,var{font-weight:400;font-style:normal}nav,ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}a,ins{text-decoration:none}table{border-collapse:collapse;border-spacing:0}caption,td,th{text-align:left}a,div,img,input{-webkit-tap-highlight-color:transparent;-webkit-appearance:none}input:focus::-webkit-input-placeholder,textarea:focus::-webkit-input-placeholder{color:transparent}.clearfix:after{visibility:hidden;display:block;font-size:0;content:" ";clear:both;height:0}.fn-hide{display:none}.fn-nocallout{-webkit-touch-callout:none}.fn-noselect{-webkit-user-select:none}.fn-noadjust{-webkit-text-size-adjust:none}.fn-nodrag{-webkit-user-drag:none}
-/*# sourceMappingURL=global.css.map?v=6bc526e8*/
+/*# sourceMappingURL=global.css.map?v=d0d368f3*/

+ 1 - 1
main/assets/mobile/css/global.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=6bc526e8","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=d0d368f3","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/mobile/css/index.css


+ 1 - 1
main/assets/mobile/css/index.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=6b18634f","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=d0d368f3","sourceRoot":""}

+ 1 - 1
main/assets/mobile/css/rule.css

@@ -1,2 +1,2 @@
 body{padding:.64rem!important}body h1{padding-top:.64rem;text-align:center;font-size:.4rem;font-weight:700;margin-bottom:.64rem}body h2{line-height:1.6;font-weight:700}body h2,body p{font-size:.32rem}body p{min-height:.32rem;line-height:1.8}body img{max-width:100%}
-/*# sourceMappingURL=rule.css.map?v=6bc526e8*/
+/*# sourceMappingURL=rule.css.map?v=d0d368f3*/

+ 1 - 1
main/assets/mobile/css/rule.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/rule.css?v=6bc526e8","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/rule.css?v=d0d368f3","sourceRoot":""}

BIN
main/assets/mobile/images/ico-download.png


BIN
main/assets/mobile/images/ico-gif.png


BIN
main/assets/mobile/images/ico-share.png


Some files were not shown because too many files changed in this diff