Skip to content

Commit 1cb324d

Browse files
AriesHooAriesHoo
committed
1、增加快速创建主页tab的Fragment
2、修改FastWebActivity设置弹框颜色配置 3、优化Demo展示效果
1 parent 2d3b6cd commit 1cb324d

28 files changed

+229
-109
lines changed

‎apk/sample.apk

5.26 KB
Binary file not shown.

‎app/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
applicationId "com.aries.library.fast.demo"
1515
minSdkVersion ext.minSdkVersion
1616
targetSdkVersion ext.targetSdkVersion
17-
versionCode 210
18-
versionName "2.1.0"
17+
versionCode 211
18+
versionName "2.1.1"
1919
multiDexEnabled true
2020
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2121
buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""
@@ -47,7 +47,8 @@ android {
4747
if (outputFile != null && outputFile.name.endsWith('.apk')) {
4848
if (variant.buildType.name.equals('release')) {
4949
def fileName = "FastLib_v${defaultConfig.versionName}_${releaseTime()}.apk"
50-
output.outputFile = new File(outputFile.parent, fileName)
50+
//output.outputFile = new File(outputFile.parent, fileName)
51+
output.outputFile = new File(outputFile.parent, "sample.apk")
5152
}
5253
}
5354
}
@@ -64,9 +65,9 @@ android {
6465
dependencies {
6566
def supportVersion = "25.3.1"
6667
compile fileTree(include: ['*.jar'], dir: 'libs')
67-
//compile project(':library')
68+
compile project(':library')
6869
//compile 'com.github.AriesHoo:FastLib:+'
69-
compile 'com.github.AriesHoo:FastLib:2.1.0'
70+
//compile 'com.github.AriesHoo:FastLib:2.1.0'
7071
apt 'com.jakewharton:butterknife-compiler:8.8.1'
7172
compile 'cn.bingoogolapple:bga-banner:2.1.7@aar'
7273
compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
@@ -83,10 +84,11 @@ dependencies {
8384
//webView库 继承FastWebActivity需要,不需要内置WebView可以不compile
8485
compile 'com.just.agentweb:agentweb:2.0.1'
8586
//常用UI控件(TitleBarView、RadiusView、UIAlertView、UIActionSheetView、UIProgressView等),快速标题栏fast_layout_title_bar,继承FastTitleXXX类需要
86-
compile 'com.github.AriesHoo:UIWidget:2.0.0'
87+
compile 'com.github.AriesHoo:UIWidget:2.0.1'
8788
//下拉刷新库注意刷新头SmartRefreshHeader版本要对应
8889
compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
8990
//图片加载
9091
compile 'com.github.bumptech.glide:glide:4.0.0'
9192
annotationProcessor 'com.github.bumptech.glide:compiler:4.0.0'
93+
9294
}

‎app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
1111
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1212
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
13-
<!--AgentWeb 是默认启动定位-->
13+
<!-- AgentWeb 是默认启动定位 -->
1414
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1515
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
16-
1716
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
1817
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
1918
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
@@ -26,7 +25,8 @@
2625
android:persistent="true"
2726
android:supportsRtl="true"
2827
android:theme="@style/AppTheme">
29-
<!--android:screenOrientation="portrait"-->
28+
29+
<!-- android:screenOrientation="portrait" -->
3030
<activity
3131
android:name=".module.SplashActivity"
3232
android:configChanges="locale|layoutDirection|mcc|mnc"
@@ -43,32 +43,32 @@
4343
android:configChanges="locale|layoutDirection|mcc|mnc"
4444
android:screenOrientation="portrait"
4545
android:theme="@style/AppTheme.NotTranslucent"/>
46-
<!--应用内浏览器-->
46+
<!-- 应用内浏览器 -->
4747
<activity
4848
android:name=".module.WebViewActivity"
4949
android:configChanges="locale|layoutDirection|mcc|mnc|orientation|screenSize"
5050
android:hardwareAccelerated="true"/>
51-
<!--滑动返回Activity-微信效果-->
51+
<!-- 滑动返回Activity-微信效果 -->
5252
<activity
5353
android:name=".module.main.sample.SwipeBackActivity"
5454
android:configChanges="locale|layoutDirection|mcc|mnc"/>
55-
<!--QQ默认主题TitleBar样式-->
55+
<!-- QQ默认主题TitleBar样式 -->
5656
<activity
5757
android:name=".module.main.sample.QQTitleActivity"
5858
android:configChanges="locale|layoutDirection|mcc|mnc"/>
59-
<!--支付宝主界面效果-->
59+
<!-- 支付宝主界面效果 -->
6060
<activity
6161
android:name=".module.main.sample.ali.ALiPayMainActivity"
6262
android:configChanges="locale|layoutDirection|mcc|mnc"/>
63-
<!--腾讯新闻主界面效果-->
63+
<!-- 腾讯新闻主界面效果 -->
6464
<activity
6565
android:name=".module.main.sample.news.NewsMainActivity"
6666
android:configChanges="locale|layoutDirection|mcc|mnc"/>
67-
<!--设置页-->
67+
<!-- 设置页 -->
6868
<activity
6969
android:name=".module.mine.SettingActivity"
7070
android:configChanges="locale|layoutDirection|mcc|mnc"/>
71-
<!--第三方库-->
71+
<!-- 第三方库 -->
7272
<activity
7373
android:name=".module.mine.ThirdLibraryActivity"
7474
android:configChanges="locale|layoutDirection|mcc|mnc"/>

‎app/src/main/java/com/aries/library/fast/demo/adapter/SubjectMovieAdapter.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package com.aries.library.fast.demo.adapter;
22

3-
import android.os.Build;
4-
import android.support.v4.view.ViewCompat;
53
import android.view.View;
64

75
import com.aries.library.fast.demo.R;
86
import com.aries.library.fast.demo.entity.SubjectsEntity;
97
import com.aries.library.fast.manager.GlideManager;
10-
import com.aries.library.fast.util.SizeUtil;
11-
import com.aries.ui.view.radius.RadiusRelativeLayout;
12-
import com.aries.ui.view.radius.RadiusViewDelegate;
138
import com.chad.library.adapter.base.BaseQuickAdapter;
149
import com.chad.library.adapter.base.BaseViewHolder;
1510
import com.flyco.labelview.LabelView;
@@ -35,16 +30,9 @@ protected void convert(BaseViewHolder helper, SubjectsEntity item) {
3530
.setText(R.id.tv_yearMovie, "年份:" + item.year)
3631
.setText(R.id.tv_directorMovie, "导演:" + item.getDirectors())
3732
.setText(R.id.tv_castMovie, "主演:" + item.getCasts());
38-
GlideManager.loadRoundImg(item.images.large, helper.getView(R.id.iv_coverMovie));
33+
GlideManager.loadImg(item.images.large, helper.getView(R.id.iv_coverMovie));
3934
LabelView labelView = helper.getView(R.id.lv_topMovie);
4035
labelView.setText("Top" + (helper.getLayoutPosition() + 1));
4136
labelView.setVisibility(isShowTop ? View.VISIBLE : View.GONE);
42-
ViewCompat.setElevation(helper.itemView, helper.itemView.getResources().
43-
getDimensionPixelSize(R.dimen.dp_elevation));
44-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
45-
RadiusViewDelegate delegate = ((RadiusRelativeLayout) helper.itemView).getDelegate();
46-
delegate.setStrokeWidth(SizeUtil.dp2px(1));
47-
delegate.setStrokeColor(mContext.getResources().getColor(R.color.colorLineGray));
48-
}
4937
}
5038
}

‎app/src/main/java/com/aries/library/fast/demo/adapter/WidgetAdapter.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package com.aries.library.fast.demo.adapter;
22

3-
import android.os.Build;
4-
import android.support.v4.view.ViewCompat;
53
import android.view.ViewGroup;
64

75
import com.aries.library.fast.demo.R;
86
import com.aries.library.fast.demo.entity.WidgetEntity;
9-
import com.aries.library.fast.util.SizeUtil;
10-
import com.aries.ui.view.radius.RadiusRelativeLayout;
11-
import com.aries.ui.view.radius.RadiusViewDelegate;
127
import com.chad.library.adapter.base.BaseQuickAdapter;
138
import com.chad.library.adapter.base.BaseViewHolder;
149

@@ -33,12 +28,5 @@ protected void convert(BaseViewHolder helper, WidgetEntity item) {
3328
ViewGroup.MarginLayoutParams margin = (ViewGroup.MarginLayoutParams) helper.itemView.getLayoutParams();
3429
margin.setMargins(marginSize, marginSize, marginSize,
3530
helper.getLayoutPosition() == getItemCount() - 1 ? marginSize : 0);
36-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
37-
RadiusViewDelegate delegate = ((RadiusRelativeLayout) helper.itemView).getDelegate();
38-
delegate.setStrokeWidth(SizeUtil.dp2px(1));
39-
delegate.setStrokeColor(mContext.getResources().getColor(R.color.colorLineGray));
40-
}
41-
ViewCompat.setElevation(helper.itemView, helper.itemView.getResources().
42-
getDimensionPixelSize(R.dimen.dp_elevation));
4331
}
4432
}

‎app/src/main/java/com/aries/library/fast/demo/module/activity/ActivityFragment.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void beforeSetContentView() {
6060

6161
@Override
6262
public void setTitleBar(TitleBarView titleBar) {
63-
TitleBarHelper.getInstance().setTitleBarView(titleBar,mContext,false);
63+
TitleBarHelper.getInstance().setTitleBarView(titleBar, mContext, false);
6464
isSliding = (boolean) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_TAB_SLIDING, true);
6565
if (isSliding && viewSliding == null) {
6666
viewSliding = View.inflate(mContext, R.layout.layout_activity_sliding, null);
@@ -99,16 +99,17 @@ public int getContentLayout() {
9999
*/
100100
@Override
101101
public void initView(Bundle savedInstanceState) {
102-
setTab();
102+
// setTab();
103103
}
104104

105105
private void setTab() {
106106
isSliding = (boolean) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_TAB_SLIDING, isSliding);
107107
vpContent.removeAllViews();
108-
listFragment.clear();
109-
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_IN_THEATERS));
110-
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_COMING_SOON));
111-
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_TOP));
108+
if (listFragment.size() == 0) {
109+
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_IN_THEATERS));
110+
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_COMING_SOON));
111+
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_TOP));
112+
}
112113
if (isSliding) {
113114
TabLayoutManager.getInstance().setSlidingTabData(this, mSlidingTab, vpContent,
114115
getTitles(R.array.arrays_tab_activity), listFragment);
@@ -124,12 +125,6 @@ public void loadData() {
124125
setTab();
125126
}
126127

127-
@Override
128-
protected void onVisibleChanged(boolean isVisibleToUser) {
129-
super.onVisibleChanged(isVisibleToUser);
130-
LoggerManager.d(TAG, "isVisibleToUser:" + isVisibleToUser);
131-
}
132-
133128
private List<String> getTitles(int array) {
134129
return Arrays.asList(getResources().getStringArray(array));
135130
}
@@ -138,6 +133,6 @@ private List<String> getTitles(int array) {
138133
public void refreshActivityTab(boolean isSliding) {
139134
mIsFirstShow = true;
140135
setTitleBar(mTitleBar);
141-
136+
setTab();
142137
}
143138
}

‎app/src/main/java/com/aries/library/fast/demo/module/activity/MovieBaseFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void setBackToTop(boolean enable) {
107107
imageViewTop.setOnClickListener(new View.OnClickListener() {
108108
@Override
109109
public void onClick(View v) {
110-
mRecyclerView.scrollToPosition(0);
110+
mRecyclerView.smoothScrollToPosition(0);
111111
}
112112
});
113113
}

‎app/src/main/java/com/aries/library/fast/demo/module/main/MainActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414

15-
import static com.aries.library.fast.demo.R.string.activity;
1615

1716
/**
1817
* Created: AriesHoo on 2017/9/7 10:59
@@ -30,7 +29,7 @@ public boolean isSwipeEnable() {
3029
public List<FastTabEntity> getTabList() {
3130
ArrayList<FastTabEntity> tabEntities = new ArrayList<>();
3231
tabEntities.add(new FastTabEntity(getString(R.string.home), R.drawable.ic_home_normal, R.drawable.ic_home_selected, HomeFragment.newInstance()));
33-
tabEntities.add(new FastTabEntity(getString(activity), R.drawable.ic_activity_normal, R.drawable.ic_activity_selected, ActivityFragment.newInstance()));
32+
tabEntities.add(new FastTabEntity(getString(R.string.activity), R.drawable.ic_activity_normal, R.drawable.ic_activity_selected, ActivityFragment.newInstance()));
3433
tabEntities.add(new FastTabEntity(getString(R.string.mine), R.drawable.ic_mine_normal, R.drawable.ic_mine_selected, MineFragment.newInstance()));
3534
return tabEntities;
3635
}

‎app/src/main/res/drawable-v21/ic_menu_camera.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
9+
<path
10+
android:fillColor="#FF000000"
11+
android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
12+
</vector>

‎app/src/main/res/drawable-v21/ic_menu_gallery.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z"/>
9+
</vector>

0 commit comments

Comments
 (0)