Skip to content

Commit

Permalink
新版本动态页面
Browse files Browse the repository at this point in the history
  • Loading branch information
CeuiLiSA committed Jul 17, 2020
1 parent b98220b commit 163db43
Show file tree
Hide file tree
Showing 27 changed files with 1,003 additions and 193 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ dependencies {


implementation 'com.effective.android:panelSwitchHelper-androidx:1.3.1'
implementation 'com.makeramen:roundedimageview:2.3.0'

implementation project(path: ':models')
implementation project(path: ':base')
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/ceui/lisa/activities/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentPagerAdapter;

import com.blankj.utilcode.util.BarUtils;
import com.bumptech.glide.Glide;
import com.google.android.material.navigation.NavigationView;
import com.tbruyelle.rxpermissions2.RxPermissions;
Expand All @@ -34,6 +35,7 @@
import ceui.lisa.fragments.BaseFragment;
import ceui.lisa.fragments.FragmentCenter;
import ceui.lisa.fragments.FragmentLeft;
import ceui.lisa.fragments.FragmentNewRight;
import ceui.lisa.fragments.FragmentRight;
import ceui.lisa.utils.Common;
import ceui.lisa.utils.Dev;
Expand Down Expand Up @@ -90,7 +92,7 @@ private void initFragment() {
baseFragments = new BaseFragment[]{
new FragmentLeft(),
new FragmentCenter(),
new FragmentRight()
Dev.isDev ? FragmentNewRight.newInstance() : new FragmentRight()
};
baseBind.viewPager.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
@Override
Expand All @@ -104,6 +106,7 @@ public int getCount() {
}
});
baseBind.navigationView.setupWithViewPager(baseBind.viewPager);
baseBind.viewPager.setCurrentItem(2);
}

@Override
Expand Down
69 changes: 0 additions & 69 deletions app/src/main/java/ceui/lisa/activities/NfcDemoActivity.java

This file was deleted.

8 changes: 7 additions & 1 deletion app/src/main/java/ceui/lisa/activities/TemplateActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import ceui.lisa.databinding.ActivityFragmentBinding;
import ceui.lisa.fragments.FragmentAboutApp;
import ceui.lisa.fragments.FragmentAnime;
import ceui.lisa.fragments.FragmentBh;
import ceui.lisa.fragments.FragmentFileName;
import ceui.lisa.fragments.FragmentListSimpleUser;
import ceui.lisa.fragments.FragmentMultiDownld;
Expand Down Expand Up @@ -56,6 +57,7 @@
import ceui.lisa.models.IllustsBean;
import ceui.lisa.models.NovelBean;
import ceui.lisa.utils.Common;
import ceui.lisa.utils.Dev;
import ceui.lisa.utils.Params;
import ceui.lisa.utils.ReverseResult;

Expand Down Expand Up @@ -138,7 +140,11 @@ protected Fragment createNewFragment() {
case "一言":
return FragmentAnime.newInstance();
case "最新作品":
return new FragmentNew();
if (Dev.isDev) {
return FragmentBh.newInstance();
} else {
return new FragmentNew();
}
case "粉丝":
return FragmentWhoFollowThisUser.newInstance(intent.getIntExtra(Params.USER_ID, 0));
case "开发者预览":
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/ceui/lisa/activities/VActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ protected void initView() {
@Override
public Fragment getItem(int position) {
if (Shaft.sSettings.isUseFragmentIllust()) {
return FragmentIllust.newInstance(idWithList.getList().get(position));
if (idWithList.getList().get(position).isGif()) {
return FragmentSingleIllust.newInstance(idWithList.getList().get(position));
} else {
return FragmentIllust.newInstance(idWithList.getList().get(position));
}
} else {
return FragmentSingleIllust.newInstance(idWithList.getList().get(position));
}
Expand Down
34 changes: 21 additions & 13 deletions app/src/main/java/ceui/lisa/adapters/EventAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import android.content.Context;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import com.bumptech.glide.Glide;

Expand Down Expand Up @@ -35,25 +37,31 @@ public void bindData(IllustsBean target, ViewHolder<RecyUserEventBinding> bindVi
params.width = imageSize;
bindView.baseBind.illustImage.setLayoutParams(params);
bindView.baseBind.userName.setText(allIllust.get(position).getUser().getName());
bindView.baseBind.star.setText(allIllust.get(position).isIs_bookmarked() ? "取消收藏" : "收藏");
if (!TextUtils.isEmpty(allIllust.get(position).getCreate_date())) {
bindView.baseBind.illustDate.setText(allIllust.get(position).getCreate_date().substring(0, 16));
if (!TextUtils.isEmpty(target.getCaption())) {
bindView.baseBind.description.setVisibility(View.VISIBLE);
bindView.baseBind.description.setHtml(target.getCaption());
} else {
bindView.baseBind.description.setVisibility(View.GONE);
}
// bindView.baseBind.star.setText(allIllust.get(position).isIs_bookmarked() ? "取消收藏" : "收藏");
// if (!TextUtils.isEmpty(allIllust.get(position).getCreate_date())) {
// bindView.baseBind.illustDate.setText(allIllust.get(position).getCreate_date().substring(0, 16));
// }

Glide.with(mContext).load(GlideUtil.getMediumImg(allIllust.get(position)
.getUser().getProfile_image_urls().getMedium())).into(bindView.baseBind.userHead);
Glide.with(mContext).load(GlideUtil.getLargeImage(allIllust.get(position)))
.placeholder(R.color.light_bg)
.into(bindView.baseBind.illustImage);
if (mOnItemClickListener != null) {
bindView.itemView.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 0));
bindView.baseBind.userHead.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 1));
bindView.baseBind.download.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 2));
bindView.baseBind.more.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 4));
bindView.baseBind.star.setOnClickListener(v -> {
bindView.baseBind.star.setText(allIllust.get(position).isIs_bookmarked() ? "收藏" : "取消收藏");
mOnItemClickListener.onItemClick(v, position, 3);
});
}
// if (mOnItemClickListener != null) {
// bindView.itemView.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 0));
// bindView.baseBind.userHead.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 1));
// bindView.baseBind.download.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 2));
// bindView.baseBind.more.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 4));
// bindView.baseBind.star.setOnClickListener(v -> {
// bindView.baseBind.star.setText(allIllust.get(position).isIs_bookmarked() ? "收藏" : "取消收藏");
// mOnItemClickListener.onItemClick(v, position, 3);
// });
// }
}
}
19 changes: 19 additions & 0 deletions app/src/main/java/ceui/lisa/fragments/FragmentBh.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package ceui.lisa.fragments;

import android.os.Bundle;

import ceui.lisa.R;
import ceui.lisa.base.BaseFragment;
import ceui.lisa.databinding.FragmentBhBinding;

public class FragmentBh extends BaseFragment<FragmentBhBinding> {

public static FragmentBh newInstance() {
return new FragmentBh();
}

@Override
protected void initLayout() {
mLayoutID = R.layout.fragment_bh;
}
}
32 changes: 28 additions & 4 deletions app/src/main/java/ceui/lisa/fragments/FragmentIllust.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,35 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.ImageSpan;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import com.blankj.utilcode.util.ScreenUtils;
import com.bumptech.glide.Glide;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.qmuiteam.qmui.span.QMUIAlignMiddleImageSpan;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.util.QMUIDrawableHelper;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.zhy.view.flowlayout.FlowLayout;
import com.zhy.view.flowlayout.TagAdapter;
Expand All @@ -32,7 +44,7 @@
import ceui.lisa.activities.UserActivity;
import ceui.lisa.adapters.IllustAdapter;
import ceui.lisa.base.SwipeFragment;
import ceui.lisa.databinding.FragmentSlideBinding;
import ceui.lisa.databinding.FragmentIllustBinding;
import ceui.lisa.dialogs.MuteDialog;
import ceui.lisa.download.GifCreate;
import ceui.lisa.download.IllustDownload;
Expand All @@ -48,7 +60,7 @@
import ceui.lisa.utils.ShareIllust;


public class FragmentIllust extends SwipeFragment<FragmentSlideBinding> {
public class FragmentIllust extends SwipeFragment<FragmentIllustBinding> {

private IllustsBean illust;

Expand All @@ -67,7 +79,7 @@ public void initBundle(Bundle bundle) {

@Override
public void initLayout() {
mLayoutID = R.layout.fragment_slide;
mLayoutID = R.layout.fragment_illust;
}

@Override
Expand Down Expand Up @@ -272,6 +284,18 @@ public void onClick(View v) {
}
}
});
baseBind.illustId.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Common.copy(mContext, String.valueOf(illust.getId()));
}
});
baseBind.userId.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Common.copy(mContext, String.valueOf(illust.getUser().getId()));
}
});

Common.showLog(Shaft.sGson.toJson(illust));
//
Expand Down
70 changes: 70 additions & 0 deletions app/src/main/java/ceui/lisa/fragments/FragmentNewRight.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package ceui.lisa.fragments;

import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;

import androidx.recyclerview.widget.LinearLayoutManager;


import java.util.ArrayList;
import java.util.List;

import ceui.lisa.R;
import ceui.lisa.activities.Shaft;
import ceui.lisa.adapters.EventAdapter;
import ceui.lisa.adapters.UserHAdapter;
import ceui.lisa.database.AppDatabase;
import ceui.lisa.database.IllustRecmdEntity;
import ceui.lisa.databinding.FragmentNewRightBinding;
import ceui.lisa.models.IllustsBean;
import ceui.lisa.models.UserPreviewsBean;
import ceui.lisa.utils.DensityUtil;
import ceui.lisa.view.LinearItemHorizontalDecoration;

public class FragmentNewRight extends BaseFragment<FragmentNewRightBinding> {

public static FragmentNewRight newInstance() {
return new FragmentNewRight();
}

@Override
public void initView(View view) {
ViewGroup.LayoutParams headParams = baseBind.head.getLayoutParams();
headParams.height = Shaft.statusHeight;
baseBind.head.setLayoutParams(headParams);

baseBind.toolbar.inflateMenu(R.menu.fragment_left);

baseBind.recyclerView.addItemDecoration(new LinearItemHorizontalDecoration(
DensityUtil.dp2px(16.0f)));
LinearLayoutManager manager = new LinearLayoutManager(mContext,
LinearLayoutManager.HORIZONTAL, false);
baseBind.recyclerView.setLayoutManager(manager);
baseBind.recyclerView.setHasFixedSize(true);
AppDatabase.getAppDatabase(mContext).recmdDao().getAll();


List<IllustRecmdEntity> entities = AppDatabase.getAppDatabase(mContext).recmdDao().getAll();
List<UserPreviewsBean> tempUser = new ArrayList<>();
List<IllustsBean> tempIllust = new ArrayList<>();
for (int i = 0; i < entities.size(); i++) {
IllustsBean illustsBean = Shaft.sGson.fromJson(
entities.get(i).getIllustJson(), IllustsBean.class);
UserPreviewsBean userPreviewsBean = new UserPreviewsBean();
userPreviewsBean.setUser(illustsBean.getUser());
tempUser.add(userPreviewsBean);
tempIllust.add(illustsBean);
}
baseBind.recyclerView.setAdapter(new UserHAdapter(tempUser, mContext));

baseBind.recyList.setLayoutManager(new LinearLayoutManager(mContext));
baseBind.recyList.setHasFixedSize(true);
baseBind.recyList.setAdapter(new EventAdapter(tempIllust, mContext));
}

@Override
public void initLayout() {
mLayoutID = R.layout.fragment_new_right;
}
}
Loading

0 comments on commit 163db43

Please sign in to comment.