修复了一些问题

pull/16/head
Dai 4 years ago
parent ddf89e35da
commit 6a4f80f8e6

@ -18,6 +18,7 @@
<activity android:name=".diary.ui.UpdateDiaryActivity" />
<activity android:name=".diary.ui.DiaryActivity" />
<activity android:name=".diary.ui.AddDiaryActivity" />
<activity android:name=".diary.ui.CardActivity" />
<activity android:name=".diary.ui.QuestionActivity"/>
<activity android:name=".Course.AddCourseActivity" />
<activity android:name=".Course.CourseActivity" />

@ -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);
}
}

@ -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;
}
}

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Button
android:id="@+id/card1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="#A4CF2626"
android:text="今天有遇到什么开心的事情吗?"
/>
<Button
android:id="@+id/card2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="#77CFAE34"
android:text="今天天气如何?"
/>
<Button
android:id="@+id/card3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="#8A6ECA34"
android:text="今天有没有做一件有意义的事?"
/>
</LinearLayout>
</LinearLayout>
Loading…
Cancel
Save