From 6cd801287c1c2c4bca4e25b0f424f002b9f75385 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 19 Oct 2018 19:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.5=20DEV?= =?UTF-8?q?=EF=BC=8820181011-1800=EF=BC=89=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB=EF=BC=88=E5=89=8D=E7=AB=AF=EF=BC=89?= =?UTF-8?q?https://gitlab.ghzhushou.com/pm/halo-app-issues/issues/370=20(?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=9A1.10,11,13,14,15,20=EF=BC=8C22,25,27?= =?UTF-8?q?,28,29,30,31,32,35,36,)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DirectUtils.kt | 2 +- .../gh/gamecenter/SplashScreenActivity.java | 2 +- .../com/gh/gamecenter/entity/GameEntity.kt | 1 - .../gh/gamecenter/game/GameFragmentAdapter.kt | 2 ++ .../personalhome/PersonalHomeAdapter.kt | 6 +----- .../qa/article/detail/ArticleDetailActivity.kt | 4 +++- .../qa/article/edit/ArticleEditActivity.kt | 18 +++++++++++++----- .../qa/article/edit/ArticleEditViewModel.kt | 6 +++--- .../gamecenter/qa/column/AskColumnAdapter.kt | 2 +- .../column/detail/AskColumnDetailActivity.kt | 16 ++++++++++------ .../detail/QuestionsDetailAdapter.java | 2 +- .../retrofit/OkHttpCacheInterceptor.java | 11 +++++++++++ .../layout/activity_community_article_edit.xml | 1 + .../main/res/layout/dialog_article_game.xml | 2 +- app/src/main/res/values/strings.xml | 4 ++-- 15 files changed, 51 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt index 1a96c08e1a..ac7800a997 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -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) } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 34ccc4ff15..0d96c55781 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -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); diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt index a1df7b3019..a271fde975 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt @@ -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? = null, diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 91478ff1a1..e5f7187890 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -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) { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt index 3e119a84fd..8e6f1d5c93 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt @@ -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) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index 3e76e973e9..853fd4e4df 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -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) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 651e92899a..90fe7c1b44 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -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("() { 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) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt index c988c0aa8d..a939221c7b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt @@ -44,7 +44,7 @@ class AskColumnAdapter(context: Context) : BaseRecyclerAdapter { 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, "问题详情")); }); } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java index 9ff8a6f462..5ac97423df 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java @@ -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拿缓存 diff --git a/app/src/main/res/layout/activity_community_article_edit.xml b/app/src/main/res/layout/activity_community_article_edit.xml index 5c3cf7ebbd..1afcad9788 100644 --- a/app/src/main/res/layout/activity_community_article_edit.xml +++ b/app/src/main/res/layout/activity_community_article_edit.xml @@ -58,6 +58,7 @@ android:background = "@null" android:drawablePadding = "6dp" android:hint = "请输入文章标题" + android:maxLength = "51" android:paddingBottom = "17dp" android:paddingLeft = "18dp" android:paddingRight = "10dp" diff --git a/app/src/main/res/layout/dialog_article_game.xml b/app/src/main/res/layout/dialog_article_game.xml index a2cba24530..d0d4a5115e 100644 --- a/app/src/main/res/layout/dialog_article_game.xml +++ b/app/src/main/res/layout/dialog_article_game.xml @@ -17,7 +17,7 @@ android:gravity = "center_vertical" android:paddingLeft = "25dp" android:paddingRight = "25dp" - android:text = "请选择你要发布的游戏文章" /> + android:text = "请选择游戏" /> 功能需求*]]> 联系方式*]]> - 请描写文章... + 写文章... https://www.ghzs.com/communities/%1$s/articles/%2$s.html - %1$s发布了文章：文章标题 （%2$d赞同） + %1$s发布了文章：%2$s （%3$d赞同）