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

光环助手V3.5 DEV（20181011-1800）测试问题汇总（前端）https://gitlab.ghzhushou.com/pm/halo-app-issues/issues/370

Browse Source 
(完成：1.10,11,13,14,15,20，22,25,27,28,29,30,31,32,35,36,)
This commit is contained in:
kehaoyuan
2018-10-19 19:16:53 +08:00
parent 682b57597a
commit 6cd801287c
15 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/common/util/DirectUtils.kt
View File

@ -85,7 +85,7 @@ object DirectUtils {
"community_column" -> context.startActivity(CommunitySubjectActivity.getIntent(context, linkEntity.community!!, linkEntity.link, entrance))
"community_special_column" -> context.startActivity(AskColumnDetailActivity.getIntentByColumnId(context, linkEntity.link, linkEntity.community!!, entrance))
"community_special_column" -> context.startActivity(AskColumnDetailActivity.getIntentByColumnId(context, linkEntity.link, linkEntity.community!!, entrance, path))
else -> DialogUtils.showLowVersionDialog(context)
}

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

@ -185,7 +185,7 @@ public class SplashScreenActivity extends BaseActivity {
@Override
public void onSuccess(String s) {
Utils.log("Gid", s);
Utils.toast(SplashScreenActivity.this, "光环ID -> " + s);
// Utils.toast(SplashScreenActivity.this, "光环ID -> " + s);
mSharedPreferences.edit().putString(Constants.DEVICE_KEY, s).apply();
HaloApp.getInstance().setGid(s);

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

@ -32,7 +32,6 @@ data class GameEntity(
var image: String? = null,
var type: String? = null,
var isPluggable: Boolean = false,
@SerializedName("temp")
var link: String? = null,
@SerializedName("apk_link")
var apkLink: ArrayList<ApkLink>? = null,

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

@ -39,6 +39,7 @@ import com.halo.assistant.fragment.game.GamePluginAdapter
import com.halo.assistant.fragment.game.GamePluginViewHolder
import com.lightgame.adapter.BaseRecyclerAdapter
import com.lightgame.download.DownloadEntity
import com.lightgame.utils.Utils
import java.util.*
import kotlin.collections.ArrayList
@ -377,6 +378,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName:
linkEntity.link = link
linkEntity.type = entity?.type
linkEntity.text = name
Utils.log("======::" + link)
DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:$name-大图)", "首页游戏")
}
} else if (holder is GameHorizontalListViewHolder) {

6
app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt
View File

@ -141,11 +141,7 @@ class PersonalHomeAdapter(context: Context,
mContext.startActivity(MyArticleActivity.getIntent(mContext, mListViewModel.userId, "$mEntrance+(个人主页)"))
}
userVoteContainer.setOnClickListener {
if (mListViewModel.userId == UserManager.getInstance().userId) {
Utils.toast(mContext, "我的回答已获得 " + entity?.count?.answerVote + " 赞同")
} else {
Utils.toast(mContext, "Ta的回答已获得 " + entity?.count?.answerVote + " 赞同")
}
Utils.toast(mContext, "共获得 " + entity?.count?.answerVote + " 赞同")
}
userConcernOrEdit.setOnClickListener {
CheckLoginUtils.checkLogin(mContext) {

4
app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
View File

@ -121,6 +121,7 @@ class ArticleDetailActivity : BaseActivity() {
R.id.menu_collect -> {
if (mViewModel?.detailEntity != null) {
mViewModel?.collectionCommand(!mViewModel?.detailEntity?.me?.isCommunityArticleFavorite!!, callback = {
mViewModel?.detailEntity?.me?.isCommunityArticleFavorite = it
if (it) {
mCollectMenuItem?.setIcon(R.drawable.menu_ic_collect_select)
} else {
@ -240,7 +241,7 @@ class ArticleDetailActivity : BaseActivity() {
ShareUtils.getInstance(this).showShareWindows(this, mContentView,
getString(R.string.share_community_article_url, mViewModel?.detailEntity?.community?.id, mViewModel?.detailEntity?.id),
shareIcon, getString(R.string.share_community_article_title, mViewModel?.detailEntity?.user?.name,
mViewModel?.detailEntity?.count?.vote), shareSummary, ShareUtils.ShareType.communityArticle)
mViewModel?.detailEntity?.title, mViewModel?.detailEntity?.count?.vote), shareSummary, ShareUtils.ShareType.communityArticle)
}
}
}
@ -281,6 +282,7 @@ class ArticleDetailActivity : BaseActivity() {
}
}
mBinding?.articleDetailTags?.removeAllViews()
for (tag in mViewModel?.detailEntity!!.tags) {
addTag(tag)
}

18
app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt
View File

@ -160,7 +160,7 @@ class ArticleEditActivity : BaseActivity() {
setArticleDraft()
} else {// 启动自动保存草稿
setNavigationTitle("撰写文章")
mBaseHandler.sendEmptyMessageDelayed(1, SAVE_DRAFTS_INTERVAL_TIME.toLong())
// mBaseHandler.sendEmptyMessageDelayed(1, SAVE_DRAFTS_INTERVAL_TIME.toLong()) //暂时取消
}
}
@ -182,7 +182,9 @@ class ArticleEditActivity : BaseActivity() {
R.id.article_game_name -> showSelectGameDialog()
R.id.article_edit_draft_btn -> {
startActivityForResult(ArticleDraftActivity.getIntent(this), ARTICLE_DRAFT_REQUEST_CODE)
if (checkDraft()) {
startActivityForResult(ArticleDraftActivity.getIntent(this), ARTICLE_DRAFT_REQUEST_CODE)
}
}
}
}
@ -203,7 +205,6 @@ class ArticleEditActivity : BaseActivity() {
}
private fun setArticleDraft() {
setNavigationTitle("编辑文章")
mViewModel?.mSelectCommunityData = mViewModel?.draftEntity?.community
mEditTitle.setText(mViewModel?.draftEntity?.title)
mDraftBtn.visibility = View.GONE
@ -216,6 +217,7 @@ class ArticleEditActivity : BaseActivity() {
mViewModel?.mSelectCommunityData = mViewModel?.detailEntity?.community
mEditTitle.setText(mViewModel?.detailEntity?.title)
mEditContent.setHtml(mViewModel?.detailEntity?.content, false)
mDraftBtn.visibility = View.GONE
mGameName.isEnabled = false
setGameName()
}
@ -226,18 +228,24 @@ class ArticleEditActivity : BaseActivity() {
} else if (mViewModel?.detailEntity != null) {
showPatchBackDialog()
return true
} else if (mEditContent.html.contains("<img src")
}
return !checkDraft()
}
private fun checkDraft(): Boolean {
if (mEditContent.html.contains("<img src")
|| !TextUtils.isEmpty(mEditContent.text)
|| !TextUtils.isEmpty(mEditTitle.text.trim())) {
if (mViewModel?.mSelectCommunityData == null) {
toast("必须选择游戏才能保存到草稿")
return false
}
mViewModel?.title = mEditTitle.text.toString()
mViewModel?.content = mEditContent.html
mViewModel?.postArticleDrafts(true)
return true
}
return false
return true
}
private fun showPatchBackDialog() {

6
app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt
View File

@ -92,13 +92,13 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat
val articleContent = content?.length
if (articleContent != null && articleContent < MIN_ARTICLE_TEXT_LENGTH) {
Utils.toast(getApplication(), R.string.answer_beneath_length_limit)
Utils.toast(getApplication(), "正文至少${QuestionEditViewModel.QUESTION_TITLE_MIN_LENGTH}个字")
return
}
// 检查标题长度限制
title?.trim()
title = title?.replace(" ", "")
title = title?.replace(" ", "")?.replace("\n", "")
if (title!!.length < QuestionEditViewModel.QUESTION_TITLE_MIN_LENGTH) {
Utils.toast(getApplication(), "标题至少${QuestionEditViewModel.QUESTION_TITLE_MIN_LENGTH}个字")
return
@ -253,7 +253,7 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat
.subscribe(object : Response<ResponseBody>() {
override fun onResponse(response: ResponseBody?) {
if (isExit) postArticleDrafts.postValue(true)
Utils.toast(getApplication(), "回答已保存到草稿箱")
Utils.toast(getApplication(), "文章已保存到草稿箱")
val string = response?.string()
if (!string.isNullOrEmpty() && draftEntity?.id == null) {

2
app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt
View File

@ -44,7 +44,7 @@ class AskColumnAdapter(context: Context) : BaseRecyclerAdapter<AskColumnAdapter.
} else {
DataUtils.onMtaEvent(mContext, "问答页面",
UserManager.getInstance().community.name, "专栏-" + entity?.name)
mContext.startActivity(AskColumnDetailActivity.getIntentByColumn(mContext, entity!!, UserManager.getInstance().community, "(问答-专栏)"))
mContext.startActivity(AskColumnDetailActivity.getIntentByColumn(mContext, entity!!, UserManager.getInstance().community, "", "(问答-专栏)"))
}
}
}

16
app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt
View File

@ -132,6 +132,7 @@ class AskColumnDetailActivity : BaseActivity() {
mLoading.visibility = View.GONE
mNoConn.visibility = View.GONE
mColumnEntity = response
mBinding?.entity = mColumnEntity
initViewPager()
}
@ -182,29 +183,32 @@ class AskColumnDetailActivity : BaseActivity() {
companion object {
@JvmStatic
fun getIntentByColumnId(context: Context, columnId: String?, community: CommunityEntity, entrance: String): Intent {
fun getIntentByColumnId(context: Context, columnId: String?, community: CommunityEntity, entrance: String, path: String): Intent {
val intent = Intent(context, AskColumnDetailActivity::class.java)
intent.putExtra(EntranceUtils.KEY_COLUMN_ID, columnId)
intent.putExtra(EntranceUtils.KEY_COMMUNITY_DATA, community)
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance)
intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
intent.putExtra(EntranceUtils.KEY_PATH, path)
return intent
}
@JvmStatic
fun getIntentByColumn(context: Context, entity: AskTagGroupsEntity, community: CommunityEntity, entrance: String): Intent {
fun getIntentByColumn(context: Context, entity: AskTagGroupsEntity, community: CommunityEntity, entrance: String, path: String): Intent {
val intent = Intent(context, AskColumnDetailActivity::class.java)
intent.putExtra(EntranceUtils.KEY_ASK_COLUMN_TAG, entity)
intent.putExtra(EntranceUtils.KEY_COMMUNITY_DATA, community)
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance)
intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
intent.putExtra(EntranceUtils.KEY_PATH, path)
return intent
}
@JvmStatic
fun getIntentByTag(context: Context, tag: String, community: CommunityEntity, entrance: String): Intent {
fun getIntentByTag(context: Context, tag: String, community: CommunityEntity, entrance: String, path: String): Intent {
val intent = Intent(context, AskColumnDetailActivity::class.java)
intent.putExtra(EntranceUtils.KEY_ASK_TAG, tag)
intent.putExtra(EntranceUtils.KEY_COMMUNITY_DATA, community)
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance)
intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
intent.putExtra(EntranceUtils.KEY_PATH, path)
return intent
}
}

2
app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java
View File

@ -261,7 +261,7 @@ public class QuestionsDetailAdapter extends ListAdapter<AnswerEntity> {
DataUtils.onMtaEvent(mContext, "问题标签", mQuestionsDetailEntity.getCommunityName(), mQuestionsDetailEntity.getTitle() + "-" + tag);
mContext.startActivity(AskColumnDetailActivity.Companion.getIntentByTag(mContext, tag,
new CommunityEntity(mQuestionsDetailEntity.getCommunityId(),
mQuestionsDetailEntity.getCommunityName()), mEntrance + "+(问题详情)"));
mQuestionsDetailEntity.getCommunityName()), mEntrance, "问题详情"));
});
}

11
app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java
View File

@ -7,6 +7,8 @@ import com.gh.common.util.GzipUtils;
import com.gh.common.util.NetworkUtils;
import com.gh.common.util.TimestampUtils;
import com.gh.gamecenter.manager.UserManager;
import com.halo.assistant.HaloApp;
import com.lightgame.utils.Util_System_Phone_State;
import java.io.IOException;
@ -50,10 +52,19 @@ class OkHttpCacheInterceptor implements Interceptor {
if (!TextUtils.isEmpty(token)) {
request = request.newBuilder()
.addHeader("TOKEN", token)
.build();
}
if (!TextUtils.isEmpty(deviceId)) {
request = request.newBuilder()
.addHeader("DEVICE", deviceId)
.build();
}
request = request.newBuilder()
.addHeader("IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().getApplication()))
.build();
Response response = chain.proceed(request);
// 去除timestamp拿缓存

1
app/src/main/res/layout/activity_community_article_edit.xml
View File

@ -58,6 +58,7 @@
android:background = "@null"
android:drawablePadding = "6dp"
android:hint = "请输入文章标题"
android:maxLength = "51"
android:paddingBottom = "17dp"
android:paddingLeft = "18dp"
android:paddingRight = "10dp"

2
app/src/main/res/layout/dialog_article_game.xml
View File

@ -17,7 +17,7 @@
android:gravity = "center_vertical"
android:paddingLeft = "25dp"
android:paddingRight = "25dp"
android:text = "请选择你要发布的游戏文章" />
android:text = "请选择游戏" />
<ImageView
android:id = "@+id/dialog_back"

4
app/src/main/res/values/strings.xml
View File

@ -581,10 +581,10 @@
<string name = "suggestion_function">功能需求<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>
<string name = "suggestion_contact">联系方式<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>
<string name = "article_placeholder" >请描写文章...</string >
<string name = "article_placeholder" >写文章...</string >
<string name = "share_community_article_url" >https://www.ghzs.com/communities/%1$s/articles/%2$s.html</string >
<string name = "share_community_article_title" >%1$s发布了文章：文章标题 （%2$d赞同）</string >
<string name = "share_community_article_title" >%1$s发布了文章：%2$s （%3$d赞同）</string >
</resources >