Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

光环助手V3.3 RELEASE（20180628-1630）测试问题汇总（前端）

Browse Source
This commit is contained in:
kehaoyuan
2018-06-29 15:24:23 +08:00
parent 76ea9a4ba4
commit 84eee14363
25 changed files with 198 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/gh/common/databind/BindingAdapters.java
View File

@ -6,6 +6,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
@ -37,11 +38,14 @@ import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
import com.gh.gamecenter.entity.ApkEntity;
import com.gh.gamecenter.entity.GameEntity;
import com.gh.gamecenter.entity.KaiFuCalendarEntity;
import com.gh.gamecenter.eventbus.EBReuse;
import com.gh.gamecenter.manager.PackageManager;
import com.lightgame.download.DownloadEntity;
import com.lightgame.download.FileUtils;
import com.lightgame.utils.Utils;
import org.greenrobot.eventbus.EventBus;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Locale;
@ -67,14 +71,25 @@ public class BindingAdapters {
KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate);
binding.setIsCloseBottom(i == list.size());
binding.setIsReadyPatch(isReadyPatch);
binding.getRoot().setEnabled(isReadyPatch);
if (i == 0) {
binding.setIsTitle(true);
} else {
KaiFuCalendarEntity serverEntity = list.get(i - 1);
binding.setEntity(serverEntity);
binding.getRoot().setOnClickListener(v -> {
listener.onClick(v, serverEntity);
listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null);
});
// 滑动冲突处理
binding.getRoot().setOnTouchListener((v, event) -> {
if (list.size() > 5) {
if (event.getAction() == MotionEvent.ACTION_DOWN) {
EventBus.getDefault().post(new EBReuse("CalenderDown"));
} else if (event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL) {
EventBus.getDefault().post(new EBReuse("CalenderCancel"));
}
}
return false;
});
}
view.addView(inflate);
@ -272,6 +287,9 @@ public class BindingAdapters {
@BindingAdapter({"downloadButton", "traceEvent"})
public static void setDownloadButton(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent) {
if (gameEntity != null && TextUtils.isEmpty(gameEntity.getId())) {
gameEntity.setId(gameEntity.getLink());
}
// 判断是否显示按钮
if (gameEntity != null
&& Config.isShowDownload(gameEntity.getId())

8
app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
View File

@ -3,15 +3,16 @@ package com.gh.gamecenter;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.text.Html;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.facebook.drawee.view.SimpleDraweeView;
@ -42,8 +43,8 @@ public class ShareCardActivity extends BaseActivity {
ImageView mShareQrCodeDv;
@BindView(R.id.sharecard_screenshot)
LinearLayout mShareScreenshotLl;
@BindView(R.id.reuse_actionbar)
RelativeLayout mActionbar;
@BindView(R.id.normal_toolbar_container)
View mActionbar;
@BindView(R.id.sharecard_bottom)
LinearLayout mShareBottomLl;
String gameName;
@ -85,6 +86,7 @@ public class ShareCardActivity extends BaseActivity {
picName = "shareImg.jpg";
setNavigationTitle(getString(R.string.title_share_card));
((TextView) findViewById(R.id.normal_title)).setTextColor(Color.WHITE);
//修改沉浸栏以及ActionBar 颜色
mActionbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), android.R.color.black));

6
app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
View File

@ -10,6 +10,7 @@ import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.text.Html;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
@ -61,8 +62,8 @@ public class ShareCardPicActivity extends BaseActivity {
SimpleDraweeView mShareContentImgRv;
@BindView(R.id.sharecard_screenshot)
ScrollView mShareScreenshotRl;
@BindView(R.id.reuse_actionbar)
RelativeLayout mActionbar;
@BindView(R.id.normal_toolbar_container)
View mActionbar;
@BindView(R.id.sharecard_chang_img)
RelativeLayout mShareChangImageRl;
@BindView(R.id.sharecard_share_btn)
@ -133,6 +134,7 @@ public class ShareCardPicActivity extends BaseActivity {
currentImgPosition = 0;
setNavigationTitle(getString(R.string.title_share_card_pic));
((TextView) findViewById(R.id.normal_title)).setTextColor(Color.WHITE);
shareArrImg = new Vector<>();
if (arrImg != null) shareArrImg.addAll(arrImg);

7
app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
View File

@ -131,4 +131,11 @@ public class ImagePagerAdapter extends RecyclingPagerAdapter {
return this;
}
public void checkResetData(List<SlideEntity> list) {
if (mSlideEntityList != list) {
mSlideEntityList = list;
mSize = getSize(list);
}
}
}

25
app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java
View File

@ -50,12 +50,33 @@ public class GameViewHolder extends BaseRecyclerViewHolder {
int paddRight = 0;
String serverRemark = gameEntity.getServerRemark();
if (TextUtils.isEmpty(serverRemark)) {
gameServerType.setVisibility(View.GONE);
String serverType = gameEntity.getServerType();
if (TextUtils.isEmpty(serverType)) {
gameServerType.setVisibility(View.GONE);
} else {
gameServerType.setVisibility(View.VISIBLE);
gameServerType.setText(serverType);
if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
gameServerType.setBackgroundResource(R.drawable.textview_server_tag);
if ("删档内测".equals(serverType)) {
paddRight = DisplayUtils.dip2px(context, 50);
} else {
paddRight = DisplayUtils.dip2px(context, 60);
}
} else {
gameServerType.setBackgroundResource(R.drawable.textview_yellow_bg);
paddRight = DisplayUtils.dip2px(context, 30);
}
}
} else {
gameServerType.setVisibility(View.VISIBLE);
gameServerType.setText(serverRemark);
gameServerType.setBackgroundResource(R.drawable.textview_orange_up);
paddRight = DisplayUtils.dip2px(context, 50);
int i;
if (serverRemark.length() <= 2) i = 30;
else if (serverRemark.length() <= 4) i = 50;
else i = 60;
paddRight = DisplayUtils.dip2px(context, i);
}
gameName.setPadding(0, 0, paddRight, 0);
}

5
app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
View File

@ -57,6 +57,9 @@ class GameEntity : Parcelable {
@SerializedName("server_remark")
var serverRemark: String? = null
@SerializedName("server_type")
var serverType: String? = null
@SerializedName("server")
var serverEntity: KaiFuCalendarEntity? = null
@ -196,6 +199,7 @@ class GameEntity : Parcelable {
dest.writeString(this.downloadOffText)
dest.writeByte(if (this.isLibaoExists) 1.toByte() else 0.toByte())
dest.writeString(this.serverRemark)
dest.writeString(this.serverType)
dest.writeValue(this.kaifuTimeHint)
dest.writeTypedList(this.tagStyle)
dest.writeString(this.des)
@ -238,6 +242,7 @@ class GameEntity : Parcelable {
this.downloadOffText = `in`.readString()
this.isLibaoExists = `in`.readByte().toInt() != 0
this.serverRemark = `in`.readString()
this.serverType = `in`.readString()
this.kaifuTimeHint = `in`.readValue(Long::class.java.classLoader) as Long?
this.tagStyle = `in`.createTypedArrayList(TagStyleEntity.CREATOR)
this.des = `in`.readString()

1
app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
View File

@ -121,6 +121,7 @@ class GameFragment : NormalFragment() {
}
override fun onResume() {
if (isEverPause && mListAdapter != null) mListAdapter?.notifyDataSetChanged()
super.onResume()
DownloadManager.getInstance(context).addObserver(dataWatcher)
mListAdapter?.isAutoScroll = true

6
app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
View File

@ -165,6 +165,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName:
holder.binding.game = gameEntity
holder.binding.subjectTag = subjectData?.tag
holder.initServerType(gameEntity, mContext)
holder.binding.executePendingBindings()
if (subjectData?.isOrder!!) {
@ -260,7 +261,8 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName:
})
val slideList = mItemDataList[position].slideList
if (slideList != null && slideList.isNotEmpty() && binding.viewPager.adapter == null) {
val pagerAdapter = binding.viewPager.adapter
if (slideList != null && slideList.isNotEmpty() && pagerAdapter == null) {
binding.viewpagerLlHint.removeAllViews()
val margin = DisplayUtils.dip2px(mContext, 6f)
run {
@ -308,6 +310,8 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName:
override fun onPageScrollStateChanged(state: Int) {
}
})
} else if (slideList != null && pagerAdapter != null) {
(pagerAdapter as ImagePagerAdapter).checkResetData(slideList)
}
if (mViewModel.blockData != null) {

45
app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt
View File

@ -1,8 +1,53 @@
package com.gh.gamecenter.game
import android.content.Context
import android.text.TextUtils
import android.view.View
import com.gh.base.BaseRecyclerViewHolder
import com.gh.common.util.DisplayUtils
import com.gh.gamecenter.R
import com.gh.gamecenter.databinding.GameItemBinding
import com.gh.gamecenter.entity.GameEntity
class GameItemViewHolder(bind: GameItemBinding) : BaseRecyclerViewHolder<Any>(bind.root) {
var binding = bind
fun initServerType(gameEntity: GameEntity?, context: Context) {
if (gameEntity == null) return
var paddRight = 0
val serverRemark = gameEntity.serverRemark
if (TextUtils.isEmpty(serverRemark)) {
val serverType = gameEntity.serverType
if (TextUtils.isEmpty(serverType)) {
binding.gameKaifuType.setVisibility(View.GONE)
} else {
binding.gameKaifuType.setVisibility(View.VISIBLE)
binding.gameKaifuType.setText(serverType)
if ("删档内测" == serverType || "不删档内测" == serverType) {
binding.gameKaifuType.setBackgroundResource(R.drawable.textview_server_tag)
if ("删档内测" == serverType) {
paddRight = DisplayUtils.dip2px(context, 50f)
} else {
paddRight = DisplayUtils.dip2px(context, 60f)
}
} else {
binding.gameKaifuType.setBackgroundResource(R.drawable.textview_yellow_bg)
paddRight = DisplayUtils.dip2px(context, 30f)
}
}
} else {
binding.gameKaifuType.setVisibility(View.VISIBLE)
binding.gameKaifuType.setText(serverRemark)
binding.gameKaifuType.setBackgroundResource(R.drawable.textview_orange_up)
val i: Float = when {
serverRemark!!.length <= 2 -> 30F
serverRemark.length <= 4 -> 50F
else -> 60F
}
paddRight = DisplayUtils.dip2px(context, i)
}
binding.gameName.setPadding(0, 0, paddRight, 0)
}
}

6
app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt
View File

@ -28,7 +28,11 @@ class GameHorizontalAdapter(context: Context, subject: SubjectEntity, var exposu
override fun getItemCount(): Int {
val size = mSubjectEntity.data!!.size - mIndex
return if (size > 4) 4 else size
return when {
size < 4 -> size
size < 8 -> 4
else -> 8
}
}
override fun onBindViewHolder(holder: GameHorizontalItemViewHolder?, position: Int) {

2
app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java
View File

@ -55,7 +55,7 @@ public class FuliFragment extends BaseFragment {
public final static String GAME_DETAIL_ADD_KAIFU_KEY = "GAME_DETAIL_ADD_KAIFU_KEY";
public final static String GAME_DETAIL_PATCH_KAIFU_KEY = "GAME_DETAIL_PATCH_KAIFU_KEY";
private boolean isCanScroll; // todo 更改实现方式,如果测试没问题可以删除
private boolean isCanScroll;
private boolean isCanShowKaiFuHint;
private int indexHeight = 0;

25
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java
View File

@ -319,12 +319,33 @@ public class GameDetailFragment extends NormalFragment {
int paddRight = 0;
String serverRemark = mGameEntity.getServerRemark();
if (TextUtils.isEmpty(serverRemark)) {
mServerType.setVisibility(View.GONE);
String serverType = mGameEntity.getServerType();
if (TextUtils.isEmpty(serverType)) {
mServerType.setVisibility(View.GONE);
} else {
mServerType.setVisibility(View.VISIBLE);
mServerType.setText(serverType);
if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
mServerType.setBackgroundResource(R.drawable.textview_server_tag);
if ("删档内测".equals(serverType)) {
paddRight = DisplayUtils.dip2px(getContext(), 50);
} else {
paddRight = DisplayUtils.dip2px(getContext(), 60);
}
} else {
mServerType.setBackgroundResource(R.drawable.textview_yellow_bg);
paddRight = DisplayUtils.dip2px(getContext(), 30);
}
}
} else {
mServerType.setVisibility(View.VISIBLE);
mServerType.setText(serverRemark);
mServerType.setBackgroundResource(R.drawable.textview_orange_up);
paddRight = DisplayUtils.dip2px(getContext(), 50);
int i;
if (serverRemark.length() <= 2) i = 30;
else if (serverRemark.length() <= 4) i = 50;
else i = 60;
paddRight = DisplayUtils.dip2px(getContext(), i);
}
mGameName.setPadding(0, 0, paddRight, 0);

1
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java
View File

@ -409,7 +409,6 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter<ViewHolder> {
holder.itemView.setEnabled(true);
holder.itemView.setOnClickListener(v -> {
Utils.log("======11111");
Calendar calendar = Calendar.getInstance();
DataUtils.onMtaEvent(mContext,
"游戏详情开服表按钮",

10
app/src/main/java/com/gh/gamecenter/qa/AskFragment.java
View File

@ -81,8 +81,8 @@ public class AskFragment extends BaseFragment {
View mColumnLine;
public static final int INDEX_HOT = 0;
public static final int INDEX_QUESTIONS = 1; // communities
public static final int INDEX_COLUMN = 2;
public static final int INDEX_COLUMN = 1;
public static final int INDEX_QUESTIONS = 2; // communities
public static final int COMMUNITIES_SELECT_REQUEST = 103;
private static final String SP_KEY_CLICKED_SELECT_GAME = "has_clicked_select_game";
@ -111,13 +111,10 @@ public class AskFragment extends BaseFragment {
if ((it == null || it.isEmpty()) && mAskColumn.getVisibility() == View.VISIBLE) {
mAskColumn.setVisibility(View.GONE);
mColumnLine.setVisibility(View.GONE);
mAskQuestions.setBackgroundResource(R.drawable.tabbar_right_selector);
if (mAskColumn.isChecked()) setTabbarPosition(INDEX_HOT);
} else if (it != null && !it.isEmpty() && mAskColumn.getVisibility() == View.GONE) {
mAskColumn.setVisibility(View.VISIBLE);
mColumnLine.setVisibility(View.VISIBLE);
mAskColumn.setBackgroundResource(R.drawable.tabbar_right_selector);
mAskQuestions.setBackgroundResource(R.drawable.tabbar_center_selector);
}
});
}
@ -201,8 +198,8 @@ public class AskFragment extends BaseFragment {
ArrayList<Fragment> fragmentList = new ArrayList<>();
mRecommendsFragment = new AskQuestionsRecommendsFragment();
fragmentList.add(mRecommendsFragment);
fragmentList.add(new AskQuestionsNewFragment());
fragmentList.add(new AskColumnFragment());
fragmentList.add(new AskQuestionsNewFragment());
mAskViewpager.setAdapter(new FragmentAdapter(getChildFragmentManager(), fragmentList));
mAskViewpager.setScrollable(false);
mAskViewpager.setOffscreenPageLimit(fragmentList.size());
@ -256,6 +253,7 @@ public class AskFragment extends BaseFragment {
showCommunitiesSelectFragment(false);
onActivityResult(COMMUNITIES_SELECT_REQUEST, Activity.RESULT_OK, null);
showHintDialog();
mSelectGameHint.setVisibility(!mHasClickedSelectGame ? View.VISIBLE : View.GONE);
}
}

1
app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java
View File

@ -203,6 +203,7 @@ public class AskQuestionsRecommendsViewModel extends ListViewModel<AnswerEntity,
// 下拉刷新添加数据
private void addRefreshData(List<AnswerEntity> previousData, List<AnswerEntity> response) {
if (response.size() == 0) return;
// 去除上次刷新提示ITEM
for (int i = 0; i < previousData.size(); i++) {