提交 4adbcbcd 编写于 作者: MHT_ZJL_'s avatar MHT_ZJL_

139_修改

上级 3ae6bf90
...@@ -95,7 +95,7 @@ class JiShi extends Component { ...@@ -95,7 +95,7 @@ class JiShi extends Component {
} }
if ( if (
this.state.state1 == 1 && this.state.state1 == 1 &&
(this.state.dao == null || this.state.dao == 0) (this.state.dao == null || this.state.dao == 0 || this.state.dao > 1440)
) { ) {
alert('请先输入倒计时分钟'); alert('请先输入倒计时分钟');
this.lastClickTime = 0; this.lastClickTime = 0;
...@@ -169,7 +169,10 @@ class JiShi extends Component { ...@@ -169,7 +169,10 @@ class JiShi extends Component {
<View style={styles.icon1}> <View style={styles.icon1}>
<Image style={styles.icon} source={require('../img/jishi.png')} /> <Image style={styles.icon} source={require('../img/jishi.png')} />
</View> </View>
<View style={{display: this.state.displayName}}> <View
style={{
display: this.state.displayName,
}}>
<TouchableOpacity <TouchableOpacity
style={styles.button} style={styles.button}
onPress={this.countTime.bind(this)}> onPress={this.countTime.bind(this)}>
...@@ -180,7 +183,7 @@ class JiShi extends Component { ...@@ -180,7 +183,7 @@ class JiShi extends Component {
display: this.state.rDisplay, display: this.state.rDisplay,
position: 'absolute', position: 'absolute',
top: parseInt(height) / 1.7, top: parseInt(height) / 1.7,
left: parseInt(width) / 2.8, left: parseInt(width) / 3,
}}> }}>
<RadioGroup <RadioGroup
onSelect={(index, value) => this.onSelect(index, value)}> onSelect={(index, value) => this.onSelect(index, value)}>
...@@ -196,10 +199,11 @@ class JiShi extends Component { ...@@ -196,10 +199,11 @@ class JiShi extends Component {
<View <View
style={{ style={{
display: this.state.tDisplay, display: this.state.tDisplay,
width: parseInt(width), //窗口宽度
justifyContent: 'center',
alignItems: 'center',
position: 'absolute', position: 'absolute',
top: parseInt(height) / 1.4, top: parseInt(height) / 1.4,
left: parseInt(width) / 4,
height: parseInt(height) / 12,
}}> }}>
<MyBanner <MyBanner
containerStyle={styles.myButton} containerStyle={styles.myButton}
...@@ -218,7 +222,7 @@ class JiShi extends Component { ...@@ -218,7 +222,7 @@ class JiShi extends Component {
display: this.state.sDisplay, display: this.state.sDisplay,
position: 'absolute', position: 'absolute',
top: parseInt(height) / 1.6, top: parseInt(height) / 1.6,
left: parseInt(width) / 2.8, left: parseInt(width) / 3,
}}> }}>
<TextInput <TextInput
placeholder="请输入倒计时分钟" placeholder="请输入倒计时分钟"
...@@ -264,7 +268,7 @@ const styles = StyleSheet.create({ ...@@ -264,7 +268,7 @@ const styles = StyleSheet.create({
borderWidth: parseInt(width) / 180, borderWidth: parseInt(width) / 180,
position: 'absolute', position: 'absolute',
top: parseInt(height) / 1.3, top: parseInt(height) / 1.3,
left: parseInt(width) / 3.4, left: parseInt(width) / 3.6,
justifyContent: 'center', justifyContent: 'center',
borderRadius: 6, borderRadius: 6,
alignItems: 'center', alignItems: 'center',
...@@ -285,10 +289,10 @@ const styles = StyleSheet.create({ ...@@ -285,10 +289,10 @@ const styles = StyleSheet.create({
}, },
button1: { button1: {
backgroundColor: '#c48c5d', backgroundColor: '#c48c5d',
justifyContent: 'center',
position: 'absolute', position: 'absolute',
top: parseInt(height) / 2, top: parseInt(height) / 2,
left: parseInt(width) / 3, left: parseInt(width) / 3,
justifyContent: 'center',
borderRadius: 3, borderRadius: 3,
width: parseInt(width) / 2.5, width: parseInt(width) / 2.5,
height: parseInt(width) / 8, height: parseInt(width) / 8,
...@@ -316,11 +320,11 @@ const styles = StyleSheet.create({ ...@@ -316,11 +320,11 @@ const styles = StyleSheet.create({
elevation: 4, elevation: 4,
}, },
showTime: { showTime: {
height: parseInt(height) / 6, width: parseInt(width), //窗口宽度
justifyContent: 'center',
alignItems: 'center',
position: 'absolute', position: 'absolute',
top: parseInt(height) / 7, top: parseInt(height) / 7,
left: parseInt(width) / 2.4,
alignItems: 'center',
}, },
timeText: { timeText: {
fontWeight: 'bold', fontWeight: 'bold',
...@@ -329,11 +333,11 @@ const styles = StyleSheet.create({ ...@@ -329,11 +333,11 @@ const styles = StyleSheet.create({
fontSize: parseInt(height) / 20, fontSize: parseInt(height) / 20,
}, },
icon1: { icon1: {
width: parseInt(width), //窗口宽度
justifyContent: 'center',
alignItems: 'center',
position: 'absolute', position: 'absolute',
top: parseInt(height) / 3.5, top: parseInt(height) / 3.5,
left: parseInt(width) / 3.5,
width: parseInt(width) / 2,
height: parseInt(width) / 2,
}, },
icon: { icon: {
opacity: 0.5, opacity: 0.5,
......
...@@ -108,9 +108,9 @@ class Meditation extends Component { ...@@ -108,9 +108,9 @@ class Meditation extends Component {
} }
if ( if (
this.state.state1 == 1 && this.state.state1 == 1 &&
(this.state.dao == null || this.state.dao == 0) (this.state.dao == null || this.state.dao == 0 || this.state.dao > 1440)
) { ) {
alert('请先输入倒计时分钟'); alert('请先输入一天范围内的倒计时分钟');
this.lastClickTime = 0; this.lastClickTime = 0;
} else { } else {
this.setState({start: this.getMyDate()}); this.setState({start: this.getMyDate()});
...@@ -192,7 +192,7 @@ class Meditation extends Component { ...@@ -192,7 +192,7 @@ class Meditation extends Component {
display: this.state.rDisplay, display: this.state.rDisplay,
position: 'absolute', position: 'absolute',
top: parseInt(height) / 1.7, top: parseInt(height) / 1.7,
left: parseInt(width) / 2.8, left: parseInt(width) / 3,
}}> }}>
<RadioGroup <RadioGroup
onSelect={(index, value) => this.onSelect(index, value)}> onSelect={(index, value) => this.onSelect(index, value)}>
...@@ -232,7 +232,7 @@ class Meditation extends Component { ...@@ -232,7 +232,7 @@ class Meditation extends Component {
display: this.state.sDisplay, display: this.state.sDisplay,
position: 'absolute', position: 'absolute',
top: parseInt(height) / 1.6, top: parseInt(height) / 1.6,
left: parseInt(width) / 2.8, left: parseInt(width) / 3,
}}> }}>
<TextInput <TextInput
placeholder="请输入倒计时分钟" placeholder="请输入倒计时分钟"
...@@ -278,7 +278,7 @@ const styles = StyleSheet.create({ ...@@ -278,7 +278,7 @@ const styles = StyleSheet.create({
borderWidth: parseInt(width) / 180, borderWidth: parseInt(width) / 180,
position: 'absolute', position: 'absolute',
top: parseInt(height) / 1.3, top: parseInt(height) / 1.3,
left: parseInt(width) / 3.4, left: parseInt(width) / 3.6,
justifyContent: 'center', justifyContent: 'center',
borderRadius: 6, borderRadius: 6,
alignItems: 'center', alignItems: 'center',
...@@ -319,11 +319,11 @@ const styles = StyleSheet.create({ ...@@ -319,11 +319,11 @@ const styles = StyleSheet.create({
elevation: 4, elevation: 4,
}, },
showTime: { showTime: {
height: parseInt(height) / 6, width: parseInt(width), //窗口宽度
position: 'absolute', justifyContent: 'center',
top: parseInt(height) / 6,
left: parseInt(width) / 2.4,
alignItems: 'center', alignItems: 'center',
position: 'absolute',
top: parseInt(height) / 7,
}, },
timeText: { timeText: {
fontWeight: 'bold', fontWeight: 'bold',
......
...@@ -250,11 +250,11 @@ const styles = StyleSheet.create({ ...@@ -250,11 +250,11 @@ const styles = StyleSheet.create({
elevation: 4, elevation: 4,
}, },
showTime: { showTime: {
height: parseInt(height) / 6, width: parseInt(width), //窗口宽度
position: 'absolute', justifyContent: 'center',
top: parseInt(height) / 6,
left: parseInt(width) / 2.4,
alignItems: 'center', alignItems: 'center',
position: 'absolute',
top: parseInt(height) / 7,
}, },
timeText: { timeText: {
fontWeight: 'bold', fontWeight: 'bold',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册