diff --git a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/base/BaseActivity.kt b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/base/BaseActivity.kt index d7fa738..986e85b 100644 --- a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/base/BaseActivity.kt +++ b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/base/BaseActivity.kt @@ -10,6 +10,11 @@ abstract class BaseActivity : AppCompatActivity(), View.OnClickListener { super.onCreate(savedInstanceState) initTheme() initEvents() + // 将状态栏的文字变为深色 + window.decorView.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + ) onActivityCreated() } diff --git a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/util/TimeUtil.kt b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/util/TimeUtil.kt index 143d231..667a627 100644 --- a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/util/TimeUtil.kt +++ b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/util/TimeUtil.kt @@ -5,14 +5,30 @@ import java.util.* object TimeUtil { +// private val weeksEN = arrayOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", +// "Saturday", "Sunday") +// private val weeksZL = arrayOf("周一", "周二", "周三", "周四", "周五", +// "周六", "周日") + /** * 获取事件 * @return 时间字符串 */ fun getTime(): String { - val simpleDateFormat = SimpleDateFormat("yyyy/MM/dd EEEE HH:mm") + val simpleDateFormat = SimpleDateFormat("yyyy/MM/dd EEEE HH:mm", Locale.CHINA) val date = Date(System.currentTimeMillis()) return simpleDateFormat.format(date).replace("星期", "周") } +// /** +// * 替换字符串中的英文星期 +// * @param str 需替换字符串 +// */ +// private fun replaceWeek(str: String) : String { +// for(i in weeks) { +// if(str.contains(i)){ +// return str.replace() +// } +// } +// } } \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml b/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml index bd9dc57..ef76a69 100644 --- a/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml +++ b/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml @@ -12,6 +12,7 @@ android:layout_height="40dp" android:layout_marginLeft="15dp" android:layout_marginRight="15dp" + android:layout_marginTop="40dp" app:layout_constraintTop_toTopOf="parent">