diff --git a/doc/软件设计/软件设计规格说明书-秀米日记.doc b/doc/软件设计/软件设计规格说明书-秀米日记.doc index 95c28e8..11ffb3c 100644 Binary files a/doc/软件设计/软件设计规格说明书-秀米日记.doc and b/doc/软件设计/软件设计规格说明书-秀米日记.doc differ 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 @@ + + + + + + +