Skip to content

Commit 2d3b6cd

Browse files
committed
1、修改Demo 设置页item左对齐统一;修改Demo配置竖屏模式;修改Demo 列表页7.0以下版本设置海拔无效问题
1 parent 07433a3 commit 2d3b6cd

File tree

7 files changed

+16
-7
lines changed

7 files changed

+16
-7
lines changed

apk/sample.apk

2.05 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.aries.library.fast.demo">
44

5-
<!--<uses-feature android:name="android.hardware.screen.portrait"/>-->
5+
<uses-feature android:name="android.hardware.screen.portrait"/>
66

77
<uses-permission android:name="android.permission.INTERNET"/>
88
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -30,17 +30,18 @@
3030
<activity
3131
android:name=".module.SplashActivity"
3232
android:configChanges="locale|layoutDirection|mcc|mnc"
33+
android:screenOrientation="portrait"
3334
android:theme="@style/AppTheme.NotTranslucent">
3435
<intent-filter>
3536
<action android:name="android.intent.action.MAIN"/>
3637

3738
<category android:name="android.intent.category.LAUNCHER"/>
3839
</intent-filter>
3940
</activity>
40-
<!--android:screenOrientation="portrait"-->
4141
<activity
4242
android:name=".module.main.MainActivity"
4343
android:configChanges="locale|layoutDirection|mcc|mnc"
44+
android:screenOrientation="portrait"
4445
android:theme="@style/AppTheme.NotTranslucent"/>
4546
<!--应用内浏览器-->
4647
<activity

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected void convert(BaseViewHolder helper, SubjectsEntity item) {
4141
labelView.setVisibility(isShowTop ? View.VISIBLE : View.GONE);
4242
ViewCompat.setElevation(helper.itemView, helper.itemView.getResources().
4343
getDimensionPixelSize(R.dimen.dp_elevation));
44-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
44+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
4545
RadiusViewDelegate delegate = ((RadiusRelativeLayout) helper.itemView).getDelegate();
4646
delegate.setStrokeWidth(SizeUtil.dp2px(1));
4747
delegate.setStrokeColor(mContext.getResources().getColor(R.color.colorLineGray));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ public WidgetAdapter() {
2929
protected void convert(BaseViewHolder helper, WidgetEntity item) {
3030
helper.setText(R.id.tv_titleWidget, item.title)
3131
.setText(R.id.tv_contentWidget, item.content);
32-
ViewCompat.setElevation(helper.itemView, helper.itemView.getResources().
33-
getDimensionPixelSize(R.dimen.dp_elevation));
3432
int marginSize = helper.itemView.getResources().getDimensionPixelSize(R.dimen.dp_margin_item);
3533
ViewGroup.MarginLayoutParams margin = (ViewGroup.MarginLayoutParams) helper.itemView.getLayoutParams();
3634
margin.setMargins(marginSize, marginSize, marginSize,
3735
helper.getLayoutPosition() == getItemCount() - 1 ? marginSize : 0);
38-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
36+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
3937
RadiusViewDelegate delegate = ((RadiusRelativeLayout) helper.itemView).getDelegate();
4038
delegate.setStrokeWidth(SizeUtil.dp2px(1));
4139
delegate.setStrokeColor(mContext.getResources().getColor(R.color.colorLineGray));
4240
}
41+
ViewCompat.setElevation(helper.itemView, helper.itemView.getResources().
42+
getDimensionPixelSize(R.dimen.dp_elevation));
4343
}
4444
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
import android.graphics.Color;
44
import android.os.Bundle;
55
import android.view.View;
6+
import android.view.WindowManager;
67
import android.widget.TextView;
78

89
import com.aries.library.fast.demo.R;
910
import com.aries.library.fast.demo.base.BaseTitleActivity;
1011
import com.aries.library.fast.demo.module.main.MainActivity;
1112
import com.aries.library.fast.manager.RxJavaManager;
1213
import com.aries.library.fast.util.FastUtil;
14+
import com.aries.ui.util.StatusBarUtil;
1315
import com.aries.ui.view.title.TitleBarView;
1416

1517
import butterknife.BindView;
@@ -46,6 +48,9 @@ public void initView(Bundle savedInstanceState) {
4648
if (!isTaskRoot()) {
4749
return;
4850
}
51+
if(mFastTitleDelegate.type< StatusBarUtil.STATUS_BAR_TYPE_DEFAULT){
52+
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); //隐藏状态栏
53+
}
4954
mContentView.setBackgroundColor(Color.WHITE);
5055
tvVersion.setText("V" + FastUtil.getVersionName(mContext));
5156
RxJavaManager.getInstance().setTimer(2000, new RxJavaManager.TimerListener() {

app/src/main/java/com/aries/library/fast/demo/module/mine/MineFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void onViewClicked(View view) {
9898
FastUtil.startActivity(mContext, ThirdLibraryActivity.class);
9999
break;
100100
case R.id.stv_shareMine:
101-
FastUtil.startShareText(mContext,getString(R.string.share_content));
101+
FastUtil.startShareText(mContext, getString(R.string.share_content));
102102
break;
103103
}
104104
}

app/src/main/res/layout/activity_setting.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
app:sLeftMaxEms="100"
4848
app:sLeftTextColor="@color/colorTextBlackLight"
4949
app:sLeftTextSize="12dp"
50+
app:sLeftViewMarginLeft="12dp"
51+
app:sLeftIconWidth="0dp"
52+
app:sLeftIconHeight="0dp"
5053
app:sLeftTextString="选择Adapter条目加载动画"
5154
app:sLeftViewGravity="left_center"
5255
app:sRightIconRes="@null">

0 commit comments

Comments
 (0)