Skip to content

Commit

Permalink
Merge pull request #2 from CeuiLiSA/master
Browse files Browse the repository at this point in the history
sync
  • Loading branch information
duzhaokun123 authored Mar 19, 2020
2 parents e62a830 + 349a8ed commit 14481a9
Show file tree
Hide file tree
Showing 56 changed files with 762 additions and 525 deletions.
3 changes: 3 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ dependencies {
implementation 'com.blankj:utilcodex:1.26.0'
implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '2.2.8'

implementation 'com.safframework.log:saf-logginginterceptor:1.4.6'
implementation 'com.github.devlight.shadowlayout:library:1.0.2'

implementation project(path: ':models')

testImplementation 'junit:junit:4.12'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
import ceui.lisa.models.IllustsBean;
import ceui.lisa.utils.Common;

/**
* 图片二级详情
*/
public class ImageDetailActivity extends BaseActivity<ActivityImageDetailBinding> {

private IllustsBean mIllustsBean;
Expand Down Expand Up @@ -162,8 +165,6 @@ public void onPageScrollStateChanged(int i) {
});
downloadSingle.setText("路径:" + localIllust.get(index));
}
currentPage.setTextAppearance(mContext, R.style.shadowText);
downloadSingle.setTextAppearance(mContext, R.style.shadowText);
}


Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/ceui/lisa/activities/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@

import static ceui.lisa.activities.Shaft.sUserModel;

/**
* 主页
*/
public class MainActivity extends BaseActivity<ActivityCoverBinding>
implements NavigationView.OnNavigationItemSelectedListener {

Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/ceui/lisa/activities/Shaft.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;

import com.google.gson.Gson;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
Expand All @@ -18,11 +19,15 @@
import ceui.lisa.utils.Params;
import ceui.lisa.utils.Settings;

import static ceui.lisa.utils.Local.LOCAL_DATA;

public class Shaft extends Application {

public static UserModel sUserModel;
public static Settings sSettings;
public static Gson sGson;
public static SharedPreferences sPreferences;

/**
* 状态栏高度,初始化
*/
Expand All @@ -46,10 +51,6 @@ public static Context getContext() {
return sContext;
}

public static void setContext(Context context) {
sContext = context;
}

@Override
public void onCreate() {
super.onCreate();
Expand All @@ -59,6 +60,8 @@ public void onCreate() {
sGson = new Gson();
//0.0127254

sPreferences = getSharedPreferences(LOCAL_DATA, Context.MODE_PRIVATE);

final long before = System.nanoTime();

sUserModel = Local.getUser();
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/java/ceui/lisa/activities/TemplateActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

import ceui.lisa.R;
import ceui.lisa.databinding.ActivityFragmentBinding;
import ceui.lisa.fragments.FragmentAbout;
import ceui.lisa.fragments.FragmentAboutUser;
import ceui.lisa.fragments.FragmentBookTag;
import ceui.lisa.fragments.FragmentC;
import ceui.lisa.fragments.FragmentAboutApp;
import ceui.lisa.fragments.FragmentUserInfo;
import ceui.lisa.fragments.FragmentBookedTag;
import ceui.lisa.fragments.FragmentComment;
import ceui.lisa.fragments.FragmentCollection;
import ceui.lisa.fragments.FragmentD;
import ceui.lisa.fragments.FragmentDownload;
import ceui.lisa.fragments.FragmentEditAccount;
import ceui.lisa.fragments.FragmentEditFile;
import ceui.lisa.fragments.FragmentFollowUser;
Expand Down Expand Up @@ -104,20 +104,20 @@ protected Fragment createNewFragment() {
case "相关评论": {
int id = intent.getIntExtra(Params.ILLUST_ID, 0);
String title = intent.getStringExtra(Params.ILLUST_TITLE);
return FragmentC.newInstance(id, title);
return FragmentComment.newInstance(id, title);
}
case "账号管理":
return new FragmentLocalUsers();
case "按标签筛选": {
String keyword = intent.getStringExtra(EXTRA_KEYWORD);
return FragmentBookTag.newInstance(keyword);
return FragmentBookedTag.newInstance(keyword);
}
case "按标签收藏": {
int id = intent.getIntExtra(Params.ILLUST_ID, 0);
return FragmentSelectBookTag.newInstance(id);
}
case "关于软件":
return new FragmentAbout();
return new FragmentAboutApp();
case "批量下载":
return new FragmentMultiDownload();
case "画廊":
Expand All @@ -133,7 +133,7 @@ protected Fragment createNewFragment() {
case "搜索":
return new FragmentSearch();
case "详细信息":
return new FragmentAboutUser();
return new FragmentUserInfo();
case "一言":
if(Dev.isDev){
}else {
Expand All @@ -153,7 +153,7 @@ protected Fragment createNewFragment() {
return FragmentLikeIllust.newInstance(intent.getIntExtra(Params.USER_ID, 0),
FragmentLikeIllust.TYPE_PUBLUC, true);
case "下载管理":
return new FragmentD();
return new FragmentDownload();
case "收藏夹":
getWindow().setStatusBarColor(getResources().getColor(R.color.colorPrimary));
return new FragmentCollection();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
import ceui.lisa.models.SpotlightArticlesBean;
import ceui.lisa.utils.GlideUtil;

public class AAdapter extends BaseAdapter<SpotlightArticlesBean, RecyArticalBinding> {
//特辑
public class ArticleAdapter extends BaseAdapter<SpotlightArticlesBean, RecyArticalBinding> {

private int imageSize;

public AAdapter(List<SpotlightArticlesBean> targetList, Context context) {
public ArticleAdapter(List<SpotlightArticlesBean> targetList, Context context) {
super(targetList, context);
imageSize = mContext.getResources().getDisplayMetrics().widthPixels -
2 * mContext.getResources().getDimensionPixelSize(R.dimen.sixteen_dp);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
import ceui.lisa.models.TagsBean;
import ceui.lisa.utils.PixivOperate;

public class BAdapter extends BaseAdapter<TagsBean, RecyBookTagBinding> {
//自己收藏的Tag
public class BookedTagAdapter extends BaseAdapter<TagsBean, RecyBookTagBinding> {

private boolean isMuted = false;

public BAdapter(List<TagsBean> targetList, Context context, boolean muted) {
public BookedTagAdapter(List<TagsBean> targetList, Context context, boolean muted) {
super(targetList, context);
isMuted = muted;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
* 评论列表
*/

public class CAdapter extends BaseAdapter<CommentsBean, RecyCommentListBinding> {
public class CommentAdapter extends BaseAdapter<CommentsBean, RecyCommentListBinding> {


public CAdapter(List<CommentsBean> targetList, Context context) {
public CommentAdapter(List<CommentsBean> targetList, Context context) {
super(targetList, context);
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/ceui/lisa/adapters/DownlistAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.List;

import ceui.lisa.R;
import ceui.lisa.activities.Shaft;
import ceui.lisa.database.DownloadEntity;
import ceui.lisa.interfaces.OnItemClickListener;
import ceui.lisa.models.IllustsBean;
Expand All @@ -34,7 +35,6 @@ public class DownlistAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
private Context mContext;
private OnItemClickListener mOnItemClickListener;
private List<DownloadEntity> allIllust;
private Gson mGson = new Gson();
private int imageSize = 0;
private SimpleDateFormat mTime = new SimpleDateFormat("MM月dd日 HH: mm");

Expand All @@ -61,7 +61,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
ViewGroup.LayoutParams params = currentOne.illust.getLayoutParams();
params.height = imageSize;
params.width = imageSize;
IllustsBean currentIllust = mGson.fromJson(allIllust.get(position).getIllustGson(), IllustsBean.class);
IllustsBean currentIllust = Shaft.sGson.fromJson(allIllust.get(position).getIllustGson(), IllustsBean.class);
currentOne.illust.setLayoutParams(params);
Glide.with(mContext)
.load(allIllust.get(position).getFilePath())
Expand Down
91 changes: 0 additions & 91 deletions app/src/main/java/ceui/lisa/adapters/DownloadTaskAdapter.java

This file was deleted.

81 changes: 81 additions & 0 deletions app/src/main/java/ceui/lisa/adapters/DownloadedAdapter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package ceui.lisa.adapters;

import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import androidx.databinding.DataBindingUtil;

import com.bumptech.glide.Glide;

import java.text.SimpleDateFormat;
import java.util.List;

import ceui.lisa.R;
import ceui.lisa.activities.Shaft;
import ceui.lisa.database.DownloadEntity;
import ceui.lisa.databinding.RecyViewHistoryBinding;
import ceui.lisa.models.IllustsBean;
import ceui.lisa.utils.GlideUtil;

public class DownloadedAdapter extends BaseAdapter<DownloadEntity, RecyViewHistoryBinding> {

private int imageSize = 0;
private SimpleDateFormat mTime = new SimpleDateFormat("MM月dd日 HH: mm");

public DownloadedAdapter(List<DownloadEntity> targetList, Context context) {
super(targetList, context);
imageSize = (mContext.getResources().getDisplayMetrics().widthPixels -
mContext.getResources().getDimensionPixelSize(R.dimen.four_dp)) / 2;
}

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

@Override
public void bindData(DownloadEntity target,
ViewHolder<RecyViewHistoryBinding> bindView, int position) {
ViewGroup.LayoutParams params = bindView.baseBind.illustImage.getLayoutParams();
params.height = imageSize;
params.width = imageSize;
bindView.baseBind.illustImage.setLayoutParams(params);

IllustsBean currentIllust = Shaft.sGson.fromJson(allIllust.get(position).getIllustGson(), IllustsBean.class);
Glide.with(mContext)
.load(allIllust.get(position).getFilePath())
.placeholder(R.color.light_bg)
.into(bindView.baseBind.illustImage);
bindView.baseBind.title.setText(allIllust.get(position).getFileName());
bindView.baseBind.author.setText("by: " + currentIllust.getUser().getName());
bindView.baseBind.time.setText(mTime.format(allIllust.get(position).getDownloadTime()));

if (currentIllust.getPage_count() == 1) {
bindView.baseBind.pSize.setVisibility(View.GONE);
} else {
bindView.baseBind.pSize.setVisibility(View.VISIBLE);
bindView.baseBind.pSize.setText(currentIllust.getPage_count() + "P");
}

//从-400 丝滑滑动到0
((SpringHolder) bindView).spring.setCurrentValue(-400);
((SpringHolder) bindView).spring.setEndValue(0);

if (mOnItemClickListener != null) {
bindView.itemView.setOnClickListener(v ->
mOnItemClickListener.onItemClick(v, position, 0));
bindView.baseBind.author.setOnClickListener(v -> {
bindView.baseBind.author.setTag(currentIllust.getUser().getId());
mOnItemClickListener.onItemClick(bindView.baseBind.author, position, 1);
});
}
}

@Override
public ViewHolder<RecyViewHistoryBinding> getNormalItem(ViewGroup parent) {
return new SpringHolder(DataBindingUtil.inflate(
LayoutInflater.from(mContext), mLayoutID, parent, false).getRoot());
}
}
Loading

0 comments on commit 14481a9

Please sign in to comment.