diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6452a95..94266cf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + + + + + @@ -41,43 +48,43 @@ + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + android:screenOrientation="landscape" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/confirm_btn_bg.xml b/app/src/main/res/drawable/confirm_btn_bg.xml new file mode 100644 index 0000000..3caee33 --- /dev/null +++ b/app/src/main/res/drawable/confirm_btn_bg.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/light_seekbar_progress_drawable.xml b/app/src/main/res/drawable/light_seekbar_progress_drawable.xml new file mode 100644 index 0000000..8107ddc --- /dev/null +++ b/app/src/main/res/drawable/light_seekbar_progress_drawable.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_light_setting.xml b/app/src/main/res/layout/activity_light_setting.xml index d829e29..cc3ae92 100644 --- a/app/src/main/res/layout/activity_light_setting.xml +++ b/app/src/main/res/layout/activity_light_setting.xml @@ -1,7 +1,60 @@ + android:layout_height="match_parent" + android:gravity="center_horizontal" + android:orientation="vertical"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_light.png b/app/src/main/res/mipmap-hdpi/ic_light.png new file mode 100644 index 0000000..5abffcc Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_light.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e550f20..ae94474 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,6 +6,7 @@ #ffffff #33ffffff + #4Cffffff #1ED5CA #66000000 @@ -14,7 +15,9 @@ #4C242F4D #303852 #2A4284 + #4C2A4284 #842A2A + #505971 #01E41C #999999 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 7f368d1..6e17cda 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -46,4 +46,11 @@ 20px 17px 300px + 960px + 511px + 201px + 140px + 630px + 81px + 480px \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 26489ee..63e3689 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,8 @@ 传感器名称 传感器量程 传感器种类 + 取消 + 确认 时间 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 66c4e6e..70e8928 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,7 +27,7 @@ - + + + +