Skip to content

Commit 32b0ff4

Browse files
breitningbreitning
committed
update some detail.
1 parent 8423311 commit 32b0ff4

File tree

20 files changed

+95
-181
lines changed

20 files changed

+95
-181
lines changed

‎source/action/post.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ export const addPost = createAction(types.ADD_POST,
4747
async({category, data})=>{
4848
return await postService.addPost(category, data);
4949
},
50-
({category, resolved, rejected})=> {
50+
({category, data, resolved, rejected})=> {
5151
return {
5252
pending: true,
53+
url: data.LinkUrl,
5354
category,
5455
resolved,
5556
rejected
@@ -71,4 +72,4 @@ export const removePost = createAction(types.REMOVE_POST,
7172
rejected
7273
}
7374
}
74-
);
75+
);

‎source/component/listview/userQuestionList.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class UserQuestionList extends Component {
5454
}
5555

5656
renderListRow(question) {
57-
if(question && question.Id){
57+
if(question && question.Qid){
5858
return (
5959
<UserQuestionRow
60-
key={ question.Id }
60+
key={ question.Qid }
6161
question={ question }
6262
category={ category }
6363
onRowPress={ (e)=>this.onListRowPress(e) } />

‎source/component/listview/userQuestionRow.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import moment from 'moment';
1010
import _ from 'lodash';
1111
import PureRenderMixin from 'react-addons-pure-render-mixin';
1212
import Icon from 'react-native-vector-icons/Ionicons';
13-
import { decodeHTML, getQuestionAuthorAvatar } from '../../common';
13+
import { decodeHTML, getBloggerAvatar } from '../../common';
1414
import { CommonStyles, ComponentStyles, StyleConfig } from '../../style';
1515

1616
class UserQuestionRow extends Component {
@@ -93,30 +93,30 @@ class UserQuestionRow extends Component {
9393
}
9494

9595
renderQuestionMedal(questionInfo){
96+
return (
97+
<View style={[ CommonStyles.flexRow, CommonStyles.flexItemsMiddle]}>
98+
<Icon
99+
name={ "ios-flash-outline" }
100+
size= { StyleConfig.icon_size }
101+
color={ StyleConfig.color_danger } />
102+
<Text style={ [CommonStyles.p_l_1, CommonStyles.text_danger] }>
103+
{ questionInfo.Award }
104+
</Text>
105+
</View>
106+
)
107+
}
108+
109+
renderQuestionHeader(questionInfo){
96110
const award = parseInt(questionInfo.Award);
97111
if(award > 0){
98112
return (
99-
<View style={[ CommonStyles.flexRow, CommonStyles.flexItemsMiddle]}>
100-
<Icon
101-
name={ "ios-flash-outline" }
102-
size= { StyleConfig.icon_size }
103-
color={ StyleConfig.color_danger } />
104-
<Text style={ [CommonStyles.p_l_1, CommonStyles.text_danger] }>
105-
{ questionInfo.Award }
106-
</Text>
113+
<View style={ [ CommonStyles.flexRow, CommonStyles.flexItemsMiddle, CommonStyles.flexItemsBetween, CommonStyles.m_b_2 ] }>
114+
{ this.renderQuestionMedal(questionInfo) }
107115
</View>
108116
)
109117
}
110118
}
111119

112-
renderQuestionHeader(questionInfo){
113-
return (
114-
<View style={ [ CommonStyles.flexRow, CommonStyles.flexItemsMiddle, CommonStyles.flexItemsBetween, CommonStyles.m_b_2 ] }>
115-
{ this.renderQuestionMedal(questionInfo) }
116-
</View>
117-
)
118-
}
119-
120120
render() {
121121

122122
const questionInfo = this.getQuestionInfo();

‎source/component/navigation.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React, { Component } from 'react';
22
import {
33
View,
4+
NetInfo,
45
Navigator
56
} from 'react-native';
6-
7+
import { connect } from 'react-redux';
78
import Router from './router';
89
import Plugin from './plugin';
910
import ViewPage from './view';
@@ -16,16 +17,15 @@ class Navigation extends Component {
1617
constructor(props) {
1718
super(props);
1819
}
19-
20+
2021
renderScene(route, navigator) {
2122
this.router = this.router || new Router(navigator);
2223
let Component = route.component;
2324
if (Component) {
24-
let componentInstance = <Component {...route.props}
25-
ref={(view)=> { route.sceneRef = view } }
25+
return <Component {...route.props}
2626
navigator={ navigator }
27-
router={this.router} />
28-
return componentInstance;
27+
router={this.router}
28+
ref={(view)=> { route.sceneRef = view } }/>
2929
}
3030
}
3131

@@ -61,4 +61,9 @@ class Navigation extends Component {
6161
}
6262
}
6363

64-
export default Navigation;
64+
export default connect(state => ({
65+
user: state.user,
66+
}), dispatch => ({
67+
}), null, {
68+
withRef: true
69+
})(Navigation);

‎source/component/plugin.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Plugin extends Component {
3232
if (status) {
3333
this.updateHandle();
3434
}else{
35-
Toast.show("请检查你的网络连接");
35+
Toast.showLongBottom("请检查你的网络连接");
3636
}
3737
})
3838
}
@@ -65,7 +65,8 @@ class Plugin extends Component {
6565
}
6666

6767
export default connect(state => ({
68-
common : state.common
68+
common : state.common,
69+
user: state.user,
6970
}), dispatch => ({
7071
}), null, {
7172
withRef: true

‎source/component/removeModal.js

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎source/component/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Router {
3232

3333
handleHomeBackPress(){
3434
if (Platform.OS === "android") {
35-
ToastAndroid.show("再按一次你就要离开我了", ToastAndroid.SHORT);
35+
ToastAndroid.show("再按一次退出应用", ToastAndroid.SHORT);
3636
BackAndroid.removeEventListener("hardwareBackPress", this._onHomeBackPress);
3737
BackAndroid.addEventListener("hardwareBackPress", this._onExitApp);
3838
this.timer = TimerMixin.setInterval(() => {

‎source/config/api.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
detail: "api/questions/<%=id%>",
2424
add:"api/questions",
2525
remove: "api/questions/<%=id%>",
26+
status: 'api/questions/<%=id%>?userId=<%=uid%>',
2627
comments: "api/questions/<%=id%>/answers",
2728
comment_add:"api/questions/<%=id%>/answers",
2829
},
@@ -41,7 +42,7 @@ export default {
4142
favorite:{
4243
list:"api/Bookmarks?pageIndex=<%=pageIndex%>&pageSize=<%=pageSize%>",
4344
add: "api/Bookmarks",
44-
check:"api/Bookmarks?url=<%=url%>",
45+
status:"api/Bookmarks?url=<%=url%>",
4546
remove:"api/bookmarks?url=<%=url%>"
4647
},
4748
user: {

‎source/config/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default {
1515
homepage: 'https://github.com/togayther',
1616
declare: '本软件为个人学习交流作品，内容来源于博客园官方开放接口，版权归博客园及原作者所有。'
1717
},
18+
commentTail: ' 【from [url=http://fir.im/togayther]rn-cnblogs[/url]】',
1819
apiDomain:'https://api.cnblogs.com/'
1920
};
2021

‎source/reducer/post.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function updatePostCommentCount(state, category, id){
5252
export default function (state = initialState, action) {
5353

5454
const { payload, meta = {}, type, error } = action;
55-
const { sequence = {}, category, id } = meta;
55+
const { sequence = {}, category, id, url } = meta;
5656

5757
if (sequence.type === 'start' || error) {
5858
return state;
@@ -84,9 +84,9 @@ export default function (state = initialState, action) {
8484
...state
8585
};
8686
case types.REMOVE_POST:
87-
return removePost(state, category, id)
87+
return removePost(state, category, id);
8888
case types.ADD_COMMENT:
89-
return updatePostCommentCount(state, category, id)
89+
return updatePostCommentCount(state, category, id);
9090
default:
9191
return state;
9292
}

‎source/service/authorService.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ import * as requestService from './request';
33
import { pageSize } from '../config';
44
import dataApi from '../config/api';
55

6-
export function getAuthorsByKey(key){
7-
//todo
8-
}
9-
106
export function getAuthorDetail(blogger){
117
let params = { blogger };
128

‎source/service/request.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@ function filterStatus(res) {
2020
if (res.ok) {
2121
return res;
2222
} else {
23-
console.info("filterStatus");
24-
console.info(res);
25-
res.text().then((data)=>{
26-
console.info(data);
27-
});
28-
//throw new Error('server handle error');
23+
throw new Error('server handle error');
2924
}
3025
}
3126

@@ -64,7 +59,9 @@ export function request(uri, type = "GET", headers = {}, data = ""){
6459

6560
if(__DEV__){
6661
console.log("fetch data from uri:");
67-
console.log(uri)
62+
console.log(uri);
63+
console.log("type");
64+
console.log(type);
6865
console.log("headers:");
6966
console.log(headers);
7067
console.log("data:");

‎source/service/searchService.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ import dataApi from '../config/api';
44

55
export function searchByKey(category, key, params = {}){
66
params.key = key;
7-
87
let fetchApi = dataApi.search[category];
9-
108
let strCompiled = _.template(fetchApi);
119
fetchApi = strCompiled(params);
12-
1310
return requestService.get(fetchApi);
1411
}

‎source/service/userService.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import _ from 'lodash';
2-
32
import * as requestService from './request';
43
import { Base64 } from '../common/base64';
54
import * as storageService from './storage';

‎source/style/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
import React, { Component } from 'react';
31
import {
42
Image,
53
StyleSheet,

‎source/view/blinkAdd.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class BlinkAddPage extends Component {
4848
if(!_.trim(blinkContent)){
4949
message = "请输入闪存内容";
5050
}
51-
5251
else if(blinkContent.length <=3){
5352
message = "闪存内容太少了吧";
5453
}

0 commit comments

Comments
 (0)