Skip to content
This repository has been archived by the owner on Jul 7, 2023. It is now read-only.

Commit

Permalink
fix: 修复暗黑模式问题, 去除激励广告
Browse files Browse the repository at this point in the history 
更新parser版本
  • Loading branch information
@luoxuhai
luoxuhai committed Jun 21, 2020
1 parent 8257b7e commit 878f30d
Show file tree
Hide file tree
Showing 17 changed files with 763 additions and 905 deletions.
54 changes: 25 additions & 29 deletions src/components/BookList/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,36 +35,32 @@ class BookList extends PureComponent<Props> {

return (
<View className="book-list">
{books.map((item, index) =>
item.isAd ? (
<Ad unitId={item.unitId} adType="video" adTheme="white" key={index + 1} />
) : (
<Navigator
className="book-list__item"
url={`/pages/book_detail/index?bookName=${item.bookName}&id=${item._id}`}
key={item._id}
>
<BookCover class-name="item__cover" text={item.bookName} />
<View className="item__desc">
<Text className="item__name black">{item.bookName}</Text>
<Text className="item__author grey">{item.author.name}</Text>
<View className="item__rate grey">
{item.bookScore + ' '}
<rate
current={!item.isAd && item.bookScore.toFixed(0)}
disabled
active="#ffca3e"
normal="#ececec"
score={!item.isAd && getDecimals(item.bookScore)}
/>
</View>
{books.map(item => (
<Navigator
className="book-list__item"
url={`/pages/book_detail/index?bookName=${item.bookName}&id=${item._id}`}
key={item._id}
>
<BookCover class-name="item__cover" text={item.bookName} />
<View className="item__desc">
<Text className="item__name black">{item.bookName}</Text>
<Text className="item__author grey">{item.author.name}</Text>
<View className="item__rate grey">
{item.bookScore + ' '}
<rate
current={!item.isAd && item.bookScore.toFixed(0)}
disabled
active="#ffca3e"
normal="#ececec"
score={!item.isAd && getDecimals(item.bookScore)}
/>
</View>
<View className="item__footer">
<Tag title={item.bookType || '其他'} />
</View>
</Navigator>
)
)}
</View>
<View className="item__footer">
<Tag title={item.bookType || '其他'} />
</View>
</Navigator>
))}
<LoadMore loading={loading} empty={!loading && !books.length} />
</View>
);
Expand Down
189 changes: 92 additions & 97 deletions src/components/parser/libs/CssHandler.js
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,97 @@
/*
解析和匹配 Css 的选择器
github：https://github.com/jin-yufeng/Parser
docs：https://jin-yufeng.github.io/Parser
author：JinYufeng
update：2020/03/15
*/
var cfg = require('./config.js');
class CssHandler {
constructor(tagStyle) {
var styles = Object.assign({}, cfg.userAgentStyles);
for (var item in tagStyle)
styles[item] = (styles[item] ? styles[item] + ';' : '') + tagStyle[item];
this.styles = styles;
}
getStyle = data => this.styles = new CssParser(data, this.styles).parse();
match(name, attrs) {
var tmp, matched = (tmp = this.styles[name]) ? tmp + ';' : '';
if (attrs.class) {
var items = attrs.class.split(' ');
for (var i = 0, item; item = items[i]; i++)
if (tmp = this.styles['.' + item])
matched += tmp + ';';
}
if (tmp = this.styles['#' + attrs.id])
matched += tmp + ';';
return matched;
const cfg = require('./config.js'),
isLetter = c => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');

function CssHandler(tagStyle) {
var styles = Object.assign(Object.create(null), cfg.userAgentStyles);
for (var item in tagStyle)
styles[item] = (styles[item] ? styles[item] + ';' : '') + tagStyle[item];
this.styles = styles;
}
CssHandler.prototype.getStyle = function (data) {
this.styles = new parser(data, this.styles).parse();
}
CssHandler.prototype.match = function (name, attrs) {
var tmp, matched = (tmp = this.styles[name]) ? tmp + ';' : '';
if (attrs.class) {
var items = attrs.class.split(' ');
for (var i = 0, item; item = items[i]; i++)
if (tmp = this.styles['.' + item])
matched += tmp + ';';
}
if (tmp = this.styles['#' + attrs.id])
matched += tmp + ';';
return matched;
}
module.exports = CssHandler;
class CssParser {
constructor(data, init) {
this.data = data;
this.floor = 0;
this.i = 0;
this.list = [];
this.res = init;
this.state = this.Space;
}
parse() {
for (var c; c = this.data[this.i]; this.i++)
this.state(c);
return this.res;
}
section = () => this.data.substring(this.start, this.i);
isLetter = c => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
// 状态机
Space(c) {
if (c == '.' || c == '#' || this.isLetter(c)) {
this.start = this.i;
this.state = this.Name;
} else if (c == '/' && this.data[this.i + 1] == '*')
this.Comment();
else if (!cfg.blankChar[c] && c != ';')
this.state = this.Ignore;
}
Comment() {
this.i = this.data.indexOf('*/', this.i) + 1;
if (!this.i) this.i = this.data.length;
this.state = this.Space;
}
Ignore(c) {
if (c == '{') this.floor++;
else if (c == '}' && !--this.floor) this.state = this.Space;
}
Name(c) {
if (cfg.blankChar[c]) {
this.list.push(this.section());
this.state = this.NameSpace;
} else if (c == '{') {
this.list.push(this.section());
this.Content();
} else if (c == ',') {
this.list.push(this.section());
this.Comma();
} else if (!this.isLetter(c) && (c < '0' || c > '9') && c != '-' && c != '_')
this.state = this.Ignore;
}
NameSpace(c) {
if (c == '{') this.Content();
else if (c == ',') this.Comma();
else if (!cfg.blankChar[c]) this.state = this.Ignore;
}
Comma() {
while (cfg.blankChar[this.data[++this.i]]);
if (this.data[this.i] == '{') this.Content();
else {
this.start = this.i--;
this.state = this.Name;
}
}
Content() {
this.start = ++this.i;
if ((this.i = this.data.indexOf('}', this.i)) == -1) this.i = this.data.length;
var content = this.section();
for (var i = 0, item; item = this.list[i++];)
if (this.res[item]) this.res[item] += ';' + content;
else this.res[item] = content;
this.list = [];
this.state = this.Space;

function parser(data, init) {
this.data = data;
this.floor = 0;
this.i = 0;
this.list = [];
this.res = init;
this.state = this.Space;
}
parser.prototype.parse = function () {
for (var c; c = this.data[this.i]; this.i++)
this.state(c);
return this.res;
}
parser.prototype.section = function () {
return this.data.substring(this.start, this.i);
}
// 状态机
parser.prototype.Space = function (c) {
if (c == '.' || c == '#' || isLetter(c)) {
this.start = this.i;
this.state = this.Name;
} else if (c == '/' && this.data[this.i + 1] == '*')
this.Comment();
else if (!cfg.blankChar[c] && c != ';')
this.state = this.Ignore;
}
parser.prototype.Comment = function () {
this.i = this.data.indexOf('*/', this.i) + 1;
if (!this.i) this.i = this.data.length;
this.state = this.Space;
}
parser.prototype.Ignore = function (c) {
if (c == '{') this.floor++;
else if (c == '}' && !--this.floor) this.state = this.Space;
}
parser.prototype.Name = function (c) {
if (cfg.blankChar[c]) {
this.list.push(this.section());
this.state = this.NameSpace;
} else if (c == '{') {
this.list.push(this.section());
this.Content();
} else if (c == ',') {
this.list.push(this.section());
this.Comma();
} else if (!isLetter(c) && (c < '0' || c > '9') && c != '-' && c != '_')
this.state = this.Ignore;
}
parser.prototype.NameSpace = function (c) {
if (c == '{') this.Content();
else if (c == ',') this.Comma();
else if (!cfg.blankChar[c]) this.state = this.Ignore;
}
parser.prototype.Comma = function () {
while (cfg.blankChar[this.data[++this.i]]);
if (this.data[this.i] == '{') this.Content();
else {
this.start = this.i--;
this.state = this.Name;
}
}
parser.prototype.Content = function () {
this.start = ++this.i;
if ((this.i = this.data.indexOf('}', this.i)) == -1) this.i = this.data.length;
var content = this.section();
for (var i = 0, item; item = this.list[i++];)
if (this.res[item]) this.res[item] += ';' + content;
else this.res[item] = content;
this.list = [];
this.state = this.Space;
}
Loading

0 comments on commit 878f30d

Please sign in to comment.