From 15e9854c481fcb6d75491c4620ac51f7e9725841 Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Mon, 24 Oct 2022 17:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=B9=E9=92=9F=E4=B8=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=92=AD=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++--- .../uiuios/aios/activity/NoticeActivity.java | 12 +++++++--- .../com/uiuios/aios/adapter/AlarmAdapter.java | 21 +++++++++++++----- .../uiuios/aios/service/main/MainService.java | 5 +++-- .../main/res/drawable-hdpi/finished_icon.png | Bin 0 -> 4151 bytes .../main/res/layout-land/activity_weather.xml | 8 +++---- .../main/res/layout-port/activity_weather.xml | 8 +++---- app/src/main/res/layout/activity_notice.xml | 2 +- app/src/main/res/layout/item_alarm_clock.xml | 10 ++++++++- 9 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/finished_icon.png diff --git a/app/build.gradle b/app/build.gradle index e50e8df..92d9a5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiuios.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 2 - versionName "1.1" + versionCode 3 + versionName "1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -192,7 +192,7 @@ dependencies { implementation 'com.arialyy.aria:core:3.8.15' annotationProcessor 'com.arialyy.aria:compiler:3.8.15' //videoplayer - implementation 'cn.jzvd:jiaozivideoplayer:7.7.0' + implementation 'cn.jzvd:jiaozivideoplayer:7.7.2.3300' implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.16' implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native:1.0.16' } diff --git a/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java index 4a811fc..f003899 100644 --- a/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java @@ -59,7 +59,7 @@ public class NoticeActivity extends AppCompatActivity { ConstraintLayout cl_vp; @BindView(R.id.jz_video) JzvdStdAssert jz_video; - @BindView(R.id.imageView) + @BindView(R.id.iv_cover) ImageView imageView; private AlarmClockData alarmClockData; @@ -75,6 +75,7 @@ public class NoticeActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_notice); + Log.e(TAG, "onCreate: " ); ButterKnife.bind(this); Intent intent = getIntent(); code = intent.getIntExtra("id", -1); @@ -100,6 +101,7 @@ public class NoticeActivity extends AppCompatActivity { } private void showData(AlarmClockData alarmClockData) { + Log.e(TAG, "showData: " ); audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, maxVolume, AudioManager.FLAG_PLAY_SOUND); @@ -202,6 +204,7 @@ public class NoticeActivity extends AppCompatActivity { jz_video.startPreloading(); jz_video.startVideoAfterPreloading(); jz_video.startVideo(); + } } else { cl_vp.setVisibility(View.GONE); @@ -211,6 +214,7 @@ public class NoticeActivity extends AppCompatActivity { @Override protected void onDestroy() { + Log.e(TAG, "onDestroy: " ); super.onDestroy(); if (mediaPlayer != null) { if (mediaPlayer.isPlaying()) { @@ -223,6 +227,7 @@ public class NoticeActivity extends AppCompatActivity { @Override public void onBackPressed() { + Log.e(TAG, "onDestroy: " ); if (Jzvd.backPress()) { return; } @@ -230,8 +235,9 @@ public class NoticeActivity extends AppCompatActivity { } @Override - protected void onPause() { - super.onPause(); + protected void onStop() { + Log.e(TAG, "onDestroy: " ); + super.onStop(); Jzvd.releaseAllVideos(); } } diff --git a/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java index 8a9b3bb..b510fa7 100644 --- a/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java +++ b/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java @@ -24,8 +24,10 @@ import com.uiuios.aios.R; import com.uiuios.aios.bean.AlarmClockData; import com.uiuios.aios.utils.FFmpegUtils; import com.uiuios.aios.utils.ScreenUtils; +import com.uiuios.aios.utils.Utils; import com.uiuios.aios.view.JzvdStdRound; +import java.io.File; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -140,19 +142,27 @@ public class AlarmAdapter extends RecyclerView.Adapter { }); } String url = alarmClockData.getFile(); + String fileName = url.substring(url.lastIndexOf("/") + 1, url.length()); + String realPath = Utils.getDownLoadPath(mContext) + fileName; + File file = new File(realPath); + if (file.exists()) { + holder.iv_finish.setVisibility(View.VISIBLE); + }else { + holder.iv_finish.setVisibility(View.GONE); + } if (TextUtils.isEmpty(url)) { holder.cl_vp.setVisibility(View.GONE); } else { holder.cl_vp.setVisibility(View.VISIBLE); if (isImgUrl(url)) { - holder.imageView.setVisibility(View.VISIBLE); + holder.iv_cover.setVisibility(View.VISIBLE); holder.jz_video.setVisibility(View.GONE); if (!mContext.isDestroyed()) { RequestOptions options = new RequestOptions().transform(new RoundedCorners(ScreenUtils.dip2px(mContext, 16F))); - Glide.with(mContext).load(url).apply(options).into(holder.imageView); + Glide.with(mContext).load(url).apply(options).into(holder.iv_cover); } } else { - holder.imageView.setVisibility(View.GONE); + holder.iv_cover.setVisibility(View.GONE); holder.jz_video.setVisibility(View.VISIBLE); holder.jz_video.setUp(url, ""); holder.jz_video.startButton.setImageDrawable(mContext.getDrawable(R.drawable.play)); @@ -206,7 +216,7 @@ public class AlarmAdapter extends RecyclerView.Adapter { TextView tv_time, tv_remind_type, tv_title, tv_voice; ConstraintLayout cl_voice, cl_vp; JzvdStdRound jz_video; - ImageView imageView; + ImageView iv_cover, iv_finish; Switch switch1; public holder(@NonNull View itemView) { @@ -219,7 +229,8 @@ public class AlarmAdapter extends RecyclerView.Adapter { switch1 = itemView.findViewById(R.id.switch1); cl_vp = itemView.findViewById(R.id.cl_vp); jz_video = itemView.findViewById(R.id.jz_video); - imageView = itemView.findViewById(R.id.imageView); + iv_cover = itemView.findViewById(R.id.iv_cover); + iv_finish = itemView.findViewById(R.id.iv_finish); } } } diff --git a/app/src/main/java/com/uiuios/aios/service/main/MainService.java b/app/src/main/java/com/uiuios/aios/service/main/MainService.java index 743cb9c..1b903b1 100644 --- a/app/src/main/java/com/uiuios/aios/service/main/MainService.java +++ b/app/src/main/java/com/uiuios/aios/service/main/MainService.java @@ -134,13 +134,14 @@ public class MainService extends BaseService implements MainSContact.MainSView, private class AlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Log.e(TAG, "onReceive: " + System.currentTimeMillis()); + Log.e(TAG, "onReceive: currentTimeMillis: " + System.currentTimeMillis()); String action = intent.getAction(); if (TextUtils.isEmpty(action)) return; Log.e(TAG, "onReceive: " + action); String title = intent.getStringExtra("title"); - int code = intent.getIntExtra("id", -1); Log.e(TAG, "onReceive: title = " + title); + int code = intent.getIntExtra("id", -1); + Log.e(TAG, "onReceive: code = " + code); setNextAlarm(code); if (ALARMWAKEUP.equals(action)) { Intent noticeIntent = new Intent(); diff --git a/app/src/main/res/drawable-hdpi/finished_icon.png b/app/src/main/res/drawable-hdpi/finished_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b581de958f337735236cab8b56fb75a16eb3eebd GIT binary patch literal 4151 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 BlxqM0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout-land/activity_weather.xml b/app/src/main/res/layout-land/activity_weather.xml index f57a916..b6cf942 100644 --- a/app/src/main/res/layout-land/activity_weather.xml +++ b/app/src/main/res/layout-land/activity_weather.xml @@ -55,7 +55,7 @@ app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintBottom_toBottomOf="@+id/iv_cover" + app:layout_constraintStart_toEndOf="@+id/iv_cover" + app:layout_constraintTop_toTopOf="@+id/iv_cover" /> \ No newline at end of file diff --git a/app/src/main/res/layout-port/activity_weather.xml b/app/src/main/res/layout-port/activity_weather.xml index 1892692..2cc5e4a 100644 --- a/app/src/main/res/layout-port/activity_weather.xml +++ b/app/src/main/res/layout-port/activity_weather.xml @@ -54,7 +54,7 @@ app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintBottom_toBottomOf="@+id/iv_cover" + app:layout_constraintStart_toEndOf="@+id/iv_cover" + app:layout_constraintTop_toTopOf="@+id/iv_cover" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml index bee77c0..6b3961b 100644 --- a/app/src/main/res/layout/activity_notice.xml +++ b/app/src/main/res/layout/activity_notice.xml @@ -64,7 +64,7 @@ android:layout_height="match_parent" /> diff --git a/app/src/main/res/layout/item_alarm_clock.xml b/app/src/main/res/layout/item_alarm_clock.xml index 856de9f..746db98 100644 --- a/app/src/main/res/layout/item_alarm_clock.xml +++ b/app/src/main/res/layout/item_alarm_clock.xml @@ -30,6 +30,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + +