罗广聪 / ProtectGod

Go to a project
Toggle navigation Toggle navigation pinning
罗广聪
96133a59 1 parent 63d7a625

留言部分 +每个页面标题

Inline Side-by-side
Showing 4 changed files with 63 additions and 47 deletions
@@ -598,6 +598,7 @@ @@ -598,6 +598,7 @@
598 TargetAttributes = { 598 TargetAttributes = {
599 00E356ED1AD99517003FC87E = { 599 00E356ED1AD99517003FC87E = {
600 CreatedOnToolsVersion = 6.2; 600 CreatedOnToolsVersion = 6.2;
  601 + DevelopmentTeam = EG4Q9YQ2UZ;
601 TestTargetID = 13B07F861A680F5B00A75B9A; 602 TestTargetID = 13B07F861A680F5B00A75B9A;
602 }; 603 };
603 13B07F861A680F5B00A75B9A = { 604 13B07F861A680F5B00A75B9A = {
@@ -1009,6 +1010,7 @@ @@ -1009,6 +1010,7 @@
1009 isa = XCBuildConfiguration; 1010 isa = XCBuildConfiguration;
1010 buildSettings = { 1011 buildSettings = {
1011 BUNDLE_LOADER = "$(TEST_HOST)"; 1012 BUNDLE_LOADER = "$(TEST_HOST)";
  1013 + DEVELOPMENT_TEAM = EG4Q9YQ2UZ;
1012 GCC_PREPROCESSOR_DEFINITIONS = ( 1014 GCC_PREPROCESSOR_DEFINITIONS = (
1013 "DEBUG=1", 1015 "DEBUG=1",
1014 "$(inherited)", 1016 "$(inherited)",
@@ -1030,6 +1032,7 @@ @@ -1030,6 +1032,7 @@
1030 buildSettings = { 1032 buildSettings = {
1031 BUNDLE_LOADER = "$(TEST_HOST)"; 1033 BUNDLE_LOADER = "$(TEST_HOST)";
1032 COPY_PHASE_STRIP = NO; 1034 COPY_PHASE_STRIP = NO;
  1035 + DEVELOPMENT_TEAM = EG4Q9YQ2UZ;
1033 INFOPLIST_FILE = ProtectGodTests/Info.plist; 1036 INFOPLIST_FILE = ProtectGodTests/Info.plist;
1034 IPHONEOS_DEPLOYMENT_TARGET = 8.0; 1037 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1035 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; 1038 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -27,13 +27,13 @@ export default class Home extends Component { @@ -27,13 +27,13 @@ export default class Home extends Component {
27 { 27 {
28 title: "平安保险第二个", 28 title: "平安保险第二个",
29 context: "600万医疗报废，自费药，进口药，器材费", 29 context: "600万医疗报废，自费药，进口药，器材费",
30 - url: "http://mp.weixin.qq.com/s?src=11&timestamp=1504835681&ver=379&signature=fOt9QFjJYE6jPJF-Lp82mo7Z9qorXVqlXw7CIAhR*e7tOPzm8qcuFreVBK4Gybr*7HdhuHRi9zz-JMSa9FwZ7XDfU187dkJx*85Y3dnjO4Dj-ocM1FDT2yyZy4hg41pK&new=1", 30 + url: "http://m.people.cn/n4/2017/0907/c190-9825877.html?admincptm=1504789835057",
31 imgurl: require("../../assets/circle/newspic.png") 31 imgurl: require("../../assets/circle/newspic.png")
32 }, 32 },
33 { 33 {
34 title: "平安保险第三个", 34 title: "平安保险第三个",
35 context: "600万医疗报废，自费药，进口药，器材费", 35 context: "600万医疗报废，自费药，进口药，器材费",
36 - url: "http://mp.weixin.qq.com/s/T-EzAV0-dwGHpaM8nDrtUA", 36 + url: "http://m.people.cn/n4/2017/0907/c190-9825877.html?admincptm=1504789835057",
37 imgurl: require("../../assets/circle/newspic.png") 37 imgurl: require("../../assets/circle/newspic.png")
38 }, 38 },
39 { 39 {
@@ -7,7 +7,8 @@ import { @@ -7,7 +7,8 @@ import {
7 ScrollView, 7 ScrollView,
8 TouchableOpacity, 8 TouchableOpacity,
9 Image, 9 Image,
10 - TextInput 10 + TextInput,
  11 + KeyboardAvoidingView,
11 } from "react-native"; 12 } from "react-native";
12 13
13 export default class Details extends Component { 14 export default class Details extends Component {
@@ -26,6 +27,7 @@ export default class Details extends Component { @@ -26,6 +27,7 @@ export default class Details extends Component {
26 const { data } = this.state; 27 const { data } = this.state;
27 return ( 28 return (
28 <View style={styles.container}> 29 <View style={styles.container}>
  30 + <KeyboardAvoidingView behavior="padding" style={styles.KAVContainer}>
29 <ScrollView 31 <ScrollView
30 style={styles.scrollViewContainer} 32 style={styles.scrollViewContainer}
31 automaticallyAdjustContentInsets={false} 33 automaticallyAdjustContentInsets={false}
@@ -67,12 +69,12 @@ export default class Details extends Component { @@ -67,12 +69,12 @@ export default class Details extends Component {
67 <Text style={styles.itemBeenreplyer}> 69 <Text style={styles.itemBeenreplyer}>
68 {item.beenreplyer} 70 {item.beenreplyer}
69 </Text> 71 </Text>
70 - <Text style={styles.itemTime}>{item.time}</Text>  
71 </View> 72 </View>
72 - <Image 73 + <Text style={styles.itemTime}>{item.time}</Text>
  74 + {/* <Image
73 style={styles.itemRightTopRight} 75 style={styles.itemRightTopRight}
74 source={require("../../assets/tabbar/ic_circle_n.png")} 76 source={require("../../assets/tabbar/ic_circle_n.png")}
75 - /> 77 + /> */}
76 </View> 78 </View>
77 <Text style={styles.itemRightBottom}>{item.content}</Text> 79 <Text style={styles.itemRightBottom}>{item.content}</Text>
78 </View> 80 </View>
@@ -80,24 +82,28 @@ export default class Details extends Component { @@ -80,24 +82,28 @@ export default class Details extends Component {
80 ); 82 );
81 })} 83 })}
82 </View> 84 </View>
  85 + </ScrollView>
83 {/* 回复框 */} 86 {/* 回复框 */}
84 <View style={styles.sendMsgContaier}> 87 <View style={styles.sendMsgContaier}>
85 <TextInput 88 <TextInput
86 style={styles.msgInput} 89 style={styles.msgInput}
87 - placeholder="回复 汉克斯" 90 + placeholder="留言"
88 onChangeText={text => this.setState({ text })} 91 onChangeText={text => this.setState({ text })}
89 value={this.state.text} 92 value={this.state.text}
  93 + autoCapitalize="none"
90 selectionColor="#1B9341" 94 selectionColor="#1B9341"
91 clearTextOnFocus={true} 95 clearTextOnFocus={true}
92 numberOfLines={1} 96 numberOfLines={1}
93 clearButtonMode="always" 97 clearButtonMode="always"
94 keyboardType="default" 98 keyboardType="default"
  99 + enablesReturnKeyAutomatically={true}
  100 + returnKeyType="send"
95 /> 101 />
96 - <TouchableOpacity onPress={() => this.sendMsg()}> 102 + <TouchableOpacity style={styles.sendButtonContaier} onPress={() => this.sendMsg()}>
97 <Text style={styles.sendButton}>发送</Text> 103 <Text style={styles.sendButton}>发送</Text>
98 </TouchableOpacity> 104 </TouchableOpacity>
99 </View> 105 </View>
100 - </ScrollView> 106 + </KeyboardAvoidingView>
101 </View> 107 </View>
102 ); 108 );
103 } 109 }
@@ -106,15 +112,6 @@ export default class Details extends Component { @@ -106,15 +112,6 @@ export default class Details extends Component {
106 var that = this; 112 var that = this;
107 this.setState({ 113 this.setState({
108 text: "", 114 text: "",
109 - // data: that.state.data.comments.push(  
110 - // {  
111 - // replyer: "噢噢噢",  
112 - // replayicon: require("../../assets/Mine/iconpic1.png"),  
113 - // beenreplyer: "嘿嘿嘿",  
114 - // content: this.state.text,  
115 - // time: "刚刚",  
116 - // }  
117 - // )  
118 }); 115 });
119 } 116 }
120 } 117 }
@@ -129,9 +126,14 @@ const styles = StyleSheet.create({ @@ -129,9 +126,14 @@ const styles = StyleSheet.create({
129 backgroundColor: "white", 126 backgroundColor: "white",
130 paddingTop: 64 127 paddingTop: 64
131 }, 128 },
  129 + KAVContainer: {
  130 + flex: 1,
  131 + justifyContent: 'center',
  132 + // paddingHorizontal: 20,
  133 + // paddingTop: 20,
  134 + },
132 scrollViewContainer: { 135 scrollViewContainer: {
133 - // height: 300, 136 + flex: 1,
134 - marginBottom: 64,  
135 }, 137 },
136 titleText: { 138 titleText: {
137 marginTop: 21, 139 marginTop: 21,
@@ -266,26 +268,39 @@ const styles = StyleSheet.create({ @@ -266,26 +268,39 @@ const styles = StyleSheet.create({
266 }, 268 },
267 sendMsgContaier: { 269 sendMsgContaier: {
268 flexDirection: "row", 270 flexDirection: "row",
269 - // justifyContent: "center", 271 + justifyContent: "center",
270 alignItems: "center", 272 alignItems: "center",
  273 + height: 52,
271 paddingLeft: 15, 274 paddingLeft: 15,
272 paddingRight: 15, 275 paddingRight: 15,
273 - // height: 48 276 + borderStyle: "solid",
274 - // position: "absolute", 277 + borderColor: "#E8E8E8",
275 - // bottom: 60, 278 + borderTopWidth: 1,
276 - // right: 0, 279 + backgroundColor: "#E6E6E6",
277 - // backgroundColor: "white",  
278 }, 280 },
279 msgInput: { 281 msgInput: {
280 - flex: 7, 282 + flex: 1,
281 - fontSize: 15 283 + fontSize: 15,
282 - // color: "#999999", 284 + borderWidth: 1,
  285 + borderColor: "#DCDCDC",
  286 + borderRadius: 4,
  287 + paddingTop: 8,
  288 + paddingBottom: 7,
  289 + paddingLeft: 13,
  290 + backgroundColor: "white",
  291 + },
  292 + sendButtonContaier: {
  293 + // flex: 1,
  294 + alignItems: "center",
  295 + justifyContent: "center",
283 }, 296 },
284 sendButton: { 297 sendButton: {
285 - flex: 3, 298 +
286 fontSize: 15, 299 fontSize: 15,
  300 + marginLeft: 15 ,
287 color: "#1B9341", 301 color: "#1B9341",
288 borderColor: "#E6E6E6", 302 borderColor: "#E6E6E6",
289 - 303 + borderStyle: "solid",
  304 + borderLeftWidth: 0.5,
290 } 305 }
291 }); 306 });
@@ -15,25 +15,24 @@ import InsuranceChurch from "./InsuranceChurch/index"; @@ -15,25 +15,24 @@ import InsuranceChurch from "./InsuranceChurch/index";
15 import Mine from "./Mine/index"; 15 import Mine from "./Mine/index";
16 import Login from "./Login"; 16 import Login from "./Login";
17 17
18 -var scale = Dimensions.get('window').scale; 18 +var scale = Dimensions.get("window").scale;
19 19
20 export default class Main extends Component { 20 export default class Main extends Component {
21 constructor(props) { 21 constructor(props) {
22 super(props); 22 super(props);
23 this.state = { 23 this.state = {
24 selectedItem: "home", 24 selectedItem: "home",
25 - } 25 + selectedTab: "home"
  26 + };
26 } 27 }
27 28
28 componentWillMount() { 29 componentWillMount() {
29 - console.log("loginSuccess",this.props); 30 + console.log("loginSuccess", this.props);
30 } 31 }
31 32
32 render() { 33 render() {
33 const { loginSuccess } = this.props; 34 const { loginSuccess } = this.props;
34 - return ( 35 + return loginSuccess ? (
35 - loginSuccess  
36 - ? (  
37 <TabBarIOS tintColor="#08CC6A" barTintColor="white"> 36 <TabBarIOS tintColor="#08CC6A" barTintColor="white">
38 <TabBarIOS.Item 37 <TabBarIOS.Item
39 title="首页" 38 title="首页"
@@ -49,9 +48,8 @@ export default class Main extends Component { @@ -49,9 +48,8 @@ export default class Main extends Component {
49 style={{ flex: 1 }} 48 style={{ flex: 1 }}
50 initialRoute={{ 49 initialRoute={{
51 component: Home, 50 component: Home,
52 - title: "保护神" 51 + title: "首页",
53 }} 52 }}
54 -  
55 /> 53 />
56 </TabBarIOS.Item> 54 </TabBarIOS.Item>
57 <TabBarIOS.Item 55 <TabBarIOS.Item
@@ -68,7 +66,7 @@ export default class Main extends Component { @@ -68,7 +66,7 @@ export default class Main extends Component {
68 style={{ flex: 1 }} 66 style={{ flex: 1 }}
69 initialRoute={{ 67 initialRoute={{
70 component: InsuranceCircle, 68 component: InsuranceCircle,
71 - title: "保护神", 69 + title: "保圈",
72 }} 70 }}
73 /> 71 />
74 </TabBarIOS.Item> 72 </TabBarIOS.Item>
@@ -86,7 +84,7 @@ export default class Main extends Component { @@ -86,7 +84,7 @@ export default class Main extends Component {
86 style={{ flex: 1 }} 84 style={{ flex: 1 }}
87 initialRoute={{ 85 initialRoute={{
88 component: InsuranceChurch, 86 component: InsuranceChurch,
89 - title: "保护神" 87 + title: "保堂"
90 }} 88 }}
91 /> 89 />
92 </TabBarIOS.Item> 90 </TabBarIOS.Item>
@@ -102,10 +100,9 @@ export default class Main extends Component { @@ -102,10 +100,9 @@ export default class Main extends Component {
102 > 100 >
103 <NavigatorIOS 101 <NavigatorIOS
104 style={{ flex: 1 }} 102 style={{ flex: 1 }}
105 -  
106 initialRoute={{ 103 initialRoute={{
107 component: Mine, 104 component: Mine,
108 - title: "保护神", 105 + title: "我的",
109 passProps: { 106 passProps: {
110 onLogin: this.props.onLogin 107 onLogin: this.props.onLogin
111 } 108 }
@@ -113,10 +110,11 @@ export default class Main extends Component { @@ -113,10 +110,11 @@ export default class Main extends Component {
113 /> 110 />
114 </TabBarIOS.Item> 111 </TabBarIOS.Item>
115 </TabBarIOS> 112 </TabBarIOS>
116 - ) 113 + ) : (
117 - : ( 114 + <Login
118 - <Login loginSuccess={this.props.loginSuccess} onLogin={this.props.onLogin} /> 115 + loginSuccess={this.props.loginSuccess}
119 - ) 116 + onLogin={this.props.onLogin}
  117 + />
120 ); 118 );
121 } 119 }
122 } 120 }