Skip to content

Commit 565b01f

Browse files
GreedyskyGreedysky
committed
refactor: Optimize global network module[263931]
1 parent 926cc73 commit 565b01f

File tree

3 files changed

+81
-81
lines changed

3 files changed

+81
-81
lines changed

‎TTKModule/TTKCore/musicNetworkKits/radio/mv/musicabstractmvradiorequest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "musicabstractqueryrequest.h"
2323

24-
static constexpr const char *MV_CATEGORY_URL = "a2JPOG81ckd3T1NtN004dnRBZ2JubTZYeFYxSFBXWCtDdkZmVVZKY1NVNGxDUGhaMjY0dXh2bk1XWWpXRlpQUmE3ZG5VZVErNURVPQ==";
24+
static constexpr const char *MV_CATEGORY_URL = "US93a3pGUVMzNmdBUDRtUGUyMk42WFZzS2oyczJpTzFTWWNzVmxJbGt0VmhSQk5qdzFZTGZDWHJ4U1JnY1pQMkdycm1rdz09";
2525

2626

2727
/*! @brief The class of the music mv radio request abstract.

‎TTKModule/TTKCore/musicNetworkKits/radio/mv/musicmvradiocategoryrequest.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,44 @@ void MusicMVRadioCategoryRequest::downLoadFinished()
1313
MusicAbstractMVRadioRequest::downLoadFinished();
1414
if(m_reply && m_reply->error() == QNetworkReply::NoError)
1515
{
16-
QByteArray bytes = m_reply->readAll();
17-
bytes = QString(bytes).split("var mvfmdata = ").back().split("$img = ").front().toUtf8();
18-
bytes.chop(3);
19-
2016
QJson::Parser json;
2117
bool ok = false;
22-
const QVariant &data = json.parse(bytes, &ok);
18+
const QVariant &data = json.parse(m_reply->readAll(), &ok);
2319
if(ok)
2420
{
25-
const QVariantList &datas = data.toList();
26-
for(const QVariant &var : qAsConst(datas))
21+
QVariantMap value = data.toMap();
22+
if(value.contains("data"))
2723
{
28-
if(var.isNull())
24+
const QVariantList &datas = value["data"].toList();
25+
for(const QVariant &var : qAsConst(datas))
2926
{
30-
continue;
31-
}
27+
if(var.isNull())
28+
{
29+
continue;
30+
}
3231

33-
QVariantMap value = var.toMap();
34-
TTK_NETWORK_QUERY_CHECK();
32+
QVariantMap value = var.toMap();
33+
TTK_NETWORK_QUERY_CHECK();
3534

36-
if(value["classId"].toString() == m_queryValue)
37-
{
38-
const QVariantList &fms = value["fm_list"].toList();
39-
for(const QVariant &var : qAsConst(fms))
35+
if(value["classId"].toString() == m_queryValue)
4036
{
41-
if(var.isNull())
37+
const QVariantList &fms = value["fm_list"].toList();
38+
for(const QVariant &var : qAsConst(fms))
4239
{
43-
continue;
40+
if(var.isNull())
41+
{
42+
continue;
43+
}
44+
45+
value = var.toMap();
46+
TTK_NETWORK_QUERY_CHECK();
47+
48+
MusicResultDataItem item;
49+
item.m_name = value["fmName"].toString();
50+
item.m_id = value["fmId"].toString();
51+
item.m_coverUrl = value["imgUrlMv"].toString();
52+
Q_EMIT createMVRadioItem(item);
4453
}
45-
46-
value = var.toMap();
47-
TTK_NETWORK_QUERY_CHECK();
48-
49-
MusicResultDataItem item;
50-
item.m_name = value["fmName"].toString();
51-
item.m_id = value["fmId"].toString();
52-
item.m_coverUrl = value["imgUrlMv"].toString();
53-
Q_EMIT createMVRadioItem(item);
5454
}
5555
}
5656
}

‎TTKModule/TTKCore/musicNetworkKits/radio/mv/musicmvradioprogramrequest.cpp

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -112,85 +112,85 @@ void MusicMVRadioProgramRequest::downLoadFinished()
112112
MusicAbstractMVRadioRequest::downLoadFinished();
113113
if(m_reply && m_reply->error() == QNetworkReply::NoError)
114114
{
115-
QByteArray bytes = m_reply->readAll();
116-
bytes = QString(bytes).split("var mvfmdata = ").back().split("$img = ").front().toUtf8();
117-
bytes.chop(3);
118-
119115
QJson::Parser json;
120116
bool ok = false;
121-
const QVariant &data = json.parse(bytes, &ok);
117+
const QVariant &data = json.parse(m_reply->readAll(), &ok);
122118
if(ok)
123119
{
124-
bool contains = false;
125-
for(const QVariant &var : data.toList())
120+
QVariantMap value = data.toMap();
121+
if(value.contains("data"))
126122
{
127-
if(var.isNull())
128-
{
129-
continue;
130-
}
131-
132-
QVariantMap value = var.toMap();
133-
TTK_NETWORK_QUERY_CHECK();
134-
135-
MusicResultDataItem item;
136-
item.m_nickName = value["className"].toString();
137-
138-
for(const QVariant &var : value["fm_list"].toList())
123+
bool contains = false;
124+
for(const QVariant &var : value["data"].toList())
139125
{
140126
if(var.isNull())
141127
{
142128
continue;
143129
}
144130

145-
value = var.toMap();
131+
QVariantMap value = var.toMap();
146132
TTK_NETWORK_QUERY_CHECK();
147133

148-
if(!contains && value["fmId"].toString() == m_queryValue)
134+
MusicResultDataItem item;
135+
item.m_nickName = value["className"].toString();
136+
137+
for(const QVariant &var : value["fm_list"].toList())
149138
{
150-
contains = true;
151-
item.m_name = value["fmName"].toString();
152-
item.m_id = value["fmId"].toString();
153-
item.m_coverUrl = value["imgUrlMv"].toString();
154-
Q_EMIT createMVRadioItem(item);
139+
if(var.isNull())
140+
{
141+
continue;
142+
}
155143

156-
for(const QVariant &var : value["mvs"].toList())
144+
value = var.toMap();
145+
TTK_NETWORK_QUERY_CHECK();
146+
147+
if(!contains && value["fmId"].toString() == m_queryValue)
157148
{
158-
if(var.isNull())
149+
contains = true;
150+
item.m_name = value["fmName"].toString();
151+
item.m_id = value["fmId"].toString();
152+
item.m_coverUrl = value["imgUrlMv"].toString();
153+
Q_EMIT createMVRadioItem(item);
154+
155+
for(const QVariant &var : value["mvs"].toList())
159156
{
160-
continue;
161-
}
157+
if(var.isNull())
158+
{
159+
continue;
160+
}
162161

163-
value = var.toMap();
164-
TTK_NETWORK_QUERY_CHECK();
162+
value = var.toMap();
163+
TTK_NETWORK_QUERY_CHECK();
165164

166-
TTK::MusicSongInformation info;
167-
info.m_songId = value["mvhash"].toString();
168-
info.m_songName = TTK::String::charactersReplace(value["name"].toString());
165+
TTK::MusicSongInformation info;
166+
info.m_songId = value["mvhash"].toString();
167+
info.m_songName = TTK::String::charactersReplace(value["name"].toString());
169168

170-
info.m_artistName = info.m_songName;
171-
if(info.m_artistName.contains(TTK_DEFAULT_STR))
172-
{
173-
const QStringList &ds = info.m_artistName.split(TTK_DEFAULT_STR);
174-
if(ds.count() >= 2)
169+
info.m_artistName = info.m_songName;
170+
if(info.m_artistName.contains(TTK_DEFAULT_STR))
175171
{
176-
info.m_artistName = ds.front().trimmed();
177-
info.m_songName = ds.back().trimmed();
172+
const QStringList &ds = info.m_artistName.split(TTK_DEFAULT_STR);
173+
if(ds.count() >= 2)
174+
{
175+
info.m_artistName = ds.front().trimmed();
176+
info.m_songName = ds.back().trimmed();
177+
}
178178
}
179-
}
180179

181-
info.m_duration = TTKTime::formatDuration(value["time"].toInt());
180+
info.m_duration = TTKTime::formatDuration(value["time"].toInt());
182181

183-
TTK_NETWORK_QUERY_CHECK();
184-
ReqKGInterface::parseFromMovieProperty(&info);
185-
TTK_NETWORK_QUERY_CHECK();
182+
TTK_NETWORK_QUERY_CHECK();
183+
ReqKGInterface::parseFromMovieProperty(&info);
184+
TTK_NETWORK_QUERY_CHECK();
186185

187-
if(info.m_songProps.isEmpty())
188-
{
189-
continue;
190-
}
186+
if(info.m_songProps.isEmpty())
187+
{
188+
continue;
189+
}
191190

192-
Q_EMIT createResultItem({info});
193-
m_items << info;
191+
Q_EMIT createResultItem({info});
192+
m_items << info;
193+
}
194194
}
195195
}
196196
}

0 commit comments

Comments
 (0)