Skip to content

Commit 02df732

Browse files
committed
alter project name and update wheelView
1 parent d91144f commit 02df732

File tree

296 files changed

+4519
-4530
lines changed

Some content is hidden

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

296 files changed

+4519
-4530
lines changed

Banner/src/main/java/github/com/viewpagerdemo/PagerModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66

77
public class PagerModel {
8+
int imageId;
9+
810
public PagerModel(int imageId) {
911
this.imageId = imageId;
1012
}
@@ -16,6 +18,4 @@ public int getImageId() {
1618
public void setImageId(int imageId) {
1719
this.imageId = imageId;
1820
}
19-
20-
int imageId;
2121
}

Banner/src/main/java/github/com/viewpagerdemo/ViewPagerHandlerUtils.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ public class ViewPagerHandlerUtils extends Handler {
1717
public static final long MSG_DELAY = 2000; //time
1818
private ViewPagerCurrent mCurrent;
1919
private int page = 0;
20+
private boolean isStart = true;
21+
22+
public ViewPagerHandlerUtils(ViewPagerCurrent viewPager, int currentItem) {
23+
this.page = currentItem;
24+
this.mCurrent = viewPager;
25+
}
2026

2127
public boolean isStart() {
2228
return isStart;
@@ -26,13 +32,6 @@ public void setStart(boolean start) {
2632
isStart = start;
2733
}
2834

29-
private boolean isStart = true;
30-
31-
public ViewPagerHandlerUtils(ViewPagerCurrent viewPager, int currentItem) {
32-
this.page = currentItem;
33-
this.mCurrent = viewPager;
34-
}
35-
3635
@Override
3736
public void handleMessage(Message msg) {
3837
super.handleMessage(msg);

BiliRecommendUI/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.bilirecommendui">
4+
45
<uses-permission android:name="android.permission.INTERNET" />
56

67
<application
8+
android:name=".App"
79
android:allowBackup="true"
810
android:icon="@drawable/ic_launcher"
911
android:label="@string/app_name"
1012
android:supportsRtl="true"
11-
android:name=".App"
1213
android:theme="@style/AppTheme">
1314
<activity android:name=".main.widget.MainActivity">
1415
<intent-filter>

BiliRecommendUI/src/main/java/com/bilirecommendui/App.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ public class App extends Application {
1111

1212
private static Context context;
1313

14+
public static Context getContext() {
15+
return context;
16+
}
1417

1518
@Override
1619
public void onCreate() {
1720
super.onCreate();
1821
context = getApplicationContext();
1922
}
20-
21-
public static Context getContext() {
22-
return context;
23-
}
2423
}

BiliRecommendUI/src/main/java/com/bilirecommendui/main/model/RecommendCompat.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@ public class RecommendCompat {
1212
public static final int TYPE_ITEM = 2;
1313
public static final int TYPE_WEB_LINK = 3;
1414
public static final int TYPE_ACTIVITY = 4;
15-
15+
public int position;
16+
public int newPosition;
17+
public int type;
18+
public int itemPosition;
1619
public RecommendCompat(int position, int type, int newPosition) {
1720
this.position = position;
1821
this.type = type;
1922
this.newPosition = newPosition;
2023
}
2124

22-
public int position;
23-
public int newPosition;
24-
public int type;
25-
public int itemPosition;
26-
2725
public RecommendCompat(int position, int type, int newPosition, int itemPosition) {
2826
this.position = position;
2927
this.newPosition = newPosition;

BiliRecommendUI/src/main/java/com/bilirecommendui/main/model/RecommendModel.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public static class HeadBean {
7272
private String gotoX;
7373
private String style;
7474
private String title;
75+
private Integer count;
7576

7677
public Integer getCount() {
7778
return count;
@@ -81,8 +82,6 @@ public void setCount(Integer count) {
8182
this.count = count;
8283
}
8384

84-
private Integer count;
85-
8685
public String getParam() {
8786
return param;
8887
}

BiliRecommendUI/src/main/java/com/bilirecommendui/main/widget/holder/RecommendItemViewHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public RecommendItemViewHolder(SuperViewHolder superViewHolder) {
3737
public void setData(final RecommendModel.ResultBean.BodyBean bodyBean, final String type) {
3838
switch (type) {
3939
case Constant.TYPE_LIVE:
40-
CompoundDrawableUtils.setItem(mLiveWatchNum,R.drawable.ic_watching);
40+
CompoundDrawableUtils.setItem(mLiveWatchNum, R.drawable.ic_watching);
4141
mTitle.setText(SpannableUtils.getHomeTitlePageType(bodyBean.getArea(), bodyBean.getTitle()));
4242
mLiveName.setText(bodyBean.getUp());
4343
mLiveWatchNum.setText(String.valueOf(bodyBean.getOnline()));

BiliRecommendUI/src/main/java/com/bilirecommendui/network/NetWork.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020
public class NetWork {
2121

22-
private static RecommendService apiService;
2322
private static final Converter.Factory gsonConverterFactory = GsonConverterFactory.create();
2423
private static final CallAdapter.Factory rxJavaCallAdapterFactory = RxJavaCallAdapterFactory.create();
24+
private static RecommendService apiService;
2525

2626
private static OkHttpClient getOkHttp() {
2727
return new OkHttpClient.Builder()
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="12dp"
3-
android:height="12dp"
4-
android:viewportWidth="12.0"
5-
android:viewportHeight="12.0">
2+
android:width="12dp"
3+
android:height="12dp"
4+
android:viewportHeight="12.0"
5+
android:viewportWidth="12.0">
66
<path
7-
android:pathData="M10.475,3.886c0.002,-0.03 -0.002,-0.059 -0.014,-0.085 -0.015,-0.033 -0.042,-0.057 -0.075,-0.074 -0.018,-0.016 -0.038,-0.03 -0.061,-0.038 -0.06,-0.023 -0.121,-0.009 -0.168,0.03 -0.026,0.008 -0.052,0.017 -0.077,0.031l-0.364,0.19c-0.717,-1.367 -2.103,-2.279 -3.702,-2.279 -1.699,0 -3.158,1.032 -3.829,2.544 -0.002,0.004 -0.004,0.008 -0.006,0.012 -0.008,0.019 -0.02,0.035 -0.028,0.054l0.016,0.002c-0.004,0.021 -0.013,0.04 -0.013,0.062 0,0.173 0.143,0.313 0.319,0.313 0.176,0 0.318,-0.14 0.319,-0.312l0.001,0c0.617,-1.234 1.777,-2.044 3.203,-2.044 1.391,0 2.572,0.705 3.203,1.887l-0.45,0.266c-0.032,0.017 -0.061,0.037 -0.086,0.059 -0.066,0.011 -0.121,0.055 -0.142,0.127 -0.036,0.119 0.034,0.267 0.156,0.33l1.303,0.586c0.017,0.014 0.035,0.027 0.056,0.034 0.051,0.02 0.102,0.012 0.146,-0.014 0.046,-0.02 0.083,-0.059 0.099,-0.114 0.007,-0.022 0.008,-0.045 0.008,-0.068l0.187,-1.363c0.009,-0.046 0.007,-0.092 -0.003,-0.135zM9.831,7.347l-0.015,-0.002c0.005,-0.021 0.013,-0.041 0.013,-0.063 0,-0.173 -0.143,-0.313 -0.319,-0.313 -0.176,0 -0.319,0.14 -0.319,0.313 0,0 0,0.001 0,0.001l-0.002,-0c-0.617,1.234 -1.776,2.044 -3.203,2.044 -1.391,0 -2.572,-0.705 -3.203,-1.887l0.45,-0.266c0.032,-0.017 0.061,-0.037 0.086,-0.059 0.066,-0.011 0.121,-0.055 0.142,-0.127 0.036,-0.119 -0.034,-0.267 -0.156,-0.33l-1.303,-0.587c-0.017,-0.014 -0.035,-0.027 -0.056,-0.034 -0.051,-0.02 -0.102,-0.012 -0.146,0.014 -0.046,0.02 -0.083,0.059 -0.099,0.114 -0.007,0.022 -0.008,0.045 -0.008,0.068l-0.187,1.364c-0.009,0.046 -0.007,0.092 0.003,0.135 -0.002,0.03 0.002,0.059 0.014,0.085 0.015,0.033 0.042,0.057 0.075,0.074 0.018,0.016 0.038,0.03 0.061,0.039 0.061,0.023 0.121,0.009 0.168,-0.031 0.026,-0.008 0.052,-0.017 0.077,-0.031l0.364,-0.19c0.717,1.367 2.104,2.279 3.702,2.279 1.699,0 3.158,-1.032 3.829,-2.545 0.002,-0.005 0.005,-0.009 0.007,-0.014 0.008,-0.018 0.019,-0.034 0.026,-0.052z"
8-
android:fillColor="#FA7198"/>
7+
android:fillColor="#FA7198"
8+
android:pathData="M10.475,3.886c0.002,-0.03 -0.002,-0.059 -0.014,-0.085 -0.015,-0.033 -0.042,-0.057 -0.075,-0.074 -0.018,-0.016 -0.038,-0.03 -0.061,-0.038 -0.06,-0.023 -0.121,-0.009 -0.168,0.03 -0.026,0.008 -0.052,0.017 -0.077,0.031l-0.364,0.19c-0.717,-1.367 -2.103,-2.279 -3.702,-2.279 -1.699,0 -3.158,1.032 -3.829,2.544 -0.002,0.004 -0.004,0.008 -0.006,0.012 -0.008,0.019 -0.02,0.035 -0.028,0.054l0.016,0.002c-0.004,0.021 -0.013,0.04 -0.013,0.062 0,0.173 0.143,0.313 0.319,0.313 0.176,0 0.318,-0.14 0.319,-0.312l0.001,0c0.617,-1.234 1.777,-2.044 3.203,-2.044 1.391,0 2.572,0.705 3.203,1.887l-0.45,0.266c-0.032,0.017 -0.061,0.037 -0.086,0.059 -0.066,0.011 -0.121,0.055 -0.142,0.127 -0.036,0.119 0.034,0.267 0.156,0.33l1.303,0.586c0.017,0.014 0.035,0.027 0.056,0.034 0.051,0.02 0.102,0.012 0.146,-0.014 0.046,-0.02 0.083,-0.059 0.099,-0.114 0.007,-0.022 0.008,-0.045 0.008,-0.068l0.187,-1.363c0.009,-0.046 0.007,-0.092 -0.003,-0.135zM9.831,7.347l-0.015,-0.002c0.005,-0.021 0.013,-0.041 0.013,-0.063 0,-0.173 -0.143,-0.313 -0.319,-0.313 -0.176,0 -0.319,0.14 -0.319,0.313 0,0 0,0.001 0,0.001l-0.002,-0c-0.617,1.234 -1.776,2.044 -3.203,2.044 -1.391,0 -2.572,-0.705 -3.203,-1.887l0.45,-0.266c0.032,-0.017 0.061,-0.037 0.086,-0.059 0.066,-0.011 0.121,-0.055 0.142,-0.127 0.036,-0.119 -0.034,-0.267 -0.156,-0.33l-1.303,-0.587c-0.017,-0.014 -0.035,-0.027 -0.056,-0.034 -0.051,-0.02 -0.102,-0.012 -0.146,0.014 -0.046,0.02 -0.083,0.059 -0.099,0.114 -0.007,0.022 -0.008,0.045 -0.008,0.068l-0.187,1.364c-0.009,0.046 -0.007,0.092 0.003,0.135 -0.002,0.03 0.002,0.059 0.014,0.085 0.015,0.033 0.042,0.057 0.075,0.074 0.018,0.016 0.038,0.03 0.061,0.039 0.061,0.023 0.121,0.009 0.168,-0.031 0.026,-0.008 0.052,-0.017 0.077,-0.031l0.364,-0.19c0.717,1.367 2.104,2.279 3.702,2.279 1.699,0 3.158,-1.032 3.829,-2.545 0.002,-0.005 0.005,-0.009 0.007,-0.014 0.008,-0.018 0.019,-0.034 0.026,-0.052z" />
99
</vector>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24dp"
3-
android:height="24dp"
4-
android:viewportWidth="24.0"
5-
android:viewportHeight="24.0">
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
66
<path
7-
android:pathData="M21.75,12.75 L2.25,12.75c-0.414,0 -0.75,-0.336 -0.75,-0.75s0.336,-0.75 0.75,-0.75l19.5,0c0.415,0 0.75,0.336 0.75,0.75S22.165,12.75 21.75,12.75zM19.5,21.75l-4.5,0c-0.415,0 -0.75,-0.335 -0.75,-0.75s0.335,-0.75 0.75,-0.75l4.5,0c0.414,0 0.75,-0.336 0.75,-0.75l0,-3.75c0,-0.415 0.335,-0.75 0.75,-0.75s0.75,0.335 0.75,0.75l0,3.75C21.75,20.74 20.74,21.75 19.5,21.75zM8.25,21.75 L4.5,21.75c-1.24,0 -2.25,-1.01 -2.25,-2.25l0,-3.75c0,-0.415 0.336,-0.75 0.75,-0.75s0.75,0.335 0.75,0.75l0,3.75c0,0.414 0.337,0.75 0.75,0.75l3.75,0c0.414,0 0.75,0.335 0.75,0.75S8.664,21.75 8.25,21.75zM3,9c-0.414,0 -0.75,-0.336 -0.75,-0.75L2.25,4.5c0,-1.24 1.01,-2.25 2.25,-2.25l3.75,0c0.414,0 0.75,0.336 0.75,0.75s-0.336,0.75 -0.75,0.75L4.5,3.75C4.087,3.75 3.75,4.087 3.75,4.5l0,3.75C3.75,8.664 3.414,9 3,9zM21,9c-0.415,0 -0.75,-0.336 -0.75,-0.75L20.25,4.5c0,-0.413 -0.336,-0.75 -0.75,-0.75l-4.5,0c-0.415,0 -0.75,-0.336 -0.75,-0.75s0.335,-0.75 0.75,-0.75l4.5,0c1.24,0 2.25,1.01 2.25,2.25l0,3.75C21.75,8.664 21.415,9 21,9z"
8-
android:fillColor="#B8B8B8"/>
7+
android:fillColor="#B8B8B8"
8+
android:pathData="M21.75,12.75 L2.25,12.75c-0.414,0 -0.75,-0.336 -0.75,-0.75s0.336,-0.75 0.75,-0.75l19.5,0c0.415,0 0.75,0.336 0.75,0.75S22.165,12.75 21.75,12.75zM19.5,21.75l-4.5,0c-0.415,0 -0.75,-0.335 -0.75,-0.75s0.335,-0.75 0.75,-0.75l4.5,0c0.414,0 0.75,-0.336 0.75,-0.75l0,-3.75c0,-0.415 0.335,-0.75 0.75,-0.75s0.75,0.335 0.75,0.75l0,3.75C21.75,20.74 20.74,21.75 19.5,21.75zM8.25,21.75 L4.5,21.75c-1.24,0 -2.25,-1.01 -2.25,-2.25l0,-3.75c0,-0.415 0.336,-0.75 0.75,-0.75s0.75,0.335 0.75,0.75l0,3.75c0,0.414 0.337,0.75 0.75,0.75l3.75,0c0.414,0 0.75,0.335 0.75,0.75S8.664,21.75 8.25,21.75zM3,9c-0.414,0 -0.75,-0.336 -0.75,-0.75L2.25,4.5c0,-1.24 1.01,-2.25 2.25,-2.25l3.75,0c0.414,0 0.75,0.336 0.75,0.75s-0.336,0.75 -0.75,0.75L4.5,3.75C4.087,3.75 3.75,4.087 3.75,4.5l0,3.75C3.75,8.664 3.414,9 3,9zM21,9c-0.415,0 -0.75,-0.336 -0.75,-0.75L20.25,4.5c0,-0.413 -0.336,-0.75 -0.75,-0.75l-4.5,0c-0.415,0 -0.75,-0.336 -0.75,-0.75s0.335,-0.75 0.75,-0.75l4.5,0c1.24,0 2.25,1.01 2.25,2.25l0,3.75C21.75,8.664 21.415,9 21,9z" />
99
</vector>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="18dp"
3-
android:height="18dp"
4-
android:viewportWidth="18.0"
5-
android:viewportHeight="18.0">
2+
android:width="18dp"
3+
android:height="18dp"
4+
android:viewportHeight="18.0"
5+
android:viewportWidth="18.0">
66
<path
7-
android:pathData="M2.768,8.721l5.466,5.466c0.426,0.426 1.119,0.426 1.545,0l5.466,-5.466c0.426,-0.426 0.426,-1.119 0,-1.545 -0.427,-0.427 -1.119,-0.427 -1.546,0L10.1,10.775 10.1,1.39c0,-0.604 -0.489,-1.093 -1.094,-1.093 -0.604,0 -1.094,0.488 -1.094,1.093L7.912,10.775 4.314,7.176c-0.213,-0.214 -0.493,-0.32 -0.773,-0.32 -0.28,0 -0.56,0.106 -0.774,0.32C2.341,7.603 2.341,8.295 2.768,8.721M17.205,16.489c0,0.64 -0.519,1.161 -1.162,1.161L1.97,17.65c-0.643,0 -1.162,-0.52 -1.162,-1.161l0,0c0,-0.642 0.519,-1.163 1.162,-1.163l14.073,0C16.685,15.326 17.205,15.846 17.205,16.489L17.205,16.489 17.205,16.489zM17.205,16.489"
8-
android:fillColor="#fff"/>
7+
android:fillColor="#fff"
8+
android:pathData="M2.768,8.721l5.466,5.466c0.426,0.426 1.119,0.426 1.545,0l5.466,-5.466c0.426,-0.426 0.426,-1.119 0,-1.545 -0.427,-0.427 -1.119,-0.427 -1.546,0L10.1,10.775 10.1,1.39c0,-0.604 -0.489,-1.093 -1.094,-1.093 -0.604,0 -1.094,0.488 -1.094,1.093L7.912,10.775 4.314,7.176c-0.213,-0.214 -0.493,-0.32 -0.773,-0.32 -0.28,0 -0.56,0.106 -0.774,0.32C2.341,7.603 2.341,8.295 2.768,8.721M17.205,16.489c0,0.64 -0.519,1.161 -1.162,1.161L1.97,17.65c-0.643,0 -1.162,-0.52 -1.162,-1.161l0,0c0,-0.642 0.519,-1.163 1.162,-1.163l14.073,0C16.685,15.326 17.205,15.846 17.205,16.489L17.205,16.489 17.205,16.489zM17.205,16.489" />
99
</vector>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

README.md

Lines changed: 10 additions & 9 deletions
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)