Skip to content

Commit 99ca18d

Browse files
author
KAZE
committed
## V1.3.8 Beta
> 1. 修复B站数据源
1 parent 1a1778a commit 99ca18d

File tree

5 files changed

+50
-71
lines changed

5 files changed

+50
-71
lines changed

‎JS/background.js

+25-47
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var Kaze = {
66
yj: [],
77
bili: []
88
},
9-
version: '1.3.7',
9+
version: '1.3.8 Beta',
1010
isTest: false,
1111
isFrist: true,
1212
//请求次数
@@ -17,7 +17,7 @@ var Kaze = {
1717
setting: {
1818
time: 15000,
1919
getweibo: true,
20-
getbili: false,
20+
getbili: true,
2121
getyj: true,
2222
getcho3: true,
2323
getys3: true,
@@ -135,7 +135,7 @@ let getAndProcessWeiboData = {
135135
image: dynamicInfo.bmiddle_pic || dynamicInfo.original_pic,
136136
type: that.getdynamicType(dynamicInfo),
137137
source: opt.source,
138-
url: "https://weibo.com/" + weiboId.substring((weiboId.length-10), weiboId.length) + "/" + x.mblog.bid,
138+
url: "https://weibo.com/" + weiboId.substring((weiboId.length - 10), weiboId.length) + "/" + x.mblog.bid,
139139
});
140140
}
141141
});
@@ -185,8 +185,8 @@ let getAndProcessWeiboData = {
185185
}
186186

187187
let getBili = {
188-
url: `https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history?host_uid=161775300`,
189-
// url:`https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history?host_uid=161775300&offset_dynamic_id=0&need_top=0&platform=web`,
188+
189+
url: `https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history?host_uid=161775300&offset_dynamic_id=0&need_top=0&platform=web`,
190190
dturl: `https://space.bilibili.com/161775300/dynamic`,
191191
// B站：动态列表
192192
cardlist: [],
@@ -199,14 +199,27 @@ let getBili = {
199199
if (data.code == 0 && data.data != null && data.data.cards != null && data.data.cards.length > 0) {
200200
data.data.cards.map(x => {
201201
let dynamicInfo = JSON.parse(x.card);
202-
that.cardlist.push({
203-
time: x.desc.timestamp,
204-
dynamicInfo: that.GetdynamicInfo(dynamicInfo),
205-
image: that.GetdynamicImage(dynamicInfo),
206-
type: that.GetdynamicType(dynamicInfo),
202+
let card = {
207203
source: 0,
208-
url: dynamicInfo.short_link || that.dturl
209-
});
204+
time: x.desc.timestamp,
205+
type: x.desc.type
206+
};
207+
// desc.type 8 是视频 64是专栏 2是动态
208+
// todo 等微博数据分析完毕 就添加titile
209+
if (x.desc.type == 2) {
210+
card.image = (dynamicInfo.item.pictures && dynamicInfo.item.pictures.length > 0) ? dynamicInfo.item.pictures[0].img_src : null;
211+
card.dynamicInfo = dynamicInfo.item.description;
212+
card.url = `https://t.bilibili.com/${x.desc.dynamic_id_str}`
213+
} else if (x.desc.type == 8) {
214+
card.image = dynamicInfo.pic;
215+
card.dynamicInfo = dynamicInfo.dynamic;
216+
card.url = `https://t.bilibili.com/${x.desc.dynamic_id_str}`
217+
} else if (x.desc.type == 64) {
218+
card.image = (dynamicInfo.image_urls && dynamicInfo.image_urls.length > 0) ? dynamicInfo.image_urls[0] : null;
219+
card.dynamicInfo = dynamicInfo.summary;
220+
card.url = `https://t.bilibili.com/${x.desc.dynamic_id_str}`
221+
}
222+
that.cardlist.push(card);
210223
});
211224
that.cardlist.sort((x, y) => x.time < y.time ? 1 : -1);
212225
that.JudgmentNew(that.cardlist);
@@ -216,41 +229,6 @@ let getBili = {
216229
}
217230
, { name: "Bilibili动态", type: 'getbili' });
218231
},
219-
GetdynamicType(dynamic) {
220-
// 0为视频 1为动态
221-
let type = -1;
222-
if (dynamic.hasOwnProperty('item')) {
223-
type = 1;
224-
}
225-
else {
226-
type = 0;
227-
}
228-
return type;
229-
},
230-
GetdynamicInfo(dynamic) {
231-
// 0为视频 1为动态
232-
let dynamicInfo = '';
233-
if (dynamic.hasOwnProperty('item')) {
234-
dynamicInfo = dynamic.item.description || dynamic.item.content;
235-
}
236-
else {
237-
dynamicInfo = dynamic.desc || dynamic.title;
238-
}
239-
return dynamicInfo;
240-
},
241-
GetdynamicImage(dynamic) {
242-
// 0为视频 1为动态
243-
let dynamicInfo = null;
244-
if (dynamic.hasOwnProperty('item')) {
245-
if (dynamic.item.hasOwnProperty('pictures')) {
246-
dynamicInfo = dynamic.item.pictures.length > 0 ? dynamic.item.pictures[0].img_src : null;
247-
}
248-
}
249-
else {
250-
dynamicInfo = dynamic.pic || dynamic.pic;
251-
}
252-
return dynamicInfo;
253-
},
254232
JudgmentNew(dynamiclist) {
255233
let oldcardlist = Kaze.cardlistdm.bili
256234
if (oldcardlist.length > 0 && oldcardlist[0].time != dynamiclist[0].time && dynamiclist[0].time > oldcardlist[0].time) {

‎JS/popup.js

+10-18
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,16 @@ let Kaze = {
3232
cardlist.map(x => {
3333
//0 b服 1微博 2通讯组 3朝陇山 4一拾山
3434
if (x.source == 0) {
35-
if (x.type == 0) {
36-
html += `<div class="card" data-type="0" data-url="${x.url}">
37-
<div class="head">
38-
<img src="../image/bili.ico">
39-
<span class="time">${common.TimespanTotime(x.time)}</span>
40-
</div>
41-
<div class="content">
42-
<div>${x.dynamicInfo.replace(/\n/g, "<br/>")}</div><div class="imgarea ${x.image ? '' : 'hide'}"><img src="${x.image ? x.image : ''}"></div></div>
43-
</div>`;
44-
} else if (x.type == 1) {
45-
html += `<div class="card" data-type="0" data-url="${x.url}">
46-
<div class="head">
47-
<img src="../image/bili.ico">
48-
<span class="time">${common.TimespanTotime(x.time)}</span>
49-
</div>
50-
<div class="content"><div>${x.dynamicInfo.replace(/\n/g, "<br/>")}</div><div class="imgarea ${x.image ? '' : 'hide'}"><img src="${x.image ? x.image : ''}"></div></div>
51-
</div>`;
52-
}
35+
console.log(x);
36+
// 8 是视频 64是专栏 2是动态
37+
html += `<div class="card" data-type="0" data-url="${x.url}">
38+
<div class="head">
39+
<img src="../image/bili.ico">
40+
<span class="time">${common.TimespanTotime(x.time)}</span>
41+
</div>
42+
<div class="content">
43+
<div>${x.dynamicInfo.replace(/\n/g, "<br/>")}</div><div class="imgarea ${x.image ? '' : 'hide'}"><img src="${x.image ? x.image : ''}"></div></div>
44+
</div>`;
5345
}
5446
else if (x.source == 1) {
5547
html += `<div class="card" data-type="1" data-url="${x.url}">

‎html/options.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ <h1>设置</h1>
5353
<span>饼接收：</span>
5454
<div class="checkarea">
5555
<span class="option-input-span">
56-
<input type="checkbox" id="getbili" value="getbili" disabled>
57-
<label for="getbili" style="color:rgb(145, 145, 145)" title="失效，正在修复中">bilibili接口</label>
56+
<input type="checkbox" id="getbili" value="getbili">
57+
<label for="getbili">bilibili接口</label>
5858
</span>
5959
<span class="option-input-span">
6060
<input type="checkbox" id="getweibo" value="getweibo">

‎manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 2,
33
"name": "蹲饼",
4-
"version": "1.3.7",
4+
"version": "1.3.8",
55
"description": "一起监视自由的兔兔。明日方舟兔兔发布动态发布时间越来越奇怪了，我每天下午4点刷都刷不出来，怎么办呢？写一个蹲饼器盯着兔兔看！",
66
"author": "Kaze",
77
"icons": {

‎readme.md

+12-3
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,15 @@
8181

8282
> 1. 更改微博跳转手机链接为电脑链接
8383
84+
## V1.3.8 Beta
85+
86+
> 1. 修复B站数据源
87+
8488
# 安装方法
8589

8690
## Chrome安装方法
8791

88-
> - [Chrome应用商店](https://chrome.google.com/webstore/detail/%E8%B9%B2%E9%A5%BC/gblmdllhbodefkmimbcjpflhjneagkkd?hl=zh-CN&authuser=0)
92+
> - 推荐 [Chrome应用商店](https://chrome.google.com/webstore/detail/%E8%B9%B2%E9%A5%BC/gblmdllhbodefkmimbcjpflhjneagkkd?hl=zh-CN&authuser=0)
8993
> - 下载zip通过开发者模式加载已解压的扩展程序
9094
9195
## Firefox安装方法
@@ -100,7 +104,12 @@
100104
# 注意事项
101105

102106
只支持Chrome 不知道其他的浏览器安装会怎么样
103-
因为B站的json总是有奇怪的字符，所以，发现bug，请及时和我说，我好针对那条动态修改
107+
104108
# 下一步
105109

106-
不知道，先测试BUG。
110+
> - 界面添加B站和微博标题
111+
> - 图片九宫格
112+
> - 视频播放功能
113+
> - 通讯组和塞壬唱片数据展示调整
114+
> - 重构B站获取方法
115+

0 commit comments

Comments
 (0)