Skip to content

Commit

Permalink
开启加力燃烧器
Browse files Browse the repository at this point in the history
  • Loading branch information
CeuiLiSA authored and CeuiLiSA committed May 20, 2019
1 parent 8feb0b3 commit 75a9c51
Show file tree
Hide file tree
Showing 17 changed files with 252 additions and 192 deletions.
29 changes: 0 additions & 29 deletions .idea/codeStyles/Project.xml

This file was deleted.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ dependencies {
implementation 'com.sackcentury:shinebutton:0.2.0'
implementation 'de.hdodenhof:circleimageview:3.0.0'
implementation 'com.github.ybq:Android-SpinKit:1.2.0'
implementation 'com.github.Yalantis:Context-Menu.Android:1.1.4'

testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<activity android:name=".activities.CoverActivity" />
<activity android:name=".activities.SearchResultActivity" />
<activity android:name=".activities.RelatedIllustActivity" />
<activity android:name=".activities.ShaftActivity" />
</application>

</manifest>
5 changes: 3 additions & 2 deletions app/src/main/java/ceui/lisa/activities/CoverActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import ceui.lisa.fragments.BaseFragment;
import ceui.lisa.fragments.FragmentBlank;
import ceui.lisa.fragments.FragmentHotTag;
import ceui.lisa.fragments.FragmentLeft;
import ceui.lisa.fragments.FragmentRecmdIllust;
import ceui.lisa.fragments.FragmentRecmdUser;
import ceui.lisa.utils.Local;
Expand Down Expand Up @@ -70,8 +71,8 @@ public void onPageScrollStateChanged(int i) {

private void initFragment(){
BaseFragment[] baseFragments = new BaseFragment[]{
new FragmentHotTag(),
new FragmentRecmdUser(),
new FragmentLeft(),
new FragmentBlank(),
new FragmentBlank()
};
mViewPager.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/ceui/lisa/activities/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected void initData() {
Intent intent = new Intent(mContext, CoverActivity.class);
startActivity(intent);
finish();
}else {
} else {
Common.showToast("未登录");
Intent intent = new Intent(mContext, LoginActivity.class);
startActivity(intent);
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/java/ceui/lisa/activities/ShaftActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package ceui.lisa.activities;

public class ShaftActivity extends BaseActivity {

@Override
protected void initLayout() {

}

@Override
protected void initView() {

}

@Override
protected void initData() {

}
}
12 changes: 10 additions & 2 deletions app/src/main/java/ceui/lisa/adapters/IllustStagAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,15 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
currentOne.title.setText(allIllust.get(position).getTitle());
Glide.with(mContext)
.load(GlideUtil.getMediumImg(allIllust.get(position)))
.placeholder(R.color.dark_bg)
.placeholder(R.color.light_bg)
.into(currentOne.illust);

if(allIllust.get(position).getPage_count() == 1){
currentOne.pSize.setVisibility(View.GONE);
}else {
currentOne.pSize.setVisibility(View.VISIBLE);
currentOne.pSize.setText(allIllust.get(position).getPage_count() + "P");
}
if(mOnItemClickListener != null){
holder.itemView.setOnClickListener(v -> mOnItemClickListener.onItemClick(v, position, 0));
}
Expand All @@ -79,12 +86,13 @@ public void setOnItemClickListener(OnItemClickListener itemClickListener) {

public static class TagHolder extends RecyclerView.ViewHolder {
ImageView illust;
TextView title;
TextView title, pSize;

TagHolder(View itemView) {
super(itemView);
illust = itemView.findViewById(R.id.illust_image);
title = itemView.findViewById(R.id.title);
pSize = itemView.findViewById(R.id.p_size);
}
}
}
81 changes: 24 additions & 57 deletions app/src/main/java/ceui/lisa/fragments/FragmentHotTag.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import ceui.lisa.network.Retro;
import ceui.lisa.response.IllustsBean;
import ceui.lisa.response.ListIllustResponse;
import ceui.lisa.response.TagsBean;
import ceui.lisa.response.TrendingtagResponse;
import ceui.lisa.utils.AppBarStateChangeListener;
import ceui.lisa.utils.GlideUtil;
Expand All @@ -29,86 +30,52 @@
import ceui.lisa.utils.SpacesItemDecoration;
import io.reactivex.Observable;

import static com.bumptech.glide.request.RequestOptions.bitmapTransform;

public class FragmentHotTag extends BaseListFragment<ListIllustResponse, IllustStagAdapter, IllustsBean> {

private ImageView headImage;
public class FragmentHotTag extends BaseListFragment<TrendingtagResponse, HotTagAdapter,
TrendingtagResponse.TrendTagsBean> {

@Override
Observable<ListIllustResponse> initApi() {
return Retro.getAppApi().getRecmdIllust(mUserModel.getResponse().getAccess_token(), false);
Observable<TrendingtagResponse> initApi() {
return Retro.getAppApi().getHotTags(mUserModel.getResponse().getAccess_token());
}

@Override
Observable<ListIllustResponse> initNextApi() {
return Retro.getAppApi().getNextIllust("Bearer " + mUserModel.getResponse().getAccess_token(), nextUrl);
Observable<TrendingtagResponse> initNextApi() {
//热门标签没有下一页
return null;
}

@Override
void initRecyclerView() {
super.initRecyclerView();
// mRecyclerView.addItemDecoration(new GridItemDecoration(3,
// DensityUtil.dp2px(6.0f), true));
// GridLayoutManager layoutManager = new GridLayoutManager(mContext, 3);
// mRecyclerView.setLayoutManager(layoutManager);
mToolbar.setPadding(0, Shaft.statusHeight, 0, 0);
mRecyclerView.addItemDecoration(new SpacesItemDecoration(DensityUtil.dp2px(4.0f)));
void initLayout() {
mLayoutID = R.layout.fragment_illust_list;
}

@Override
void initLayout() {
mLayoutID = R.layout.fragment_hot_tag;
boolean hasNext() {
return false;
}

@Override
View initView(View v) {
super.initView(v);
headImage = v.findViewById(R.id.head_image);
mToolbar.setPadding(0, Shaft.statusHeight, 0, 0);
CollapsingToolbarLayout collapsingToolbarLayout = v.findViewById(R.id.toolbar_layout);
AppBarLayout appBarLayout = v.findViewById(R.id.app_bar);
appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
@Override
public void onStateChanged(AppBarLayout appBarLayout, State state) {
if (state == State.EXPANDED) {
} else if (state == State.COLLAPSED) {
mToolbar.setTitle("推荐作品");
} else {
mToolbar.setTitle(" ");
}
}
});
return v;
void initRecyclerView() {
mRecyclerView.addItemDecoration(new GridItemDecoration(3,
DensityUtil.dp2px(8.0f), true));
GridLayoutManager manager = new GridLayoutManager(mContext, 3);
mRecyclerView.setLayoutManager(manager);
}

@Override
boolean showToolbar() {
return false;
}

@Override
void initAdapter() {
// mAdapter = new HotTagAdapter(allItems, mContext);
// mAdapter.setOnItemClickListener(new OnItemClickListener() {
// @Override
// public void onItemClick(View v, int position, int viewType) {
// Intent intent = new Intent(mContext, SearchResultActivity.class);
// intent.putExtra("key word", allItems.get(position).getTag());
// startActivity(intent);
// }
// });
// Glide.with(mContext)
// .load(GlideUtil.getLargeImage(allItems.get((int) (Math.random() * allItems.size())).getIllust()))
// //.apply(bitmapTransform(new BlurTransformation(15, 3)))
// .into(headImage);

StaggeredGridLayoutManager layoutManager =
new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
mRecyclerView.setLayoutManager(layoutManager);
mAdapter = new IllustStagAdapter(allItems, mContext);
mAdapter = new HotTagAdapter(allItems, mContext);
mAdapter.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(View v, int position, int viewType) {
IllustChannel.getInstance().setIllustList(allItems);
Intent intent = new Intent(mContext, ViewPagerActivity.class);
intent.putExtra("position", position);
Intent intent = new Intent(mContext, SearchResultActivity.class);
intent.putExtra("key word", allItems.get(position).getTag());
startActivity(intent);
}
});
Expand Down
93 changes: 93 additions & 0 deletions app/src/main/java/ceui/lisa/fragments/FragmentLeft.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
package ceui.lisa.fragments;

import android.support.annotation.Nullable;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.Toolbar;
import android.view.View;

import com.yalantis.contextmenu.lib.ContextMenuDialogFragment;
import com.yalantis.contextmenu.lib.MenuGravity;
import com.yalantis.contextmenu.lib.MenuObject;
import com.yalantis.contextmenu.lib.MenuParams;

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

import ceui.lisa.R;
import ceui.lisa.activities.Shaft;

public class FragmentLeft extends BaseFragment {

public static final String[] TITLES = new String[]{"推荐作品", "热门标签"};

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

@Override
View initView(View v) {
Toolbar toolbar = v.findViewById(R.id.toolbar);
toolbar.setNavigationOnClickListener(view -> {
initMenuFragment();
});
ViewPager viewPager = v.findViewById(R.id.view_pager);
viewPager.setAdapter(new FragmentPagerAdapter(getChildFragmentManager()) {
@Override
public Fragment getItem(int i) {
if(i == 0) {
return new FragmentRecmdIllust();
}else if(i == 1){
return new FragmentHotTag();
}else {
//只有左右两页,所以这个else应该不会触发
return new FragmentBlank();
}
}

@Override
public int getCount() {
return TITLES.length;
}

@Nullable
@Override
public CharSequence getPageTitle(int position) {
return TITLES[position];
}
});
TabLayout tabLayout = v.findViewById(R.id.tab_layout);
tabLayout.setupWithViewPager(viewPager);
return v;
}

@Override
void initData() {

}

private void initMenuFragment() {
List<MenuObject> objectList = new ArrayList<>();
for (int i = 0; i < 5; i++) {
MenuObject menuObject = new MenuObject();
menuObject.setTitle("这是第" + i);
objectList.add(menuObject);
}
MenuParams menuParams = new MenuParams(
Shaft.toolbarHeight,
objectList,
0L,
175L,
50L,
false,
true,
true,
MenuGravity.START);
ContextMenuDialogFragment contextMenuDialogFragment = ContextMenuDialogFragment.newInstance(menuParams);
contextMenuDialogFragment.show(getChildFragmentManager(), "ContextMenuDialogFragment");
}

}
14 changes: 3 additions & 11 deletions app/src/main/java/ceui/lisa/fragments/FragmentRecmdIllust.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,19 @@
public class FragmentRecmdIllust extends BaseListFragment<ListIllustResponse, IllustStagAdapter, IllustsBean> {

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

@Override
String getToolbarTitle() {
return "推荐作品";
boolean showToolbar() {
return false;
}

@Override
void initRecyclerView() {
mToolbar.setPadding(0, Shaft.statusHeight, 0, 0);
mRecyclerView.addItemDecoration(new SpacesItemDecoration(DensityUtil.dp2px(4.0f)));
}



@Override
Observable<ListIllustResponse> initApi() {
//return Retro.getAppApi().getRecmdIllust(mUserModel.getResponse().getAccess_token(), false);
return null;
return Retro.getAppApi().getRecmdIllust(mUserModel.getResponse().getAccess_token(), false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ String getToolbarTitle() {

@Override
Observable<ListIllustResponse> initApi() {
return Retro.getAppApi().searchIllust(mUserModel.getResponse().getAccess_token(), keyWord, sort, searchTarget);
return Retro.getAppApi().searchIllust(mUserModel.getResponse().getAccess_token(), keyWord + "10000", sort, searchTarget);
}

@Override
Expand Down
Loading

0 comments on commit 75a9c51

Please sign in to comment.