Skip to content

Commit c7f2f2f

Browse files
wangchenyanwangchenyan
committed
方法名修正
1 parent a8c5052 commit c7f2f2f

File tree

9 files changed

+86
-83
lines changed

9 files changed

+86
-83
lines changed

‎art/LrcViewSample.apk

3.72 MB
Binary file not shown.

‎lrcview/src/main/java/me/wcy/lrcview/LrcView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void setTimelineColor(int timelineColor) {
146146
postInvalidate();
147147
}
148148

149-
public void setmTimeTextColor(int timeTextColor) {
149+
public void setTimeTextColor(int timeTextColor) {
150150
mTimeTextColor = timeTextColor;
151151
postInvalidate();
152152
}

‎lrcview/src/main/res/values/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<resources>
2-
<string name="app_name">LrcView</string>
32
<string name="lrc_label">暂无歌词</string>
43
</resources>

‎sample/src/main/assets/cbg.lrc

-40
This file was deleted.

‎sample/src/main/assets/cbg.mp3

-1.93 MB
Binary file not shown.

‎sample/src/main/assets/chengdu.lrc

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[ti:成都]
2+
[ar:赵雷]
3+
[al:无法长大]
4+
[by:0]
5+
[offset:0]
6+
[00:01.34]成都
7+
[00:02.09]
8+
[00:03.96]作词：赵雷
9+
[00:03.96]作曲：赵雷
10+
[00:05.99]编曲：赵雷,喜子
11+
[00:09.04]演唱：赵雷
12+
[00:12.90]
13+
[00:17.65]让我掉下眼泪的
14+
[00:21.57]不止昨夜的酒
15+
[00:25.82]让我依依不舍的
16+
[00:29.62]不止你的温柔
17+
[00:33.78]余路还要走多久
18+
[00:37.64]你攥着我的手
19+
[00:41.63]让我感到为难的
20+
[00:45.47]是挣扎的自由
21+
[00:49.20]
22+
[00:51.90]分别总是在九月
23+
[00:55.38]回忆是思念的愁
24+
[00:59.46]深秋嫩绿的垂柳
25+
[01:03.32]亲吻着我额头
26+
[01:07.31]在那座阴雨的小城里
27+
[01:11.44]我从未忘记你
28+
[01:15.56]成都 带不走的 只有你
29+
[01:21.76]
30+
[01:22.81]和我在成都的街头走一走
31+
[01:31.25]直到所有的灯都熄灭了也不停留
32+
[01:38.88]你会挽着我的衣袖
33+
[01:42.67]我会把手揣进裤兜
34+
[01:46.56]走到玉林路的尽头
35+
[01:50.45]坐在小酒馆的门口
36+
[01:55.65]
37+
[02:30.35]分别总是在九月
38+
[02:34.31]回忆是思念的愁
39+
[02:38.17]深秋嫩绿的垂柳
40+
[02:42.48]亲吻着我额头
41+
[02:46.66]在那座阴雨的小城里
42+
[02:50.34]我从未忘记你
43+
[02:53.78]成都 带不走的 只有你
44+
[03:00.95]
45+
[03:02.38]和我在成都的街头走一走
46+
[03:10.13]直到所有的灯都熄灭了也不停留
47+
[03:18.32]你会挽着我的衣袖
48+
[03:21.99]我会把手揣进裤兜
49+
[03:25.99]走到玉林路的尽头
50+
[03:29.79]坐在小酒馆的门口
51+
[03:36.36]
52+
[03:38.40]和我在成都的街头走一走
53+
[03:46.45]直到所有的灯都熄灭了也不停留
54+
[03:54.27]和我在成都的街头走一走
55+
[04:02.30]直到所有的灯都熄灭了也不停留
56+
[04:10.29]你会挽着我的衣袖
57+
[04:13.57]我会把手揣进裤兜
58+
[04:17.56]走到玉林路的尽头
59+
[04:21.77]坐在(走过)小酒馆的门口
60+
[04:27.72]
61+
[04:36.02]和我在成都的街头走一走
62+
[04:43.67]直到所有的灯都熄灭了也不停留
63+
[04:51.93]

‎sample/src/main/assets/chengdu.mp3

2.52 MB
Binary file not shown.

‎sample/src/main/java/me/wcy/lrcviewsample/MainActivity.java

+13-17
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
import me.wcy.lrcview.LrcView;
1616

1717
public class MainActivity extends AppCompatActivity {
18-
private LrcView lrcBig;
19-
private LrcView lrcSmall;
18+
private LrcView lrcView;
2019
private SeekBar seekBar;
2120
private Button btnPlayPause;
2221
private MediaPlayer mediaPlayer = new MediaPlayer();
@@ -27,14 +26,13 @@ protected void onCreate(Bundle savedInstanceState) {
2726
super.onCreate(savedInstanceState);
2827
setContentView(R.layout.activity_main);
2928

30-
lrcBig = (LrcView) findViewById(R.id.lrc_big);
31-
lrcSmall = (LrcView) findViewById(R.id.lrc_small);
29+
lrcView = (LrcView) findViewById(R.id.lrc_view);
3230
seekBar = (SeekBar) findViewById(R.id.progress_bar);
3331
btnPlayPause = (Button) findViewById(R.id.btn_play_pause);
3432

3533
try {
3634
mediaPlayer.reset();
37-
AssetFileDescriptor fileDescriptor = getAssets().openFd("cbg.mp3");
35+
AssetFileDescriptor fileDescriptor = getAssets().openFd("chengdu.mp3");
3836
mediaPlayer.setDataSource(fileDescriptor.getFileDescriptor(), fileDescriptor.getStartOffset(), fileDescriptor.getLength());
3937
mediaPlayer.prepareAsync();
4038
mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@@ -47,22 +45,24 @@ public void onPrepared(MediaPlayer mp) {
4745
mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
4846
@Override
4947
public void onCompletion(MediaPlayer mp) {
50-
lrcBig.updateTime(0);
51-
lrcSmall.updateTime(0);
48+
lrcView.updateTime(0);
5249
seekBar.setProgress(0);
5350
}
5451
});
5552
} catch (IOException e) {
5653
e.printStackTrace();
5754
}
5855

59-
lrcBig.loadLrc(getLrcText("cbg.lrc"));
60-
lrcSmall.loadLrc(getLrcText("cbg.lrc"));
56+
lrcView.loadLrc(getLrcText("chengdu.lrc"));
6157

62-
lrcBig.setOnPlayClickListener(new LrcView.OnPlayClickListener() {
58+
lrcView.setOnPlayClickListener(new LrcView.OnPlayClickListener() {
6359
@Override
6460
public boolean onPlayClick(long time) {
6561
mediaPlayer.seekTo((int) time);
62+
if (!mediaPlayer.isPlaying()) {
63+
mediaPlayer.start();
64+
handler.post(runnable);
65+
}
6666
return true;
6767
}
6868
});
@@ -91,11 +91,8 @@ public void onStartTrackingTouch(SeekBar seekBar) {
9191

9292
@Override
9393
public void onStopTrackingTouch(SeekBar seekBar) {
94-
if (mediaPlayer.isPlaying()) {
95-
mediaPlayer.seekTo(seekBar.getProgress());
96-
} else {
97-
seekBar.setProgress(0);
98-
}
94+
mediaPlayer.seekTo(seekBar.getProgress());
95+
lrcView.updateTime(seekBar.getProgress());
9996
}
10097
});
10198
}
@@ -120,8 +117,7 @@ private String getLrcText(String fileName) {
120117
public void run() {
121118
if (mediaPlayer.isPlaying()) {
122119
long time = mediaPlayer.getCurrentPosition();
123-
lrcBig.updateTime(time);
124-
lrcSmall.updateTime(time);
120+
lrcView.updateTime(time);
125121
seekBar.setProgress((int) time);
126122
}
127123

‎sample/src/main/res/layout/activity_main.xml

+9-24
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent"
76
android:gravity="center_horizontal"
87
android:orientation="vertical"
98
android:paddingBottom="@dimen/activity_vertical_margin"
109
android:paddingLeft="@dimen/activity_horizontal_margin"
1110
android:paddingRight="@dimen/activity_horizontal_margin"
12-
android:paddingTop="@dimen/activity_vertical_margin"
13-
tools:context=".MainActivity">
11+
android:paddingTop="@dimen/activity_vertical_margin">
1412

1513
<me.wcy.lrcview.LrcView
16-
android:id="@+id/lrc_big"
14+
android:id="@+id/lrc_view"
1715
android:layout_width="match_parent"
1816
android:layout_height="0dp"
19-
android:layout_weight="2"
17+
android:layout_weight="1"
2018
app:lrcAnimationDuration="1000"
21-
app:lrcCurrentTextColor="?attr/colorPrimary"
19+
app:lrcCurrentTextColor="#3F51B5"
2220
app:lrcDividerHeight="24dp"
23-
app:lrcLabel="找不到歌词(&gt;_&lt;)"
24-
app:lrcNormalTextColor="@android:color/darker_gray"
21+
app:lrcLabel="找不到歌词(@_@)"
22+
app:lrcNormalTextColor="#BDBDBD"
2523
app:lrcPadding="40dp"
2624
app:lrcTextSize="16sp"
27-
app:lrcTimelineTextColor="#C5CAE9" />
28-
29-
<me.wcy.lrcview.LrcView
30-
android:id="@+id/lrc_small"
31-
android:layout_width="match_parent"
32-
android:layout_height="0dp"
33-
android:layout_marginTop="@dimen/activity_vertical_margin"
34-
android:layout_weight="1"
35-
android:background="@android:color/black"
36-
app:lrcAnimationDuration="600"
37-
app:lrcCurrentTextColor="?attr/colorAccent"
38-
app:lrcDividerHeight="12dp"
39-
app:lrcLabel="找不到歌词(&gt;_&lt;)"
40-
app:lrcNormalTextColor="@android:color/white"
41-
app:lrcPadding="100dp"
42-
app:lrcTextSize="12sp" />
25+
app:lrcTimeTextColor="#BDBDBD"
26+
app:lrcTimelineColor="#80BDBDBD"
27+
app:lrcTimelineTextColor="#9FA8DA" />
4328

4429
<SeekBar
4530
android:id="@+id/progress_bar"

0 commit comments

Comments
 (0)