From fefc8e47fbcd022a3fbea34ff0bfb64a7bc2b61f Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Thu, 15 Sep 2022 17:58:45 +0800 Subject: [PATCH] =?UTF-8?q?version:3.4=20fix:=20update:=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=9C=86=E5=BD=A2=EF=BC=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../com/uiui/aios/adapter/AlarmAdapter.java | 22 +++--- .../aios/adapter/NotificationAdapter.java | 18 ++++- .../uiui/aios/fragment/CustomFragment.java | 3 +- .../main/res/layout-land/fragment_custom.xml | 5 +- .../main/res/layout-port/fragment_custom.xml | 69 +++++++++++-------- 6 files changed, 77 insertions(+), 44 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8c4b5ed..7fe5205 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 23 - versionName "3.2" + versionCode 25 + versionName "3.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java b/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java index 17bada6..ecd7590 100644 --- a/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java @@ -30,6 +30,9 @@ import com.uiui.aios.view.JzvdStdRound; import com.uiui.aios.view.MyJzvdStdNoTitleNoClarity; import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.regex.Pattern; @@ -58,16 +61,15 @@ public class AlarmAdapter extends RecyclerView.Adapter { AlarmClockData alarmClockData = mAlarmClockData.get(position); switch (alarmClockData.getType()) { case 1: -// try { -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); -// Date date = sdf.parse(alarmClockData.getTime()); -// SimpleDateFormat hours = new SimpleDateFormat("HH:mm"); -// String time = hours.format(date); -// holder.tv_time.setText(time); -// } catch (ParseException e) { -// e.printStackTrace(); -// } - holder.tv_time.setText(alarmClockData.getTime()); + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Date date = sdf.parse(alarmClockData.getTime()); + SimpleDateFormat hours = new SimpleDateFormat("HH:mm"); + String time = hours.format(date); + holder.tv_time.setText(time); + } catch (ParseException e) { + e.printStackTrace(); + } holder.tv_remind_type.setText("单次"); break; case 2: diff --git a/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java b/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java index c13e947..7ce5523 100644 --- a/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java +++ b/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java @@ -20,6 +20,9 @@ import com.uiui.aios.bean.AlarmClockData; import com.uiui.aios.utils.FFmpegUtils; import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import io.reactivex.rxjava3.core.Observer; @@ -54,7 +57,20 @@ public class NotificationAdapter extends RecyclerView.Adapter 5) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + SimpleDateFormat hours = new SimpleDateFormat("HH:mm"); + try { + Date date = sdf.parse(time); + String hourTime = hours.format(date); + holder.tv_time.setText(hourTime); + } catch (ParseException e) { + e.printStackTrace(); + } + } else { + holder.tv_time.setText(time); + } String voice = alarmClockData.getVoice(); holder.root.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java index 4f9b6ab..48d8351 100644 --- a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java @@ -38,6 +38,7 @@ import com.qweather.sdk.bean.base.Unit; import com.qweather.sdk.bean.weather.WeatherHourlyBean; import com.qweather.sdk.bean.weather.WeatherNowBean; import com.qweather.sdk.view.QWeather; +import com.shehuan.niv.NiceImageView; import com.tencent.mmkv.MMKV; import com.uiui.aios.BuildConfig; import com.uiui.aios.R; @@ -119,7 +120,7 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt @BindView(R.id.iv_note_nodata) ImageView iv_note_nodata; @BindView(R.id.iv_head) - ImageView iv_head; + NiceImageView iv_head; @BindView(R.id.cl_health) ConstraintLayout mClHealth; diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml index fe5c47c..6ed6d74 100644 --- a/app/src/main/res/layout-land/fragment_custom.xml +++ b/app/src/main/res/layout-land/fragment_custom.xml @@ -103,13 +103,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - diff --git a/app/src/main/res/layout-port/fragment_custom.xml b/app/src/main/res/layout-port/fragment_custom.xml index a043d21..18254f1 100644 --- a/app/src/main/res/layout-port/fragment_custom.xml +++ b/app/src/main/res/layout-port/fragment_custom.xml @@ -79,7 +79,7 @@ + android:background="@drawable/custom_background" + tools:ignore="NestedWeights"> - - + + --> - + android:background="@drawable/custom_background"> + +