From 826cbe4b79a37c4985dd724d4a64cd1859817925 Mon Sep 17 00:00:00 2001
From: ZiJiaW <964513305@qq.com>
Date: Tue, 31 Oct 2017 22:49:47 +0800
Subject: [PATCH] modify comment display format

---
 CnBlogAndroid/App.js                        |  16 +++++-----
 CnBlogAndroid/Source/images/calender.png    | Bin 0 -> 1395 bytes
 CnBlogAndroid/Source/screens/BlogComment.js |  31 +++++++++++++++++++-
 CnBlogAndroid/Source/screens/ClassHome.js   |   2 +-
 CnBlogAndroid/Source/screens/ClassLists.js  |   2 +-
 5 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 CnBlogAndroid/Source/images/calender.png

diff --git a/CnBlogAndroid/App.js b/CnBlogAndroid/App.js
index b16e2df..c063f7f 100644
--- a/CnBlogAndroid/App.js
+++ b/CnBlogAndroid/App.js
@@ -3,7 +3,7 @@ import api from './Source/api/api.js';
 import {authData} from './Source/config'
 import * as Service from './Source/request/request.js'
 import React, { Component } from 'react';
-import 
+import {
     Platform,
     StyleSheet,
     Text,
@@ -13,7 +13,8 @@ import
     TouchableOpacity,
     Image,
     TextInput,
-    Dimensions,} from 'react-native';
+    Dimensions,
+} from 'react-native';
 import {
     StackNavigator,
     TabNavigator,
@@ -27,12 +28,11 @@ import UserInformation from './Source/screens/UserInformation'
 import ClassHome from './Source/screens/ClassHome'
 import HomeworkPost from './Source/screens/HomeworkPost'
 import BlogDetail from './Source/screens/BlogDetail'
-import PersonalSettings from './Source/screens/PersonalSettings'
-import ClassCreate from './Source/screens/ClassCreate'
 import BlogComment from './Source/screens/BlogComment'
 import ClassMember from './Source/screens/ClassMember'
 import MemberBlog from './Source/screens/MemberBlog'
-
+import ClassCreate from './Source/screens/ClassCreate'
+import PersonalSettings from './Source/screens/PersonalSettings'
 const { height, width } = Dimensions.get('window');
 class App extends Component {
     render() {
@@ -46,7 +46,7 @@ class App extends Component {
 }
 // 在App中调用的登录界面组件
 class Loginer extends Component{
-    constructor(props)
+    constructor(props){
         super(props);
         this.state = {
             username: '',
@@ -194,7 +194,7 @@ const HomeTab = TabNavigator({
     },
 })
 
-const SimpleNavigation = StackNavigator({    
+const SimpleNavigation = StackNavigator({
     Home: {
         screen: App,
         navigationOptions: {
@@ -264,7 +264,7 @@ const SimpleNavigation = StackNavigator({
                 height: 40,
                 backgroundColor: 'rgb(51,204,255)',
             }
-        }        
+        }
     },
     AfterloginTab: {
         screen: HomeTab,
diff --git a/CnBlogAndroid/Source/images/calender.png b/CnBlogAndroid/Source/images/calender.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a44cdc107237cdca7e5cbfad4490c9d75b2e151
GIT binary patch
literal 1395
zcmV-(1&sQMP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&000F#Nkl<ZXo2ln
zStxaD7=F$3l#qm6km(L7BH~K9K$$L-BvHzhE7vZRAr~Y?ij;_qQHBdqTp$!7^E_mp
z`Op7+wY1M#-&%Vu{&UW5pZ(NsuhzTQyT0dpzjxebzkY*^0OtSo0{#>%zw^-J<0FlZ
zj#6)LFKumYk%ff?1qB6BR#q0p#l?}Wt*u@iPft%YH8n+@ot;dFxw$z72M1F|Mg}D$
zB#@1b4Vjslsa}(r)}sXyt*x!p(a}M#udjcTfk07F5oKm(vW3Xu<>iH%o13Yvt&PO5
zcXD!~;^JaTOG_gwD=XFO(tNbGx3}3&f`qlTHHC$Rv7NNEw4~?fXBr<Lr^CZTMIErf
z;NT!5;o#svAt50Y9v;ptdv|w7{r&yyTMIN3IX^#V9{@+7uC9*i>+2~XAb{OFJw5%B
z%K@7K%i`z=I%;ccDIy|*$u~DQnbovFvyXgye6SDT>FG&sZf@)vI}3b%etya2@b>n`
ztO38k^X~5M>^_ba@c#ZTIdb}-NCb<*?(XdD(8I$6Q@*^staqV*0y8r+j3lh)=;%m+
zfq`F}#)Be}qoX6LuCAuFwY4uIAR%^gUEJT_Q+s<mjg5`T{$_7)Pf-Ve;|3D28i<63
zhEjQXIeB<^XeZLt)I`(M)0)hTvpqLAr|P$GZaE-u2*4(uot=@3iwjj$RB(T<=<Ktz
zvzpK9KLxB~etuq7u1Mti`dU#roKgV%Nh^e-Dr}a%O;dWuw=%ncg@py`>FHrFI6gks
z{5+mpSy`d(?rwI>Ha0fCy%xpH9vK;_{P1sQL^g*C_{MjRA)FbB6}sRTN;<r~y=h=z
zfGhivMetJ8Og{mvqU+e-g(@Q0HM!aeVHCS5R~NwtkO1Y1Kx_td;2k_2APTuYYpWvS
z=jTUxd3j&iTL7%l)z!r^d~$L!cOgiiLqkKX5JdPC12vVPBQ-TuB1bNRT%QlBBI4@m
zO7ZdW>|4Bu$;nCb_xGp7#6(%EO-xKsY-}ufd3i}>7Z(?-(De27rKF@JiF|#1okm7R
z^b#?e#>zy*&|ow~R5?2;T0|dIp}IiSy1l(+1>Mrp5;tn0i9)hmU0r1nNDMrW584G(
z3S#W<@2kpHsxmv;STsF|^}0ZeM`eop_V)JNJOL8u1`&G2&kH)RQ7BQw;T=Fd2RZW5
zk25>+NMT_iH;<tAKv+#lNnwP=SX^ABzP>&xD=U+PZvfW7AOkwm)6*q#^#6E=zBzy@
zBF@gv6crW4%_GCZ!{p=RL($RE+&luZsK?Nc%jFRyOzd_{OpHX1Ji@b-7)ImlCL)Fg
zqamWo*%A8Sv}k~IfqRf4L<-kpAp8nF2g0xzxG(6CldEZ?RS`kxYiMYY5J8`T@h7H>
zH#axjsR)uFLM$dSc6N3WIf!Czc6oWpMo(fuufEA8@c%km$P*<cC6dMn8Mm^slJz6`
z`S}uy0T_6r%)peMH(a~Ay86;lT3RZRV<2&GaKJ3{V<I>*I2I^Fbb+%C88SNLyo88*
zC{2(Q#m@uq3qc1@j^}u#jTlCAv`j<{4T?U3vRoKz3Z=F#a1Zex;~HG^ChW*BLb=cT
z7Yg?U9XvUFNX_3EibN1)&@}Dt?ow4%m85aP0`Qjuq7ott&nb}uFhj1Xso@3#5I`<M
zzCk4{1~%yA<b+-G@{j<<#;UQgky=_>3}zya*;qkA0avDIk(`_yb~Ml!@ydsP3+RWk
zv$H8TH&^yIn*W|QR2WUvG7&K}n1~n}OhgO~e*pn6_*2-(@SXqw002ovPDHLkV1gMH
BkCXra

literal 0
HcmV?d00001

diff --git a/CnBlogAndroid/Source/screens/BlogComment.js b/CnBlogAndroid/Source/screens/BlogComment.js
index a1ac378..cdbe197 100644
--- a/CnBlogAndroid/Source/screens/BlogComment.js
+++ b/CnBlogAndroid/Source/screens/BlogComment.js
@@ -23,6 +23,35 @@ const screenWidth= MyAdapter.screenWidth;
 const screenHeight= MyAdapter.screenHeight;
 // 博客评论页面
 // 接受评论数量 CommentCount 和 博客名 blogApp 以及博文Id作为参数
+// 这里定义一个用于粗略解决返回的评论字符串内包含无法解析的html标签的函数
+function CommemtHandler(data){
+    var s = data.split('');
+    var result = '';
+    var tag = 0;
+    for(var i in s)
+    {
+        if(s[i]=='>')
+        {
+            tag = 0;
+            if(s[i-1]=='/'&&s[i-2]=='r')
+            {
+                result+='\n';
+            }
+            continue;
+        }
+        if(s[i]=='<'||tag==1)
+        {
+            tag = 1;
+            continue;
+        }
+        if(s[i]=='引'||(s[i]=='用'&&s[i-1]=='引'))
+        {
+            continue;
+        }
+        result+=s[i];
+    }
+    return result;
+}
 export default class BlogComment extends Component{
     constructor(props){
         super(props);
@@ -53,7 +82,7 @@ export default class BlogComment extends Component{
                 </View>
                 <View style = {styles.textcontainer}>
                     <Text style = {{fontSize: 15, fontWeight: 'bold', color: 'black'}}>{Author}</Text>
-                    <Text style = {{color: 'black', fontSize: 12}}>{Body}</Text>
+                    <Text style = {{color: 'black', fontSize: 12}}>{CommemtHandler(Body)}</Text>
                     <View style = {{
                         flexDirection: 'row',
                         justifyContent: 'space-around',
diff --git a/CnBlogAndroid/Source/screens/ClassHome.js b/CnBlogAndroid/Source/screens/ClassHome.js
index 3e73f56..593a3f9 100644
--- a/CnBlogAndroid/Source/screens/ClassHome.js
+++ b/CnBlogAndroid/Source/screens/ClassHome.js
@@ -211,7 +211,7 @@ export default class ClassHome extends Component{
 	                        width: 0.1*screenHeight,
 	                        height: 0.1*screenHeight
 	                    }}
-	                    source={require('../images/calendar.png')}
+	                    source={require('../images/calender.png')}
 	                />
                 </TouchableHighlight>
                 <TouchableHighlight
diff --git a/CnBlogAndroid/Source/screens/ClassLists.js b/CnBlogAndroid/Source/screens/ClassLists.js
index 6ecc4ea..72d17e4 100644
--- a/CnBlogAndroid/Source/screens/ClassLists.js
+++ b/CnBlogAndroid/Source/screens/ClassLists.js
@@ -81,7 +81,7 @@ export default class ClassLists extends Component{
                         padding: 0.01*screenHeight,
                         backgroundColor:"#0588fe"
                     }}
-                    onPress={() => this.props.navigation.navigate('ClassCreate')}//关联函数
+                    onPress={this._onPress}//关联函数
                 >
                     <Text
                         style= {{