From 6a4f80f8e6db0701483b4a0b9bdefb8a8dd5246a Mon Sep 17 00:00:00 2001 From: Dai Date: Sun, 11 Jul 2021 23:15:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...件设计规格说明书-秀米日记.doc | Bin 813568 -> 814080 bytes src/showme/app/src/main/AndroidManifest.xml | 1 + .../diary/showme/diary/ui/CardActivity.java | 65 ++++++++++++++++++ .../diary/showme/diary/ui/DiaryActivity.java | 27 ++++++-- src/showme/app/src/main/res/layout/card.xml | 47 +++++++++++++ src/showme/app/src/main/res/raw/music0.mp3 | Bin 0 -> 9488841 bytes src/showme/app/src/main/res/raw/music1.mp3 | Bin 0 -> 8329238 bytes 7 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java create mode 100644 src/showme/app/src/main/res/layout/card.xml create mode 100644 src/showme/app/src/main/res/raw/music0.mp3 create mode 100644 src/showme/app/src/main/res/raw/music1.mp3 diff --git a/doc/软件设计/软件设计规格说明书-秀米日记.doc b/doc/软件设计/软件设计规格说明书-秀米日记.doc index 95c28e8df72b72007d840d0e8b520041cf68ecd1..11ffb3c44c715c5a37bb6da186f0711dcfc07c31 100644 GIT binary patch delta 6300 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

aW? zgZ%xZ9t!hE159v&J3P<`KH);oR@L|QTveU(bkR~V$*l>i&8kWNz*#lxJI$&pcYE22 zO=^wFx|=E9ew>1weceG3Z_$%D$NS|XLK)0jpc~^!FSMW+qHq#tP!AIg)d;dj+Cuik z5Xc^w0on3vAzSixev zUDbo!Rlmq&!TX-?m2au9BnLBj*&3RYdxW1uU0|~Ha95W(g)K4Ca~xsDHOTNh%ySg+ z-;qW!YNCGIOHDHJZEK73R!_KhY$%${si3}_F-v)RHOE%Rx=hOw$Y6MdN_Kf*@s-on z8#KB66pAs}uPb9dRPF2b?5s1>wy%@h9`kFLjBWEnRUcz##k_=G`AjK#IZYNpR1aUh zW$5d=i%k27PSh#hiD#Oc`w6Z^4UL{%iS1i$B@t?>(wJ`kL%2cv+|awXQ2%AjkN8#Z z5UC!sC3jH^mHd`!H^mSeqbIgfBRiz6-adoly2)cZwVO0^#7~Mnt^V?j{4JYHb4}UG zj;qO7mP4O+-xMm(x6@TFSD04Et3}EU+p&1n8fo@+<{9VbZ#{XG>SqpYSewS0Q@C8y zvq!0I^xRRZS&6kB9Hk~GtH-EQTq|}|*?&Qgv&|f%8Wn@jaDDbz^%38+Gsme`CCK*M IIMw3xKLIMhdH?_b delta 6956 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 diff --git a/src/showme/app/src/main/AndroidManifest.xml b/src/showme/app/src/main/AndroidManifest.xml index e94f1c1..2220086 100644 --- a/src/showme/app/src/main/AndroidManifest.xml +++ b/src/showme/app/src/main/AndroidManifest.xml @@ -18,6 +18,7 @@ + diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java new file mode 100644 index 0000000..be4eb3a --- /dev/null +++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java @@ -0,0 +1,65 @@ +package com.diary.showme.diary.ui; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.content.Context; +import android.graphics.Color; +import android.os.Environment; +import android.widget.EditText; +import android.widget.Toast; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + +import com.diary.showme.Course.AddCourseActivity; +import com.diary.showme.Course.Course; +import com.diary.showme.Course.CourseActivity; +import com.diary.showme.R; + + +public class CardActivity extends AppCompatActivity { + + private Button card1; + + private Button card2; + + private Button card3; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.card); + + card1 = findViewById(R.id.card1); + card2 = findViewById(R.id.card2); + card3 = findViewById(R.id.card3); + card1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); + } + }); + card2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); + } + }); + card3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0); + } + }); + } + + public static void startActivity(Context context) { + Intent intent = new Intent(context, CardActivity.class); + context.startActivity(intent); + } + + +} diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryActivity.java index 210b431..49ed6e8 100644 --- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryActivity.java +++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryActivity.java @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import android.Manifest; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -15,6 +16,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.graphics.Color; import android.media.MediaPlayer; +import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.view.View; @@ -24,6 +26,8 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; +import com.diary.showme.Course.AddCourseActivity; +import com.diary.showme.Course.CourseActivity; import com.diary.showme.diary.bean.DiaryBean; import com.diary.showme.diary.db.DiaryDatabaseHelper; import com.diary.showme.diary.event.StartUpdateDiaryEvent; @@ -90,6 +94,10 @@ public class DiaryActivity extends AppCompatActivity implements View.OnClickList private MediaPlayer mediaPlayer = new MediaPlayer(); + private DiaryAdapter adapter; + + private Integer i = 0; + /** * 标识今天是否已经写了日记 */ @@ -178,10 +186,13 @@ public class DiaryActivity extends AppCompatActivity implements View.OnClickList private void initMediaPlayer() { try { - File file = new File(Environment.getExternalStorageDirectory(), "music.mp3"); - mediaPlayer.setDataSource(file.getPath());//指定音频文件路径 + Integer num_of_raw = 2;//歌曲的总数目 + Uri uri=Uri.parse("android.resource://"+getPackageName()+"/raw/"+"music"+i); + mediaPlayer.reset();//重置音乐播放器 + //加载多媒体文件 + mediaPlayer=MediaPlayer.create(getApplicationContext(),uri); mediaPlayer.setLooping(true);//设置为循环播放 - mediaPlayer.prepare();//初始化播放器MediaPlayer + i = (i+1) % num_of_raw; } catch (Exception e) { e.printStackTrace(); @@ -190,11 +201,12 @@ public class DiaryActivity extends AppCompatActivity implements View.OnClickList @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - switch (requestCode){ + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + switch (requestCode) { case 1: - if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED){ + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { initMediaPlayer(); - }else{ + } else { Toast.makeText(this, "拒绝权限，将无法使用程序。", Toast.LENGTH_LONG).show(); finish(); } @@ -227,7 +239,8 @@ public class DiaryActivity extends AppCompatActivity implements View.OnClickList } break; case R.id.main_fab_enter_edit: - AddDiaryActivity.startActivity(this); + Intent intent = new Intent(DiaryActivity.this, CardActivity.class); + startActivity(intent); break; } } diff --git a/src/showme/app/src/main/res/layout/card.xml b/src/showme/app/src/main/res/layout/card.xml new file mode 100644 index 0000000..a059d0a --- /dev/null +++ b/src/showme/app/src/main/res/layout/card.xml @@ -0,0 +1,47 @@ + + + + + + +