diff --git a/app/src/main/java/com/gh/common/util/GameViewUtils.java b/app/src/main/java/com/gh/common/util/GameViewUtils.java index ac49a0c6f4..be9ab49b9e 100644 --- a/app/src/main/java/com/gh/common/util/GameViewUtils.java +++ b/app/src/main/java/com/gh/common/util/GameViewUtils.java @@ -4,6 +4,7 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; import android.support.v4.content.ContextCompat; +import android.text.TextUtils; import android.util.TypedValue; import android.view.View; import android.widget.LinearLayout; @@ -29,17 +30,17 @@ import java.util.TimeZone; */ public class GameViewUtils { - public static void setLabelList(Context context, LinearLayout labelLayout, List tag) { + public static void setLabelList(Context context, LinearLayout labelLayout, List tag, String tagType) { labelLayout.removeAllViews(); if (tag == null || tag.isEmpty()) { - labelLayout.addView(getGameTagView(context, "官方版", 0)); + labelLayout.addView(getGameTagView(context, "官方版", 0, tagType)); } else { for (int i = 0, size = tag.size(); i < size; i++) { View view; if (i == size - 1) { - view = getGameTagView(context, tag.get(i), 0); + view = getGameTagView(context, tag.get(i), 0, tagType); } else { - view = getGameTagView(context, tag.get(i), DisplayUtils.dip2px(context, 6)); + view = getGameTagView(context, tag.get(i), DisplayUtils.dip2px(context, 6), tagType); } if (view != null) { labelLayout.addView(view); @@ -51,7 +52,7 @@ public class GameViewUtils { } } - private static TextView getGameTagView(Context context, String tagStr, int rightMargin) { + private static TextView getGameTagView(Context context, String tagStr, int rightMargin, String tagType) { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); lparams.rightMargin = rightMargin; @@ -63,7 +64,13 @@ public class GameViewUtils { tag.setBackgroundResource(R.drawable.border_green_bg); tag.setTextColor(ContextCompat.getColor(context, R.color.tag_green)); } else { - String colorStr = TagUtils.getInstance(context).getColor(tagStr); + String colorStr; + if (!TextUtils.isEmpty(tagType) && tagType.equals("type")) { // 游戏标签 + colorStr = "#ff6a28"; + } else { + colorStr = TagUtils.getInstance(context).getColor(tagStr); + } + if (colorStr == null) { return null; } diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index a79da5066e..7dd082c9af 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -18,7 +18,6 @@ import com.gh.base.BaseActivity; import com.gh.common.util.EntranceUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.adapter.VPFragmentAdapter; -import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.SubjectHeadEntity; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.Response; @@ -51,6 +50,8 @@ public class SubjectActivity extends BaseActivity { LinearLayout mLoading; @BindView(R.id.subject_tiled) FrameLayout mSubjectTiled; + @BindView(R.id.reuse_no_connection) + View mNoConn; private String mId; private String mName; @@ -93,6 +94,15 @@ public class SubjectActivity extends BaseActivity { } else { loadSubjectType(); } + + mNoConn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mNoConn.setVisibility(View.GONE); + mLoading.setVisibility(View.VISIBLE); + loadSubjectType(); + } + }); } @Override @@ -148,37 +158,12 @@ public class SubjectActivity extends BaseActivity { List content = response.getTypeEntity().getContent(); content.add(0, "全部"); initView(response); - -// if (response != null && response.size() > 0) { -// GameEntity gameEntity = response.get(0); -// ArrayList tag = gameEntity.getTag(); -// if (tag == null) { -// tag = new ArrayList<>(1); -// } -// tag.add(0, "全部"); -// initView(tag, "tile"); -// } else { -// ArrayList tag = new ArrayList<>(1); -// tag.add(0, "全部"); -// initView(tag, "tile"); -// -// } - } - - @Override - public void onError(Throwable e) { - super.onError(e); - Utils.log("=======" + e.toString()); - } - @Override public void onFailure(HttpException e) { super.onFailure(e); mLoading.setVisibility(View.GONE); - ArrayList tag = new ArrayList<>(1); - tag.add(0, "全部"); -// initView(tag, "tile"); + mNoConn.setVisibility(View.VISIBLE); } }); } @@ -186,8 +171,11 @@ public class SubjectActivity extends BaseActivity { private void initView(SubjectHeadEntity headEntity) { if ("tile".equals(headEntity.getTypeEntity().getLayout())) { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + Bundle clone = (Bundle) mBundle.clone(); + clone.putString("tagType", headEntity.getTag()); + clone.putStringArrayList("contentTitle", new ArrayList<>(headEntity.getTypeEntity().getContent())); mTileFragment = new SubjectTileFragment(); - mTileFragment.setHeadEntity(headEntity); + mTileFragment.setArguments(clone); transaction.add(R.id.subject_tiled, mTileFragment); transaction.commit(); } else { @@ -199,8 +187,10 @@ public class SubjectActivity extends BaseActivity { for (String s : tag) { mTabLayout.addTab(mTabLayout.newTab().setText(s)); SubjectFragment fragment = new SubjectFragment(); - fragment.setType(s); - fragment.setArguments(mBundle); + Bundle clone = (Bundle) mBundle.clone(); + clone.putString("type", s); + clone.putString("tagType", headEntity.getTag()); + fragment.setArguments(clone); fragments.add(fragment); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java index 0e60811db8..28803cf515 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -146,7 +146,7 @@ public class PluginAdapter extends BaseRecyclerAdapter { } else { holder.gameDes.setText(gameEntity.getApk().get(0).getSize() + " " + gameEntity.getBrief()); } - GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), ""); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java index 23594f4590..ddb883073b 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java @@ -21,6 +21,8 @@ public class SubjectEntity { private String home; + private String tag; + private List data; public String getId() { @@ -71,4 +73,11 @@ public class SubjectEntity { this.data = data; } + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 1299fe3804..9b58d1bb32 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -830,7 +830,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } else { holder.gameDes.setText(String.format("%s %s", gameEntity.getApk().get(0).getSize(), gameEntity.getBrief())); } - GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), subjectEntity.getTag()); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java index b7bad69920..ccdfdf32f6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -584,7 +584,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { holder.gameDes.setText(String.format("%s %s", gameEntity.getApk().get(0).getSize(), gameEntity.getBrief())); } - GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), ""); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java index 6b4681ce88..51380c16f4 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -221,7 +221,7 @@ class ConcernFragmentAdapter extends BaseRecyclerAdapter { } else { holder.gameDes.setText(gameEntity.getApk().get(0).getSize() + " " + gameEntity.getBrief()); } - GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), ""); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index dd601e93b1..770c02410b 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -425,7 +425,7 @@ class InstallFragmentAdapter extends BaseRecyclerAdapter { PlatformUtils.getInstance(mContext).getPlatformName(gameEntity.getApk().get(0).getPlatform()))); holder.gameDes.setText(String.format("V%s", gameEntity.getApk().get(0).getVersion())); } - GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), ""); holder.cardView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java index dc3abc823c..0e1624ba89 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java @@ -154,7 +154,7 @@ public interface ApiService { @GET("index/recommend") Observable> getSubjectDigest(); //获取主页专题入口数据 - @GET("game/column/{subject_id}/huanyihuan") + @GET("column/{subject_id}/huanyihuan") Observable> getSubjectGame(@Path("subject_id") String subject_id); //获取专题游戏 用于主页换一批 @Headers({"Content-Type: application/json", "Accept: application/json"}) diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 80f9c0f134..cf2619c95b 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -139,7 +139,7 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { viewHolder.gameDes.setText(String.format("%s %s", gameEntity.getApk().get(0).getSize(), gameEntity.getBrief())); } - GameViewUtils.setLabelList(mContext, viewHolder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, viewHolder.gameLabelList, gameEntity.getTag(), ""); viewHolder.itemView.setOnClickListener(new OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 4c7f6041d1..598cf3b77b 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -148,7 +148,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { viewHolder.gameDes.setText(String.format("%s %s", gameEntity.getApk().get(0).getSize(), gameEntity.getBrief())); } - GameViewUtils.setLabelList(mContext, viewHolder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, viewHolder.gameLabelList, gameEntity.getTag(), ""); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index ade0842f55..1316ca68e3 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -58,6 +58,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { private String mEntrance; private String mType; private String mOrder; + private String mTagType; private boolean mIsRemove; private boolean mIsNetworkError; @@ -65,7 +66,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { private boolean mIsLoaded; public SubjectAdapter(Context context, OnCallBackListener listener, String type, String id - , String name, String entrance, String order, boolean isOrder) { + , String name, String entrance, String order, String tagType, boolean isOrder) { super(context); this.mOnCallBackListener = listener; this.mType = type; @@ -74,6 +75,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { this.mEntrance = entrance; this.mIsOrder = isOrder; this.mOrder = order; + this.mTagType = tagType; mLocationMap = new ArrayMap<>(); @@ -296,7 +298,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { } holder.gameName.setPadding(0, 0, paddRight, 0); - GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag()); + GameViewUtils.setLabelList(mContext, holder.gameLabelList, gameEntity.getTag(), mTagType); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java index 77492b3d87..7a8f6002c9 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java @@ -16,6 +16,7 @@ import com.gh.base.BaseFragment; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.Utils; import com.gh.common.view.VerticalItemDecoration; import com.gh.download.DataWatcher; import com.gh.download.DownloadEntity; @@ -64,6 +65,7 @@ public class SubjectFragment extends BaseFragment { private String mName; private String mEntrance; private String mType; + private String mTagType; private String mOrder; private boolean mIsOrder; @@ -99,6 +101,9 @@ public class SubjectFragment extends BaseFragment { mId = arguments.getString("id"); mName = arguments.getString("name"); mIsOrder = arguments.getBoolean("order"); + mType = arguments.getString("type"); + mOrder = arguments.getString("order"); + mTagType = arguments.getString("tagType"); mEntrance = arguments.getString(EntranceUtils.KEY_ENTRANCE); init(R.layout.fragment_subject); @@ -108,7 +113,7 @@ public class SubjectFragment extends BaseFragment { subject_pb_loading.setVisibility(View.VISIBLE); subject_list.setVisibility(View.VISIBLE); reuse_no_connection.setVisibility(View.GONE); - adapter = new SubjectAdapter(getContext(), SubjectFragment.this, mType, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), SubjectFragment.this, mType, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); } }); @@ -119,7 +124,7 @@ public class SubjectFragment extends BaseFragment { subject_list.addItemDecoration(new VerticalItemDecoration(getContext(), 8, true)); subject_list.setHasFixedSize(true); subject_list.setLayoutManager(layoutManager); - adapter = new SubjectAdapter(getContext(), this, mType, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), this, mType, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); subject_list.addOnScrollListener(new RecyclerView.OnScrollListener() { @@ -261,7 +266,7 @@ public class SubjectFragment extends BaseFragment { subject_list.setVisibility(View.VISIBLE); subject_pb_loading.setVisibility(View.VISIBLE); reuse_no_connection.setVisibility(View.GONE); - adapter = new SubjectAdapter(getContext(), this, mType, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), this, mType, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); } } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java index 9c50b52041..6a328134f5 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java @@ -70,13 +70,12 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap private SubjectAdapter adapter; private LinearLayoutManager layoutManager; - private SubjectHeadEntity mHeadEntity; - private String mId; private String mName; private String mEntrance; private String mType; private String mOrder; + private String mTagType; private boolean mScorllTop = false; private boolean mIsOrder; @@ -107,7 +106,7 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap subject_pb_loading.setVisibility(View.VISIBLE); subject_list.setVisibility(View.VISIBLE); reuse_no_connection.setVisibility(View.GONE); - adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); } @@ -117,20 +116,17 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); init(R.layout.fragment_subject_tiled); - Intent intent = getActivity().getIntent(); + Bundle arguments = getArguments(); mActionBarTitle = (TextView) getActivity().findViewById(R.id.actionbar_tv_title); - mId = intent.getStringExtra("id"); - mName = intent.getStringExtra("name"); - mIsOrder = intent.getBooleanExtra("order", false); - mEntrance = intent.getStringExtra("entrance"); - if (intent.getBundleExtra("data") != null) { - mId = intent.getBundleExtra("data").getString("id"); - mName = intent.getBundleExtra("data").getString("name"); - mIsOrder = intent.getBundleExtra("data").getBoolean("order", false); - mEntrance = intent.getBundleExtra("data").getString("entrance"); - } + mId = arguments.getString("id"); + mName = arguments.getString("name"); + mIsOrder = arguments.getBoolean("order", false); + mEntrance = arguments.getString("entrance"); + mTagType = arguments.getString("tagType"); + + ArrayList contentTitle = arguments.getStringArrayList("contentTitle"); mType = "全部"; @@ -140,7 +136,7 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap subject_pb_loading.setVisibility(View.VISIBLE); subject_list.setVisibility(View.VISIBLE); reuse_no_connection.setVisibility(View.GONE); - adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); } }); @@ -153,14 +149,12 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap } }; subject_type_list.setLayoutManager(layout); - if (mHeadEntity != null && mHeadEntity.getTypeEntity() != null && mHeadEntity.getTypeEntity().getContent() != null - && mHeadEntity.getTypeEntity().getContent().size() > 1) { - List gameType = mHeadEntity.getTypeEntity().getContent(); + if (contentTitle != null && contentTitle.size() > 1) { ViewGroup.LayoutParams params = subject_type_list.getLayoutParams(); - params.height = (int) Math.ceil(gameType.size() / 4f) * DisplayUtils.dip2px(getContext(), 25); + params.height = (int) Math.ceil(contentTitle.size() / 4f) * DisplayUtils.dip2px(getContext(), 25); subject_type_list.setLayoutParams(params); ((DefaultItemAnimator) subject_type_list.getItemAnimator()).setSupportsChangeAnimations(false); - SubjectTypeAdapter adapter = new SubjectTypeAdapter(getContext(), SubjectTileFragment.this, gameType); + SubjectTypeAdapter adapter = new SubjectTypeAdapter(getContext(), SubjectTileFragment.this, contentTitle); subject_type_list.setAdapter(adapter); } @@ -171,7 +165,7 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap subject_list.addItemDecoration(new VerticalItemDecoration(getContext(), 8, true)); subject_list.setHasFixedSize(true); subject_list.setLayoutManager(layoutManager); - adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); subject_list.addOnScrollListener(new RecyclerView.OnScrollListener() { @@ -317,7 +311,7 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap subject_list.setVisibility(View.VISIBLE); subject_pb_loading.setVisibility(View.VISIBLE); reuse_no_connection.setVisibility(View.GONE); - adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), SubjectTileFragment.this, mType, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); } } @@ -349,7 +343,7 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap subject_list.setVisibility(View.VISIBLE); subject_pb_loading.setVisibility(View.VISIBLE); reuse_no_connection.setVisibility(View.GONE); - adapter = new SubjectAdapter(getContext(), this, type, mId, mName, mEntrance, mOrder, mIsOrder); + adapter = new SubjectAdapter(getContext(), this, type, mId, mName, mEntrance, mOrder, mTagType, mIsOrder); subject_list.setAdapter(adapter); } @@ -375,8 +369,4 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap } } - - public void setHeadEntity(SubjectHeadEntity headEntity) { - mHeadEntity = headEntity; - } } diff --git a/app/src/main/res/layout/activity_subject.xml b/app/src/main/res/layout/activity_subject.xml index 512b385201..ff46926976 100644 --- a/app/src/main/res/layout/activity_subject.xml +++ b/app/src/main/res/layout/activity_subject.xml @@ -38,6 +38,8 @@ android:layout_height = "wrap_content" android:layout_centerInParent = "true" /> + +