罗广聪 / 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(
Details: { screen: Details }
},{
navigationOptions: {
headerTintColor: "black"
// headerTintColor: "blue",
headerStyle: {
backgroundColor: "white"
}
}
}
);
... ...
... ... @@ -630,11 +630,12 @@
TargetAttributes = {
00E356ED1AD99517003FC87E = {
CreatedOnToolsVersion = 6.2;
DevelopmentTeam = EG4Q9YQ2UZ;
DevelopmentTeam = S8LRX49C78;
TestTargetID = 13B07F861A680F5B00A75B9A;
};
13B07F861A680F5B00A75B9A = {
DevelopmentTeam = EG4Q9YQ2UZ;
DevelopmentTeam = S8LRX49C78;
ProvisioningStyle = Automatic;
};
2D02E47A1E0B4A5D006451C7 = {
CreatedOnToolsVersion = 8.2.1;
... ... @@ -1070,7 +1071,7 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = EG4Q9YQ2UZ;
DEVELOPMENT_TEAM = S8LRX49C78;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
... ... @@ -1092,7 +1093,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = EG4Q9YQ2UZ;
DEVELOPMENT_TEAM = S8LRX49C78;
INFOPLIST_FILE = ProtectGodTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
... ... @@ -1110,9 +1111,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = EG4Q9YQ2UZ;
DEVELOPMENT_TEAM = S8LRX49C78;
INFOPLIST_FILE = ProtectGod/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
... ... @@ -1120,7 +1122,9 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = com.bhsgd.protectgod;
PRODUCT_NAME = ProtectGod;
PROVISIONING_PROFILE_SPECIFIER = "";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
... ... @@ -1130,8 +1134,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = EG4Q9YQ2UZ;
DEVELOPMENT_TEAM = S8LRX49C78;
INFOPLIST_FILE = ProtectGod/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
... ... @@ -1139,7 +1144,9 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = com.bhsgd.protectgod;
PRODUCT_NAME = ProtectGod;
PROVISIONING_PROFILE_SPECIFIER = "";
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
... ...
... ... @@ -11,7 +11,7 @@
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
... ... @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
... ...
... ... @@ -122,7 +122,7 @@ export default class Home extends Component {
height={imgHeight}
dotStyle={{
width: 6,
height: 6
height: 6,
}}
activeDotStyle={{
width: 6,
... ... @@ -189,16 +189,12 @@ export default class Home extends Component {
/>
</View>
<View style={styles.itemRightWrapper}>
<View style={styles.textWrapper}>
<Text style={styles.itemTextTop} numberOfLines={1}>
{item.title}
</Text>
</View>
<View style={styles.textWrapper}>
<Text style={styles.itemTextBottom} numberOfLines={1}>
{item.context}
</Text>
</View>
</View>
</TouchableOpacity>
);
... ... @@ -276,13 +272,11 @@ const styles = StyleSheet.create({
marginRight: 12
},
itemRightWrapper: {
flex: 1,
// flex: 1,
width: Dimensions.get("window").width - 74 - 26,
justifyContent: "center"
// paddingRight: 50
},
textWrapper: {
paddingRight: 13
},
itemTextTop: {
fontSize: 16,
color: "#202020",
... ...
... ... @@ -10,7 +10,8 @@ import {
TextInput,
Alert,
KeyboardAvoidingView,
AsyncStorage
AsyncStorage,
Dimensions
} from "react-native";
import WebView from "../../Components/CommonWebView";
... ... @@ -53,65 +54,70 @@ export default class Details extends Component {
const { data, comments } = this.state;
return (
<View style={styles.container}>
<KeyboardAvoidingView behavior="padding" style={styles.KAVContainer}>
<ScrollView
style={styles.scrollViewContainer}
automaticallyAdjustContentInsets={false}
>
{/* 标题 */}
<Text style={styles.titleText} numberOfLines={3}>
{data.title}
</Text>
<ScrollView
style={styles.scrollViewContainer}
automaticallyAdjustContentInsets={false}
>
{/* 标题 */}
<Text style={styles.titleText} numberOfLines={3}>
{data.title}
</Text>
{/* 个人信息 */}
<View style={styles.personContainer}>
<Image
style={styles.personImg}
source={require("../../assets/Mine/iconpic1.png")}
/>
<View style={styles.personRightContainer}>
<View style={styles.personRTContainer}>
<Text style={styles.personRTName}>{data.name}</Text>
<Text style={styles.personRTIdentity}>{data.identity}</Text>
</View>
{/* 时间等请求获取 */}
<Text style={styles.personRB}>{data.time}</Text>
{/* 个人信息 */}
<View style={styles.personContainer}>
<Image
style={styles.personImg}
source={require("../../assets/Mine/iconpic1.png")}
/>
<View style={styles.personRightContainer}>
<View style={styles.personRTContainer}>
<Text style={styles.personRTName}>{data.name}</Text>
<Text style={styles.personRTIdentity}>{data.identity}</Text>
</View>
{/* 时间等请求获取 */}
<Text style={styles.personRB}>{data.time}</Text>
</View>
</View>
{/* 正文 */}
<Text style={styles.content}>{data.content}</Text>
<Text style={styles.copyright}>本文版权归 {data.name} 所有</Text>
{/* 正文 */}
<Text style={styles.content}>{data.content}</Text>
<Text style={styles.copyright}>本文版权归 {data.name} 所有</Text>
{/* 评论 */}
<View style={styles.commentsContainer}>
<View style={styles.commentsHeader}>
<Text style={styles.commentsHeaderL}>评论</Text>
<Text style={styles.commentsHeaderR}>
{/* ( {comments.length} ) */}
</Text>
</View>
{this.state.comments.map((item, index) => {
return (
<View style={styles.itemContainer} key={index}>
<Image
style={styles.itemIcon}
source={require("../../assets/Mine/iconpic1.png")}
/>
<View style={styles.itemRightContainer}>
<View style={styles.itemRightTop}>
<View style={styles.itemRightTopLeft}>
<Text style={styles.itemReplyer}>{item.user}</Text>
</View>
<Text style={styles.itemTime}>{item.time}</Text>
{/* 评论 */}
<View style={styles.commentsContainer}>
<View style={styles.commentsHeader}>
<Text style={styles.commentsHeaderL}>评论</Text>
<Text style={styles.commentsHeaderR}>
{/* ( {comments.length} ) */}
</Text>
</View>
{this.state.comments.map((item, index) => {
return (
<View style={styles.itemContainer} key={index}>
<Image
style={styles.itemIcon}
source={require("../../assets/Mine/iconpic1.png")}
/>
<View style={styles.itemRightContainer}>
<View style={styles.itemRightTop}>
<View style={styles.itemRightTopLeft}>
<Text style={styles.itemReplyer}>{item.user}</Text>
</View>
<Text style={styles.itemRightBottom}>{item.content}</Text>
<Text style={styles.itemTime}>{item.time}</Text>
</View>
<Text style={styles.itemRightBottom}>{item.content}</Text>
</View>
);
})}
</View>
</ScrollView>
</View>
);
})}
</View>
</ScrollView>
<KeyboardAvoidingView
behavior="padding"
keyboardVerticalOffset={60}
style={styles.KAVContainer}
contentContainerStyle={styles.contentContainerStyle}
>
{/* 回复框 */}
<View style={styles.sendMsgContaier}>
<TextInput
... ... @@ -226,8 +232,9 @@ const styles = StyleSheet.create({
backgroundColor: "white"
},
KAVContainer: {
flex: 1,
// flex: 1,
justifyContent: "center"
// paddingBottom: 52,
// paddingHorizontal: 20,
// paddingTop: 20,
},
... ... @@ -365,7 +372,10 @@ const styles = StyleSheet.create({
lineHeight: 21,
color: "#242424"
},
contentContainerStyle: {},
sendMsgContaier: {
// flex: 1,
width: Dimensions.get("window").width,
flexDirection: "row",
justifyContent: "center",
alignItems: "center",
... ... @@ -376,6 +386,8 @@ const styles = StyleSheet.create({
borderColor: "#E8E8E8",
borderTopWidth: 1,
backgroundColor: "#E6E6E6"
// position: "absolute",
// bottom: 0,
},
msgInput: {
flex: 1,
... ...
... ... @@ -20,7 +20,7 @@ export default class InsuranceCircle extends Component {
};
}
componentDidMount() {
componentWillMount() {
this.getArticles();
}
... ...
... ... @@ -52,7 +52,11 @@ export default class Login extends Component {
const { phone, password, nickname, profession } = this.state;
return (
<View style={styles.container}>
<KeyboardAvoidingView behavior="padding" style={styles.KAVContainer}>
<KeyboardAvoidingView
behavior="padding"
style={styles.KAVContainer}
>
<View>
<Text style={styles.appName}>保护神</Text>
{/* 手机号 */}
<View style={styles.inputField}>
... ... @@ -151,7 +155,6 @@ export default class Login extends Component {
<Text style={styles.confirmText}>注册</Text>
</TouchableOpacity>
)}
{/* 点击切换 不用管这里 */}
{!this.state.isRegister ? (
<TouchableOpacity
... ... @@ -180,6 +183,7 @@ export default class Login extends Component {
<Text style={styles.register}>登录</Text>
</TouchableOpacity>
)}
</View>
</KeyboardAvoidingView>
</View>
);
... ... @@ -310,22 +314,23 @@ export default class Login extends Component {
const styles = StyleSheet.create({
container: {
flex: 1,
paddingTop: 50,
// paddingTop: 50,
justifyContent: "center",
alignItems: "center",
backgroundColor: "#F5FCFF",
paddingLeft: 38,
paddingRight: 38
paddingRight: 38,
paddingBottom: 80
},
KAVContainer: {
flex: 1
// justifyContent: "center"
flex: 1,
justifyContent: "center",
},
appName: {
fontSize: 26,
color: "#030303",
alignSelf: "center",
marginBottom: 50
marginBottom: 70
},
inputField: {
flexDirection: "row",
... ...