Skip to content

Commit 2f3a73f

Browse files
iwdaeliwdael
committed
修改资源
1 parent 77119fb commit 2f3a73f

File tree

71 files changed

+146
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+146
-157
lines changed

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:allowBackup="false"
1010
android:icon="@mipmap/ic_launcher"
1111
android:label="@string/app_name"
12-
android:networkSecurityConfig="@xml/jz_network_security_config_allow_cleartext"
12+
android:networkSecurityConfig="@xml/network_security_config_allow_cleartext"
1313
android:theme="@style/AppTheme">
1414
<activity
1515
android:name="com.hacknife.demo.ActivityMain"

‎app/src/main/java/com/hacknife/demo/CustomView/IplayerCustom.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void init(Context context) {
3131
public void onClick(View v) {
3232
super.onClick(v);
3333
int i = v.getId();
34-
if (i == com.hacknife.R.id.fullscreen) {
34+
if (i == R.id.fullscreen) {
3535
if (currentScreen == SCREEN_WINDOW_FULLSCREEN) {
3636
//click quit fullscreen
3737
} else {

‎app/src/main/java/com/hacknife/demo/CustomView/IplayerFresco.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public void setUp(DataSource jzDataSource, int screen) {
4747
super.setUp(jzDataSource, screen);
4848
titleTextView.setText(jzDataSource.title);
4949
if (currentScreen == SCREEN_WINDOW_FULLSCREEN) {
50-
fullscreenButton.setImageResource(R.drawable.jz_shrink);
50+
fullscreenButton.setImageResource(R.drawable.iplayer_shrink);
5151
backButton.setVisibility(View.VISIBLE);
5252
tinyBackImageView.setVisibility(View.INVISIBLE);
5353
} else if (currentScreen == SCREEN_WINDOW_LIST) {
54-
fullscreenButton.setImageResource(R.drawable.jz_enlarge);
54+
fullscreenButton.setImageResource(R.drawable.iplayer_enlarge);
5555
backButton.setVisibility(View.GONE);
5656
tinyBackImageView.setVisibility(View.INVISIBLE);
5757
} else if (currentScreen == SCREEN_WINDOW_TINY) {

‎app/src/main/java/com/hacknife/demo/CustomView/IplayerMp3.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public int getLayoutId() {
2424

2525
@Override
2626
public void onClick(View v) {
27-
if (v.getId() == com.hacknife.R.id.thumb &&
27+
if (v.getId() == R.id.thumb &&
2828
(currentState == CURRENT_STATE_PLAYING ||
2929
currentState == CURRENT_STATE_PAUSE)) {
3030
onClickUiToggle();

‎app/src/main/res/layout/jz_layout_standard_mp3.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
android:layout_width="match_parent"
3030
android:layout_height="50dp"
3131
android:layout_alignParentBottom="true"
32-
android:background="@drawable/jz_bottom_bg"
32+
android:background="@drawable/iplayer_bottom_bg"
3333
android:gravity="center_vertical"
3434
android:orientation="horizontal"
3535
android:visibility="invisible">
@@ -56,8 +56,8 @@
5656
android:paddingLeft="12dp"
5757
android:paddingRight="12dp"
5858
android:paddingTop="8dp"
59-
android:progressDrawable="@drawable/jz_bottom_seek_progress"
60-
android:thumb="@drawable/jz_bottom_seek_thumb" />
59+
android:progressDrawable="@drawable/iplayer_bottom_seek_progress"
60+
android:thumb="@drawable/iplayer_bottom_seek_thumb" />
6161

6262
<TextView
6363
android:id="@+id/total"
@@ -83,7 +83,7 @@
8383
android:paddingLeft="14dp"
8484
android:paddingRight="14dp"
8585
android:scaleType="centerInside"
86-
android:src="@drawable/jz_enlarge" />
86+
android:src="@drawable/iplayer_enlarge" />
8787
</LinearLayout>
8888

8989
<ProgressBar
@@ -93,15 +93,15 @@
9393
android:layout_height="1.5dp"
9494
android:layout_alignParentBottom="true"
9595
android:max="100"
96-
android:progressDrawable="@drawable/jz_bottom_progress" />
96+
android:progressDrawable="@drawable/iplayer_bottom_progress" />
9797

9898
<ImageView
9999
android:id="@+id/back_tiny"
100100
android:layout_width="24dp"
101101
android:layout_height="24dp"
102102
android:layout_marginLeft="6dp"
103103
android:layout_marginTop="6dp"
104-
android:background="@drawable/jz_click_back_tiny_selector"
104+
android:background="@drawable/iplayer_click_back_tiny_selector"
105105
android:visibility="gone" />
106106

107107
<RelativeLayout
@@ -111,7 +111,7 @@
111111
android:layout_alignParentLeft="true"
112112
android:layout_alignParentStart="true"
113113
android:layout_alignParentTop="true"
114-
android:background="@drawable/jz_title_bg"
114+
android:background="@drawable/iplayer_title_bg"
115115
android:gravity="center_vertical">
116116

117117
<ImageView
@@ -124,7 +124,7 @@
124124
android:paddingLeft="12dp"
125125
android:paddingStart="12dp"
126126
android:scaleType="centerInside"
127-
android:src="@drawable/jz_click_back_selector" />
127+
android:src="@drawable/iplayer_click_back_selector" />
128128

129129
<TextView
130130
android:id="@+id/title"
@@ -160,7 +160,7 @@
160160
android:layout_width="23dp"
161161
android:layout_height="10dp"
162162
android:layout_gravity="center_horizontal"
163-
android:background="@drawable/jz_battery_level_10" />
163+
android:background="@drawable/iplayer_battery_level_10" />
164164

165165
<TextView
166166
android:id="@+id/video_current_time"
@@ -176,11 +176,11 @@
176176

177177
<ProgressBar
178178
android:id="@+id/loading"
179-
android:layout_width="@dimen/jz_start_button_w_h_normal"
180-
android:layout_height="@dimen/jz_start_button_w_h_normal"
179+
android:layout_width="@dimen/iplayer_start_button_w_h_normal"
180+
android:layout_height="@dimen/iplayer_start_button_w_h_normal"
181181
android:layout_centerHorizontal="true"
182182
android:layout_centerVertical="true"
183-
android:indeterminateDrawable="@drawable/jz_loading"
183+
android:indeterminateDrawable="@drawable/iplayer_loading"
184184
android:visibility="invisible" />
185185

186186
<LinearLayout
@@ -193,9 +193,9 @@
193193

194194
<ImageView
195195
android:id="@+id/start"
196-
android:layout_width="@dimen/jz_start_button_w_h_normal"
197-
android:layout_height="@dimen/jz_start_button_w_h_normal"
198-
android:src="@drawable/jz_click_play_selector" />
196+
android:layout_width="@dimen/iplayer_start_button_w_h_normal"
197+
android:layout_height="@dimen/iplayer_start_button_w_h_normal"
198+
android:src="@drawable/iplayer_click_play_selector" />
199199
</LinearLayout>
200200

201201

@@ -232,7 +232,7 @@
232232
android:layout_width="wrap_content"
233233
android:layout_height="wrap_content"
234234
android:layout_marginTop="15dp"
235-
android:background="@drawable/retry_bg"
235+
android:background="@drawable/iplayer_retry_bg"
236236
android:paddingBottom="4dp"
237237
android:paddingLeft="9dp"
238238
android:paddingRight="9dp"

‎app/src/main/res/layout/layout_standard_fresco.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
android:minHeight="4dp"
5656
android:paddingBottom="8dp"
5757
android:paddingTop="8dp"
58-
android:progressDrawable="@drawable/jz_bottom_seek_progress"
59-
android:thumb="@drawable/jz_bottom_seek_thumb" />
58+
android:progressDrawable="@drawable/iplayer_bottom_seek_progress"
59+
android:thumb="@drawable/iplayer_bottom_seek_thumb" />
6060

6161
<TextView
6262
android:id="@+id/total"
@@ -72,7 +72,7 @@
7272
android:layout_height="fill_parent"
7373
android:paddingRight="16dp"
7474
android:scaleType="center"
75-
android:src="@drawable/jz_enlarge" />
75+
android:src="@drawable/iplayer_enlarge" />
7676
</LinearLayout>
7777

7878
<ProgressBar
@@ -82,22 +82,22 @@
8282
android:layout_height="1.5dp"
8383
android:layout_alignParentBottom="true"
8484
android:max="100"
85-
android:progressDrawable="@drawable/jz_bottom_progress" />
85+
android:progressDrawable="@drawable/iplayer_bottom_progress" />
8686

8787
<ImageView
8888
android:id="@+id/back_tiny"
8989
android:layout_width="24dp"
9090
android:layout_height="24dp"
9191
android:layout_marginLeft="6dp"
9292
android:layout_marginTop="6dp"
93-
android:background="@drawable/jz_click_back_tiny_selector"
93+
android:background="@drawable/iplayer_click_back_tiny_selector"
9494
android:visibility="visible" />
9595

9696
<LinearLayout
9797
android:id="@+id/layout_top"
9898
android:layout_width="match_parent"
9999
android:layout_height="48dp"
100-
android:background="@drawable/jz_title_bg"
100+
android:background="@drawable/iplayer_title_bg"
101101
android:gravity="center_vertical">
102102

103103
<ImageView
@@ -106,7 +106,7 @@
106106
android:layout_height="48dp"
107107
android:paddingLeft="10dp"
108108
android:scaleType="centerInside"
109-
android:src="@drawable/jz_back_normal" />
109+
android:src="@drawable/iplayer_back_normal" />
110110

111111
<TextView
112112
android:id="@+id/title"
@@ -123,7 +123,7 @@
123123
android:layout_height="60dp"
124124
android:layout_centerHorizontal="true"
125125
android:layout_centerVertical="true"
126-
android:indeterminateDrawable="@drawable/jz_loading"
126+
android:indeterminateDrawable="@drawable/iplayer_loading"
127127
android:visibility="invisible" />
128128

129129
<ImageView
@@ -133,6 +133,6 @@
133133
android:layout_centerHorizontal="true"
134134
android:layout_centerVertical="true"
135135
android:layout_gravity="center_vertical"
136-
android:src="@drawable/jz_click_play_selector" />
136+
android:src="@drawable/iplayer_click_play_selector" />
137137

138138
</RelativeLayout>

‎app/src/main/res/layout/layout_standard_with_share_button.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
android:layout_width="match_parent"
3030
android:layout_height="50dp"
3131
android:layout_alignParentBottom="true"
32-
android:background="@drawable/jz_bottom_bg"
32+
android:background="@drawable/iplayer_bottom_bg"
3333
android:gravity="center_vertical"
3434
android:orientation="horizontal"
3535
android:visibility="invisible">
@@ -56,8 +56,8 @@
5656
android:paddingLeft="12dp"
5757
android:paddingRight="12dp"
5858
android:paddingTop="8dp"
59-
android:progressDrawable="@drawable/jz_bottom_seek_progress"
60-
android:thumb="@drawable/jz_bottom_seek_thumb" />
59+
android:progressDrawable="@drawable/iplayer_bottom_seek_progress"
60+
android:thumb="@drawable/iplayer_bottom_seek_thumb" />
6161

6262
<TextView
6363
android:id="@+id/total"
@@ -83,7 +83,7 @@
8383
android:paddingLeft="14dp"
8484
android:paddingRight="14dp"
8585
android:scaleType="centerInside"
86-
android:src="@drawable/jz_enlarge" />
86+
android:src="@drawable/iplayer_enlarge" />
8787
</LinearLayout>
8888

8989
<ProgressBar
@@ -93,15 +93,15 @@
9393
android:layout_height="1.5dp"
9494
android:layout_alignParentBottom="true"
9595
android:max="100"
96-
android:progressDrawable="@drawable/jz_bottom_progress" />
96+
android:progressDrawable="@drawable/iplayer_bottom_progress" />
9797

9898
<ImageView
9999
android:id="@+id/back_tiny"
100100
android:layout_width="24dp"
101101
android:layout_height="24dp"
102102
android:layout_marginLeft="6dp"
103103
android:layout_marginTop="6dp"
104-
android:background="@drawable/jz_click_back_tiny_selector"
104+
android:background="@drawable/iplayer_click_back_tiny_selector"
105105
android:visibility="visible" />
106106

107107
<RelativeLayout
@@ -111,7 +111,7 @@
111111
android:layout_alignParentLeft="true"
112112
android:layout_alignParentStart="true"
113113
android:layout_alignParentTop="true"
114-
android:background="@drawable/jz_title_bg"
114+
android:background="@drawable/iplayer_title_bg"
115115
android:gravity="center_vertical">
116116

117117
<ImageView
@@ -124,7 +124,7 @@
124124
android:paddingLeft="12dp"
125125
android:paddingStart="12dp"
126126
android:scaleType="centerInside"
127-
android:src="@drawable/jz_click_back_selector" />
127+
android:src="@drawable/iplayer_click_back_selector" />
128128

129129
<TextView
130130
android:id="@+id/title"
@@ -171,7 +171,7 @@
171171
android:layout_width="23dp"
172172
android:layout_height="10dp"
173173
android:layout_gravity="center_horizontal"
174-
android:background="@drawable/jz_battery_level_10" />
174+
android:background="@drawable/iplayer_battery_level_10" />
175175

176176
<TextView
177177
android:id="@+id/video_current_time"
@@ -188,11 +188,11 @@
188188

189189
<ProgressBar
190190
android:id="@+id/loading"
191-
android:layout_width="@dimen/jz_start_button_w_h_normal"
192-
android:layout_height="@dimen/jz_start_button_w_h_normal"
191+
android:layout_width="@dimen/iplayer_start_button_w_h_normal"
192+
android:layout_height="@dimen/iplayer_start_button_w_h_normal"
193193
android:layout_centerHorizontal="true"
194194
android:layout_centerVertical="true"
195-
android:indeterminateDrawable="@drawable/jz_loading"
195+
android:indeterminateDrawable="@drawable/iplayer_loading"
196196
android:visibility="invisible" />
197197

198198
<LinearLayout
@@ -205,9 +205,9 @@
205205

206206
<ImageView
207207
android:id="@+id/start"
208-
android:layout_width="@dimen/jz_start_button_w_h_normal"
209-
android:layout_height="@dimen/jz_start_button_w_h_normal"
210-
android:src="@drawable/jz_click_play_selector" />
208+
android:layout_width="@dimen/iplayer_start_button_w_h_normal"
209+
android:layout_height="@dimen/iplayer_start_button_w_h_normal"
210+
android:src="@drawable/iplayer_click_play_selector" />
211211
</LinearLayout>
212212

213213
<TextView
@@ -243,7 +243,7 @@
243243
android:layout_width="wrap_content"
244244
android:layout_height="wrap_content"
245245
android:layout_marginTop="15dp"
246-
android:background="@drawable/retry_bg"
246+
android:background="@drawable/iplayer_retry_bg"
247247
android:paddingBottom="4dp"
248248
android:paddingLeft="9dp"
249249
android:paddingRight="9dp"

‎iplayer/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.hacknife">
2+
package="com.hacknife.iplayer">
33

44
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
55

0 commit comments

Comments
 (0)