罗广聪 / ProtectGod

Go to a project
Toggle navigation Toggle navigation pinning
罗广聪
a10cdd03 1 parent 1b813115

理论上都OK了吧 提审？

Inline Side-by-side
Showing 7 changed files with 100 additions and 79 deletions
@@ -90,7 +90,10 @@ const ProtectGod = StackNavigator( @@ -90,7 +90,10 @@ const ProtectGod = StackNavigator(
90 Details: { screen: Details } 90 Details: { screen: Details }
91 },{ 91 },{
92 navigationOptions: { 92 navigationOptions: {
93 - headerTintColor: "black" 93 + // headerTintColor: "blue",
  94 + headerStyle: {
  95 + backgroundColor: "white"
  96 + }
94 } 97 }
95 } 98 }
96 ); 99 );
@@ -630,11 +630,12 @@ @@ -630,11 +630,12 @@
630 TargetAttributes = { 630 TargetAttributes = {
631 00E356ED1AD99517003FC87E = { 631 00E356ED1AD99517003FC87E = {
632 CreatedOnToolsVersion = 6.2; 632 CreatedOnToolsVersion = 6.2;
633 - DevelopmentTeam = EG4Q9YQ2UZ; 633 + DevelopmentTeam = S8LRX49C78;
634 TestTargetID = 13B07F861A680F5B00A75B9A; 634 TestTargetID = 13B07F861A680F5B00A75B9A;
635 }; 635 };
636 13B07F861A680F5B00A75B9A = { 636 13B07F861A680F5B00A75B9A = {
637 - DevelopmentTeam = EG4Q9YQ2UZ; 637 + DevelopmentTeam = S8LRX49C78;
  638 + ProvisioningStyle = Automatic;
638 }; 639 };
639 2D02E47A1E0B4A5D006451C7 = { 640 2D02E47A1E0B4A5D006451C7 = {
640 CreatedOnToolsVersion = 8.2.1; 641 CreatedOnToolsVersion = 8.2.1;
@@ -1070,7 +1071,7 @@ @@ -1070,7 +1071,7 @@
1070 isa = XCBuildConfiguration; 1071 isa = XCBuildConfiguration;
1071 buildSettings = { 1072 buildSettings = {
1072 BUNDLE_LOADER = "$(TEST_HOST)"; 1073 BUNDLE_LOADER = "$(TEST_HOST)";
1073 - DEVELOPMENT_TEAM = EG4Q9YQ2UZ; 1074 + DEVELOPMENT_TEAM = S8LRX49C78;
1074 GCC_PREPROCESSOR_DEFINITIONS = ( 1075 GCC_PREPROCESSOR_DEFINITIONS = (
1075 "DEBUG=1", 1076 "DEBUG=1",
1076 "$(inherited)", 1077 "$(inherited)",
@@ -1092,7 +1093,7 @@ @@ -1092,7 +1093,7 @@
1092 buildSettings = { 1093 buildSettings = {
1093 BUNDLE_LOADER = "$(TEST_HOST)"; 1094 BUNDLE_LOADER = "$(TEST_HOST)";
1094 COPY_PHASE_STRIP = NO; 1095 COPY_PHASE_STRIP = NO;
1095 - DEVELOPMENT_TEAM = EG4Q9YQ2UZ; 1096 + DEVELOPMENT_TEAM = S8LRX49C78;
1096 INFOPLIST_FILE = ProtectGodTests/Info.plist; 1097 INFOPLIST_FILE = ProtectGodTests/Info.plist;
1097 IPHONEOS_DEPLOYMENT_TARGET = 8.0; 1098 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1098 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; 1099 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1110,9 +1111,10 @@ @@ -1110,9 +1111,10 @@
1110 buildSettings = { 1111 buildSettings = {
1111 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 1112 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1112 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 1113 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  1114 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1113 CURRENT_PROJECT_VERSION = 1; 1115 CURRENT_PROJECT_VERSION = 1;
1114 DEAD_CODE_STRIPPING = NO; 1116 DEAD_CODE_STRIPPING = NO;
1115 - DEVELOPMENT_TEAM = EG4Q9YQ2UZ; 1117 + DEVELOPMENT_TEAM = S8LRX49C78;
1116 INFOPLIST_FILE = ProtectGod/Info.plist; 1118 INFOPLIST_FILE = ProtectGod/Info.plist;
1117 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 1119 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1118 OTHER_LDFLAGS = ( 1120 OTHER_LDFLAGS = (
@@ -1120,7 +1122,9 @@ @@ -1120,7 +1122,9 @@
1120 "-ObjC", 1122 "-ObjC",
1121 "-lc++", 1123 "-lc++",
1122 ); 1124 );
  1125 + PRODUCT_BUNDLE_IDENTIFIER = com.bhsgd.protectgod;
1123 PRODUCT_NAME = ProtectGod; 1126 PRODUCT_NAME = ProtectGod;
  1127 + PROVISIONING_PROFILE_SPECIFIER = "";
1124 VERSIONING_SYSTEM = "apple-generic"; 1128 VERSIONING_SYSTEM = "apple-generic";
1125 }; 1129 };
1126 name = Debug; 1130 name = Debug;
@@ -1130,8 +1134,9 @@ @@ -1130,8 +1134,9 @@
1130 buildSettings = { 1134 buildSettings = {
1131 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 1135 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1132 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 1136 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  1137 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1133 CURRENT_PROJECT_VERSION = 1; 1138 CURRENT_PROJECT_VERSION = 1;
1134 - DEVELOPMENT_TEAM = EG4Q9YQ2UZ; 1139 + DEVELOPMENT_TEAM = S8LRX49C78;
1135 INFOPLIST_FILE = ProtectGod/Info.plist; 1140 INFOPLIST_FILE = ProtectGod/Info.plist;
1136 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 1141 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1137 OTHER_LDFLAGS = ( 1142 OTHER_LDFLAGS = (
@@ -1139,7 +1144,9 @@ @@ -1139,7 +1144,9 @@
1139 "-ObjC", 1144 "-ObjC",
1140 "-lc++", 1145 "-lc++",
1141 ); 1146 );
  1147 + PRODUCT_BUNDLE_IDENTIFIER = com.bhsgd.protectgod;
1142 PRODUCT_NAME = ProtectGod; 1148 PRODUCT_NAME = ProtectGod;
  1149 + PROVISIONING_PROFILE_SPECIFIER = "";
1143 VERSIONING_SYSTEM = "apple-generic"; 1150 VERSIONING_SYSTEM = "apple-generic";
1144 }; 1151 };
1145 name = Release; 1152 name = Release;
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <key>CFBundleGetInfoString</key> 11 <key>CFBundleGetInfoString</key>
12 <string></string> 12 <string></string>
13 <key>CFBundleIdentifier</key> 13 <key>CFBundleIdentifier</key>
14 - <string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string> 14 + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
15 <key>CFBundleInfoDictionaryVersion</key> 15 <key>CFBundleInfoDictionaryVersion</key>
16 <string>6.0</string> 16 <string>6.0</string>
17 <key>CFBundleName</key> 17 <key>CFBundleName</key>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <key>CFBundlePackageType</key> 19 <key>CFBundlePackageType</key>
20 <string>APPL</string> 20 <string>APPL</string>
21 <key>CFBundleShortVersionString</key> 21 <key>CFBundleShortVersionString</key>
22 - <string>1.0</string> 22 + <string>1.0.0</string>
23 <key>CFBundleSignature</key> 23 <key>CFBundleSignature</key>
24 <string>????</string> 24 <string>????</string>
25 <key>CFBundleVersion</key> 25 <key>CFBundleVersion</key>
@@ -122,7 +122,7 @@ export default class Home extends Component { @@ -122,7 +122,7 @@ export default class Home extends Component {
122 height={imgHeight} 122 height={imgHeight}
123 dotStyle={{ 123 dotStyle={{
124 width: 6, 124 width: 6,
125 - height: 6 125 + height: 6,
126 }} 126 }}
127 activeDotStyle={{ 127 activeDotStyle={{
128 width: 6, 128 width: 6,
@@ -189,16 +189,12 @@ export default class Home extends Component { @@ -189,16 +189,12 @@ export default class Home extends Component {
189 /> 189 />
190 </View> 190 </View>
191 <View style={styles.itemRightWrapper}> 191 <View style={styles.itemRightWrapper}>
192 - <View style={styles.textWrapper}>  
193 <Text style={styles.itemTextTop} numberOfLines={1}> 192 <Text style={styles.itemTextTop} numberOfLines={1}>
194 {item.title} 193 {item.title}
195 </Text> 194 </Text>
196 - </View>  
197 - <View style={styles.textWrapper}>  
198 <Text style={styles.itemTextBottom} numberOfLines={1}> 195 <Text style={styles.itemTextBottom} numberOfLines={1}>
199 {item.context} 196 {item.context}
200 </Text> 197 </Text>
201 - </View>  
202 </View> 198 </View>
203 </TouchableOpacity> 199 </TouchableOpacity>
204 ); 200 );
@@ -276,13 +272,11 @@ const styles = StyleSheet.create({ @@ -276,13 +272,11 @@ const styles = StyleSheet.create({
276 marginRight: 12 272 marginRight: 12
277 }, 273 },
278 itemRightWrapper: { 274 itemRightWrapper: {
279 - flex: 1, 275 + // flex: 1,
  276 + width: Dimensions.get("window").width - 74 - 26,
280 justifyContent: "center" 277 justifyContent: "center"
281 // paddingRight: 50 278 // paddingRight: 50
282 }, 279 },
283 - textWrapper: {  
284 - paddingRight: 13  
285 - },  
286 itemTextTop: { 280 itemTextTop: {
287 fontSize: 16, 281 fontSize: 16,
288 color: "#202020", 282 color: "#202020",
@@ -10,7 +10,8 @@ import { @@ -10,7 +10,8 @@ import {
10 TextInput, 10 TextInput,
11 Alert, 11 Alert,
12 KeyboardAvoidingView, 12 KeyboardAvoidingView,
13 - AsyncStorage 13 + AsyncStorage,
  14 + Dimensions
14 } from "react-native"; 15 } from "react-native";
15 import WebView from "../../Components/CommonWebView"; 16 import WebView from "../../Components/CommonWebView";
16 17
@@ -53,65 +54,70 @@ export default class Details extends Component { @@ -53,65 +54,70 @@ export default class Details extends Component {
53 const { data, comments } = this.state; 54 const { data, comments } = this.state;
54 return ( 55 return (
55 <View style={styles.container}> 56 <View style={styles.container}>
56 - <KeyboardAvoidingView behavior="padding" style={styles.KAVContainer}> 57 + <ScrollView
57 - <ScrollView 58 + style={styles.scrollViewContainer}
58 - style={styles.scrollViewContainer} 59 + automaticallyAdjustContentInsets={false}
59 - automaticallyAdjustContentInsets={false} 60 + >
60 - > 61 + {/* 标题 */}
61 - {/* 标题 */} 62 + <Text style={styles.titleText} numberOfLines={3}>
62 - <Text style={styles.titleText} numberOfLines={3}> 63 + {data.title}
63 - {data.title} 64 + </Text>
64 - </Text>  
65 65
66 - {/* 个人信息 */} 66 + {/* 个人信息 */}
67 - <View style={styles.personContainer}> 67 + <View style={styles.personContainer}>
68 - <Image 68 + <Image
69 - style={styles.personImg} 69 + style={styles.personImg}
70 - source={require("../../assets/Mine/iconpic1.png")} 70 + source={require("../../assets/Mine/iconpic1.png")}
71 - /> 71 + />
72 - <View style={styles.personRightContainer}> 72 + <View style={styles.personRightContainer}>
73 - <View style={styles.personRTContainer}> 73 + <View style={styles.personRTContainer}>
74 - <Text style={styles.personRTName}>{data.name}</Text> 74 + <Text style={styles.personRTName}>{data.name}</Text>
75 - <Text style={styles.personRTIdentity}>{data.identity}</Text> 75 + <Text style={styles.personRTIdentity}>{data.identity}</Text>
76 - </View>  
77 - {/* 时间等请求获取 */}  
78 - <Text style={styles.personRB}>{data.time}</Text>  
79 </View> 76 </View>
  77 + {/* 时间等请求获取 */}
  78 + <Text style={styles.personRB}>{data.time}</Text>
80 </View> 79 </View>
  80 + </View>
81 81
82 - {/* 正文 */} 82 + {/* 正文 */}
83 - <Text style={styles.content}>{data.content}</Text> 83 + <Text style={styles.content}>{data.content}</Text>
84 - <Text style={styles.copyright}>本文版权归 {data.name} 所有</Text> 84 + <Text style={styles.copyright}>本文版权归 {data.name} 所有</Text>
85 85
86 - {/* 评论 */} 86 + {/* 评论 */}
87 - <View style={styles.commentsContainer}> 87 + <View style={styles.commentsContainer}>
88 - <View style={styles.commentsHeader}> 88 + <View style={styles.commentsHeader}>
89 - <Text style={styles.commentsHeaderL}>评论</Text> 89 + <Text style={styles.commentsHeaderL}>评论</Text>
90 - <Text style={styles.commentsHeaderR}> 90 + <Text style={styles.commentsHeaderR}>
91 - {/* ( {comments.length} ) */} 91 + {/* ( {comments.length} ) */}
92 - </Text> 92 + </Text>
93 - </View> 93 + </View>
94 - {this.state.comments.map((item, index) => { 94 + {this.state.comments.map((item, index) => {
95 - return ( 95 + return (
96 - <View style={styles.itemContainer} key={index}> 96 + <View style={styles.itemContainer} key={index}>
97 - <Image 97 + <Image
98 - style={styles.itemIcon} 98 + style={styles.itemIcon}
99 - source={require("../../assets/Mine/iconpic1.png")} 99 + source={require("../../assets/Mine/iconpic1.png")}
100 - /> 100 + />
101 - <View style={styles.itemRightContainer}> 101 + <View style={styles.itemRightContainer}>
102 - <View style={styles.itemRightTop}> 102 + <View style={styles.itemRightTop}>
103 - <View style={styles.itemRightTopLeft}> 103 + <View style={styles.itemRightTopLeft}>
104 - <Text style={styles.itemReplyer}>{item.user}</Text> 104 + <Text style={styles.itemReplyer}>{item.user}</Text>
105 - </View>  
106 - <Text style={styles.itemTime}>{item.time}</Text>  
107 </View> 105 </View>
108 - <Text style={styles.itemRightBottom}>{item.content}</Text> 106 + <Text style={styles.itemTime}>{item.time}</Text>
109 </View> 107 </View>
  108 + <Text style={styles.itemRightBottom}>{item.content}</Text>
110 </View> 109 </View>
111 - ); 110 + </View>
112 - })} 111 + );
113 - </View> 112 + })}
114 - </ScrollView> 113 + </View>
  114 + </ScrollView>
  115 + <KeyboardAvoidingView
  116 + behavior="padding"
  117 + keyboardVerticalOffset={60}
  118 + style={styles.KAVContainer}
  119 + contentContainerStyle={styles.contentContainerStyle}
  120 + >
115 {/* 回复框 */} 121 {/* 回复框 */}
116 <View style={styles.sendMsgContaier}> 122 <View style={styles.sendMsgContaier}>
117 <TextInput 123 <TextInput
@@ -226,8 +232,9 @@ const styles = StyleSheet.create({ @@ -226,8 +232,9 @@ const styles = StyleSheet.create({
226 backgroundColor: "white" 232 backgroundColor: "white"
227 }, 233 },
228 KAVContainer: { 234 KAVContainer: {
229 - flex: 1, 235 + // flex: 1,
230 justifyContent: "center" 236 justifyContent: "center"
  237 + // paddingBottom: 52,
231 // paddingHorizontal: 20, 238 // paddingHorizontal: 20,
232 // paddingTop: 20, 239 // paddingTop: 20,
233 }, 240 },
@@ -365,7 +372,10 @@ const styles = StyleSheet.create({ @@ -365,7 +372,10 @@ const styles = StyleSheet.create({
365 lineHeight: 21, 372 lineHeight: 21,
366 color: "#242424" 373 color: "#242424"
367 }, 374 },
  375 + contentContainerStyle: {},
368 sendMsgContaier: { 376 sendMsgContaier: {
  377 + // flex: 1,
  378 + width: Dimensions.get("window").width,
369 flexDirection: "row", 379 flexDirection: "row",
370 justifyContent: "center", 380 justifyContent: "center",
371 alignItems: "center", 381 alignItems: "center",
@@ -376,6 +386,8 @@ const styles = StyleSheet.create({ @@ -376,6 +386,8 @@ const styles = StyleSheet.create({
376 borderColor: "#E8E8E8", 386 borderColor: "#E8E8E8",
377 borderTopWidth: 1, 387 borderTopWidth: 1,
378 backgroundColor: "#E6E6E6" 388 backgroundColor: "#E6E6E6"
  389 + // position: "absolute",
  390 + // bottom: 0,
379 }, 391 },
380 msgInput: { 392 msgInput: {
381 flex: 1, 393 flex: 1,
@@ -20,7 +20,7 @@ export default class InsuranceCircle extends Component { @@ -20,7 +20,7 @@ export default class InsuranceCircle extends Component {
20 }; 20 };
21 } 21 }
22 22
23 - componentDidMount() { 23 + componentWillMount() {
24 this.getArticles(); 24 this.getArticles();
25 } 25 }
26 26
@@ -52,7 +52,11 @@ export default class Login extends Component { @@ -52,7 +52,11 @@ export default class Login extends Component {
52 const { phone, password, nickname, profession } = this.state; 52 const { phone, password, nickname, profession } = this.state;
53 return ( 53 return (
54 <View style={styles.container}> 54 <View style={styles.container}>
55 - <KeyboardAvoidingView behavior="padding" style={styles.KAVContainer}> 55 + <KeyboardAvoidingView
  56 + behavior="padding"
  57 + style={styles.KAVContainer}
  58 + >
  59 + <View>
56 <Text style={styles.appName}>保护神</Text> 60 <Text style={styles.appName}>保护神</Text>
57 {/* 手机号 */} 61 {/* 手机号 */}
58 <View style={styles.inputField}> 62 <View style={styles.inputField}>
@@ -151,7 +155,6 @@ export default class Login extends Component { @@ -151,7 +155,6 @@ export default class Login extends Component {
151 <Text style={styles.confirmText}>注册</Text> 155 <Text style={styles.confirmText}>注册</Text>
152 </TouchableOpacity> 156 </TouchableOpacity>
153 )} 157 )}
154 -  
155 {/* 点击切换 不用管这里 */} 158 {/* 点击切换 不用管这里 */}
156 {!this.state.isRegister ? ( 159 {!this.state.isRegister ? (
157 <TouchableOpacity 160 <TouchableOpacity
@@ -180,6 +183,7 @@ export default class Login extends Component { @@ -180,6 +183,7 @@ export default class Login extends Component {
180 <Text style={styles.register}>登录</Text> 183 <Text style={styles.register}>登录</Text>
181 </TouchableOpacity> 184 </TouchableOpacity>
182 )} 185 )}
  186 + </View>
183 </KeyboardAvoidingView> 187 </KeyboardAvoidingView>
184 </View> 188 </View>
185 ); 189 );
@@ -310,22 +314,23 @@ export default class Login extends Component { @@ -310,22 +314,23 @@ export default class Login extends Component {
310 const styles = StyleSheet.create({ 314 const styles = StyleSheet.create({
311 container: { 315 container: {
312 flex: 1, 316 flex: 1,
313 - paddingTop: 50, 317 + // paddingTop: 50,
314 justifyContent: "center", 318 justifyContent: "center",
315 alignItems: "center", 319 alignItems: "center",
316 backgroundColor: "#F5FCFF", 320 backgroundColor: "#F5FCFF",
317 paddingLeft: 38, 321 paddingLeft: 38,
318 - paddingRight: 38 322 + paddingRight: 38,
  323 + paddingBottom: 80
319 }, 324 },
320 KAVContainer: { 325 KAVContainer: {
321 - flex: 1 326 + flex: 1,
322 - // justifyContent: "center" 327 + justifyContent: "center",
323 }, 328 },
324 appName: { 329 appName: {
325 fontSize: 26, 330 fontSize: 26,
326 color: "#030303", 331 color: "#030303",
327 alignSelf: "center", 332 alignSelf: "center",
328 - marginBottom: 50 333 + marginBottom: 70
329 }, 334 },
330 inputField: { 335 inputField: {
331 flexDirection: "row", 336 flexDirection: "row",