From a6b7beed75d71c0f4e7d2b4890f38c86bcb42747 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Mon, 27 Aug 2018 20:21:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.4=20RELE?= =?UTF-8?q?ASE=EF=BC=8820180827-0940=EF=BC=89=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/base/BaseToolBarActivity.java | 9 ++- .../com/gh/gamecenter/CropImageActivity.java | 2 +- .../java/com/gh/gamecenter/SkipActivity.java | 3 +- .../com/gh/gamecenter/SuggestionActivity.java | 2 +- .../personalhome/FollowersOrFansAdapter.kt | 17 +++--- .../personalhome/PersonalHomeAdapter.kt | 27 +++++---- .../com/gh/gamecenter/qa/AskFragment.java | 8 ++- .../answer/detail/AnswerDetailFragment.java | 18 +++--- .../qa/answer/edit/AnswerEditFragment.java | 2 +- .../column/detail/AskColumnDetailActivity.kt | 59 ++++++++++++++----- .../questions/edit/QuestionEditViewModel.kt | 2 +- .../search/SearchGameDetailFragment.java | 4 +- .../search/SearchGameListFragment.java | 4 +- .../gh/gamecenter/user/UserRepository.java | 6 +- .../res/layout/activity_ask_column_detail.xml | 2 + .../main/res/layout/personal_home_item.xml | 14 ++--- app/src/main/res/values/strings.xml | 4 +- libraries/LGLibrary | 2 +- 18 files changed, 115 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseToolBarActivity.java b/app/src/main/java/com/gh/base/BaseToolBarActivity.java index a976a992e9..34d5107813 100644 --- a/app/src/main/java/com/gh/base/BaseToolBarActivity.java +++ b/app/src/main/java/com/gh/base/BaseToolBarActivity.java @@ -7,6 +7,8 @@ import android.support.v4.app.Fragment; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import android.view.ViewGroup; +import android.widget.RelativeLayout; import android.widget.TextView; import com.gh.common.util.DisplayUtils; @@ -84,7 +86,12 @@ public abstract class BaseToolBarActivity extends BaseAppCompatActivity implemen // 限制标题实际宽度 防止标题挡住toolbar menu按钮 if (menu.size() > 2 && mTitleTv != null) { - mTitleTv.setPadding(DisplayUtils.dip2px(40), 0, DisplayUtils.dip2px(40), 0); + ViewGroup.LayoutParams layoutParams = mTitleTv.getLayoutParams(); + if (layoutParams instanceof RelativeLayout.LayoutParams) { + RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) layoutParams; + params.setMargins(DisplayUtils.dip2px(90), 0, DisplayUtils.dip2px(90), 0); + mTitleTv.setLayoutParams(params); + } } } diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index 7522978026..16174ba800 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -116,7 +116,7 @@ public class CropImageActivity extends BaseActivity { int percent = (int) (100 * (progress / (float) total)); if (percent >= 100) percent = 99; if (postDialog != null) { - postDialog.uploadWaitingHint("图片上传中" + percent + "%"); + postDialog.uploadWaitingHint("图片上传中 " + percent + "%"); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 63e3697331..edb86ab7ed 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -21,6 +21,7 @@ import static com.gh.common.util.EntranceUtils.HOST_QUESTION; import static com.gh.common.util.EntranceUtils.HOST_SUGGESTION; import static com.gh.common.util.EntranceUtils.KEY_GAME_NAME; import static com.gh.common.util.EntranceUtils.KEY_NAME; +import static com.gh.common.util.EntranceUtils.KEY_PACKAGENAME; import static com.gh.common.util.EntranceUtils.KEY_PLATFORM; import static com.gh.common.util.EntranceUtils.KEY_VERSION; @@ -73,7 +74,7 @@ public class SkipActivity extends BaseActivity { DirectUtils.directToFeedback(this, content, ENTRANCE_BROWSER); break; case HOST_DOWNLOAD: - DirectUtils.directToDownloadManager(this, ENTRANCE_BROWSER); + DirectUtils.directToDownloadManagerAndStartDownload(this, id, uri.getQueryParameter(KEY_PACKAGENAME), ENTRANCE_BROWSER); break; case HOST_ANSWER: DirectUtils.directToAnswerDetail(this, id, ENTRANCE_BROWSER, "浏览器"); diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index a88c22cbbf..f1c2781f0c 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -517,7 +517,7 @@ public class SuggestionActivity extends BaseActivity implements OnRequestCallBac int percent = (int) (100 * (progress / (float) total)); if (percent >= 100) percent = 99; if (postDialog != null) { - postDialog.uploadWaitingHint("图片上传中" + percent + "%"); + postDialog.uploadWaitingHint("图片上传中 " + percent + "%"); } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt index 503b389228..c9f657d2a7 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt @@ -8,6 +8,7 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import com.gh.common.constant.ItemViewType +import com.gh.common.util.CheckLoginUtils import com.gh.common.util.DialogUtils import com.gh.gamecenter.PersonalHomeActivity import com.gh.gamecenter.R @@ -64,14 +65,16 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi } } holder.binding.followerBtn.setOnClickListener { - if (entity.id != UserManager.getInstance().userId) { - if (entity?.me?.isFollower!!) { - DialogUtils.showAlertDialog(mContext, "取消关注", "确定要取消关注吗？", - "确定取消", "暂不取消", DialogUtils.ConfirmListener { + CheckLoginUtils.checkLogin(mContext) { + if (entity.id != UserManager.getInstance().userId) { + if (entity?.me?.isFollower!!) { + DialogUtils.showAlertDialog(mContext, "取消关注", "确定要取消关注吗？", + "确定取消", "暂不取消", DialogUtils.ConfirmListener { + follower(entity, holder.binding.followerBtn) + }, null) + } else { follower(entity, holder.binding.followerBtn) - }, null) - } else { - follower(entity, holder.binding.followerBtn) + } } } } 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 cfbe1e6075..a72f6467f1 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt @@ -8,6 +8,7 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import com.gh.common.constant.ItemViewType +import com.gh.common.util.CheckLoginUtils import com.gh.common.util.DialogUtils import com.gh.common.util.NewsUtils import com.gh.gamecenter.R @@ -126,22 +127,24 @@ class PersonalHomeAdapter(context: Context, } userVoteContainer.setOnClickListener { if (mListViewModel.userId == UserManager.getInstance().userId) { - Utils.toast(mContext, "我的回答共获得" + entity?.count?.answerVote + "赞同") + Utils.toast(mContext, "我的回答已获得 " + entity?.count?.answerVote + " 赞同") } else { - Utils.toast(mContext, "Ta的回答共获得" + entity?.count?.answerVote + "赞同") + Utils.toast(mContext, "Ta的回答已获得 " + entity?.count?.answerVote + " 赞同") } } userConcernOrEdit.setOnClickListener { - if (mListViewModel.userId == UserManager.getInstance().userId) { - mContext.startActivity(UserInfoActivity.getIntent(mContext)) - } else { - if (personalData?.me?.isFollower!!) { - DialogUtils.showAlertDialog(mContext, "取消关注", "确定要取消关注吗？", - "确定取消", "暂不取消", DialogUtils.ConfirmListener { - follower(userConcernOrEdit) - }, null) + CheckLoginUtils.checkLogin(mContext) { + if (mListViewModel.userId == UserManager.getInstance().userId) { + mContext.startActivity(UserInfoActivity.getIntent(mContext)) } else { - follower(userConcernOrEdit) + if (personalData?.me?.isFollower!!) { + DialogUtils.showAlertDialog(mContext, "取消关注", "确定要取消关注 ${personalData?.name} 吗？", + "确定取消", "暂不取消", DialogUtils.ConfirmListener { + follower(userConcernOrEdit) + }, null) + } else { + follower(userConcernOrEdit) + } } } } @@ -196,7 +199,7 @@ class PersonalHomeAdapter(context: Context, private fun getUserCommand(type: String, time: Long): String { return when (type) { - "answer" -> NewsUtils.getFormattedTime(time) + " 回答了问题" + "answer" -> NewsUtils.getFormattedTime(time) + " 发布了回答" "question" -> NewsUtils.getFormattedTime(time) + " 提交了问题" "answer_vote" -> NewsUtils.getFormattedTime(time) + " 赞同了回答" "follow_question" -> NewsUtils.getFormattedTime(time) + " 关注了问题" diff --git a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.java b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.java index ca053095a8..1b59dc0514 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.java @@ -242,9 +242,7 @@ public class AskFragment extends BaseFragment { @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBReuse reuse) { if (EB_SELECT_KEY.equals(reuse.getType())) { - showCommunitiesSelectFragment(false); onActivityResult(COMMUNITIES_SELECT_REQUEST, Activity.RESULT_OK, new Intent()); - showHintDialog(); mSelectGameHint.setVisibility(!mHasClickedSelectGame ? View.VISIBLE : View.GONE); } else if (EB_RETRY_PAGE.equals(reuse.getType())) { if (mOpenedFragment != null && mOpenedFragment.isVisible()) { @@ -278,10 +276,16 @@ public class AskFragment extends BaseFragment { getChildFragmentManager().beginTransaction().remove(mOpenedFragment).commitNowAllowingStateLoss(); } mOpenedFragment = null; + showHintDialog(); } } public void showHintDialog() { + boolean isShowCommunityHint = sp.getBoolean("isShowCommunityHint", true); + if (!isShowCommunityHint) { + return; + } + sp.edit().putBoolean("isShowCommunityHint", false).apply(); Dialog dialog = new Dialog(getContext(), R.style.DialogWindowTransparent); dialog.setCancelable(false); Window window = dialog.getWindow(); diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java index 6596b73d32..f9d6a2e224 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java @@ -323,7 +323,12 @@ public class AnswerDetailFragment extends NormalFragment { if (apiResponse == null) return; if (apiResponse.getData() != null) { - voteSuccess(); + MeEntity me = mDetailEntity.getMe(); + me.setAnswerVoted(true); + mDetailEntity.setMe(me); + int vote = mDetailEntity.getVote() + 1; + mDetailEntity.setVote(vote); + updateVote(); } else if (apiResponse.getHttpException() != null) { HttpException e = apiResponse.getHttpException(); if (e == null || e.code() != 403) { @@ -340,7 +345,7 @@ public class AnswerDetailFragment extends NormalFragment { } else if (errorCode == 403036) { toast(R.string.ask_vote_limit_hint); } else if (errorCode == 403047) { - voteSuccess(); + toast("账号状态异常，暂时无法点赞，如有疑问请联系客服"); } } catch (Exception e1) { e1.printStackTrace(); @@ -350,15 +355,6 @@ public class AnswerDetailFragment extends NormalFragment { }); } - private void voteSuccess() { - MeEntity me = mDetailEntity.getMe(); - me.setAnswerVoted(true); - mDetailEntity.setMe(me); - int vote = mDetailEntity.getVote() + 1; - mDetailEntity.setVote(vote); - updateVote(); - } - @Override public void onMenuItemClick(MenuItem menuItem) { switch (menuItem.getItemId()) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java index c480a41d5e..e1aee2ab02 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java @@ -245,7 +245,7 @@ public class AnswerEditFragment extends NormalFragment { int percent = (int) (100 * (progress / (float) total)); if (percent >= 100) percent = 99; if (postDialog != null) { - postDialog.uploadWaitingHint("图片上传中" + percent + "%"); + postDialog.uploadWaitingHint("图片上传中 " + percent + "%"); } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt index f61661c36d..311646a9e2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt @@ -5,6 +5,10 @@ import android.content.Intent import android.os.Bundle import android.support.v4.app.Fragment import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import android.widget.EditText +import android.widget.LinearLayout import com.gh.base.BaseActivity import com.gh.base.OnViewClickListener import com.gh.base.adapter.FragmentAdapter @@ -18,12 +22,19 @@ import com.gh.gamecenter.qa.column.detail.recommends.RecommendsFragment import com.gh.gamecenter.qa.column.detail.unanswered.UnansweredFragment import com.gh.gamecenter.qa.entity.AskTagGroupsEntity import com.gh.gamecenter.qa.search.AskSearchActivity +import kotterknife.bindView import java.util.* class AskColumnDetailActivity : BaseActivity() { var mBinding: ActivityAskColumnDetailBinding? = null + private val mBarQuestionBtn by bindView(R.id.bar_question_btn) + private val mBarSearchEdit by bindView(R.id.bar_search_edit) + private val mBarBack by bindView(R.id.bar_back) + private val mQuestionTagBar by bindView(R.id.normal_toolbar_container) + private val mColumnBar by bindView(R.id.search_actionbar) + var mColumnEntity: AskTagGroupsEntity? = null var mQuestionTag: String? = null @@ -33,13 +44,27 @@ class AskColumnDetailActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setToolbarMenu(R.menu.menu_search) - val menuItem = getMenuItem(R.id.menu_search) - menuItem?.setIcon(R.drawable.ic_column_search) mColumnEntity = intent.getParcelableExtra(EntranceUtils.KEY_ASK_COLUMN_TAG) mQuestionTag = intent.getStringExtra(EntranceUtils.KEY_ASK_TAG) - if (!mQuestionTag.isNullOrEmpty()) setNavigationTitle(mQuestionTag) + if (!mQuestionTag.isNullOrEmpty()) { + mQuestionTagBar.visibility = View.VISIBLE + mColumnBar.visibility = View.GONE + setNavigationTitle(mQuestionTag) + setToolbarMenu(R.menu.menu_search) + val menuItem = getMenuItem(R.id.menu_search) + menuItem?.setIcon(R.drawable.ic_column_search) + } else { + // init SearchBar + mQuestionTagBar.visibility = View.GONE + mColumnBar.visibility = View.VISIBLE + mBarBack.setOnClickListener { finish() } + mBarQuestionBtn.visibility = View.INVISIBLE + mBarQuestionBtn.layoutParams = LinearLayout.LayoutParams(DisplayUtils.dip2px(20F), ViewGroup.LayoutParams.MATCH_PARENT) + mBarSearchEdit.hint = "专栏内搜索" + mBarSearchEdit.isFocusable = false + mBarSearchEdit.setOnClickListener { skipActivity() } + } mBinding = ActivityAskColumnDetailBinding.bind(mContentView) mBinding?.columnDetailDes?.setExpendText("...更多") @@ -68,12 +93,12 @@ class AskColumnDetailActivity : BaseActivity() { mBinding?.columnDetailViewpager?.currentItem = position as Int } - mBinding?.columnDetailAppbar?.addOnOffsetChangedListener { _, verticalOffset -> - if (mQuestionTag.isNullOrEmpty()) { - if (Math.abs(verticalOffset) > DisplayUtils.dip2px(35F)) setNavigationTitle(mColumnEntity?.name) - else setNavigationTitle("") - } - } +// mBinding?.columnDetailAppbar?.addOnOffsetChangedListener { _, verticalOffset -> +// if (mQuestionTag.isNullOrEmpty()) { +// if (Math.abs(verticalOffset) > DisplayUtils.dip2px(35F)) setNavigationTitle(mColumnEntity?.name) +// else setNavigationTitle("") +// } +// } // set fragment val fragmentList = ArrayList() @@ -98,15 +123,19 @@ class AskColumnDetailActivity : BaseActivity() { override fun onMenuItemClick(item: MenuItem?): Boolean { if (item?.itemId == R.id.menu_search) { - if (!mQuestionTag.isNullOrEmpty()) { - startActivity(AskSearchActivity.getQuestionTagSearchIntent(this, mQuestionTag)) - } else { - startActivity(AskSearchActivity.getColumnSearchIntent(this, mColumnEntity?.id)) - } + skipActivity() } return super.onMenuItemClick(item) } + private fun skipActivity() { + if (!mQuestionTag.isNullOrEmpty()) { + startActivity(AskSearchActivity.getQuestionTagSearchIntent(this, mQuestionTag)) + } else { + startActivity(AskSearchActivity.getColumnSearchIntent(this, mColumnEntity?.id)) + } + } + companion object { fun getIntentByColumn(context: Context, entity: AskTagGroupsEntity, community: CommunityEntity): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt index 79d6cc5638..ec20dd5133 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt @@ -190,7 +190,7 @@ class QuestionEditViewModel(application: Application) : AndroidViewModel(applica override fun onProgress(total: Long, progress: Long) { var percent = (100 * (progress / total.toFloat())).toInt() if (percent >= 100) percent = 99 - processDialog.postValue(WaitingDialogFragment.WaitingDialogData("图片上传中$percent%", true)) + processDialog.postValue(WaitingDialogFragment.WaitingDialogData("图片上传中 $percent%", true)) } override fun onSuccess(imageUrl: String) { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index 325ac916a8..577720cd5e 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -132,10 +132,10 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC postDelayedRunnable(runnable, 1000); break; case R.id.reuse_nodata_skip_function: - SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.functionSuggest, null, "求功能：" + key); + SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.functionSuggest, null, null); break; case R.id.reuse_nodata_skip_game: - SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.gameCollect, null, "求游戏：" + key); + SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.gameCollect, null, null); break; } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index f36e9525c8..c77627f7f5 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -126,10 +126,10 @@ public class SearchGameListFragment extends BaseFragment implements OnRequestCal postDelayedRunnable(runnable, 1000); break; case R.id.reuse_nodata_skip_function: - SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.functionSuggest, null, "求功能：" + key); + SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.functionSuggest, null, null); break; case R.id.reuse_nodata_skip_game: - SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.gameCollect, null, "求游戏：" + key); + SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.gameCollect, null, null); break; } diff --git a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java index 93b4ec1337..aa6db2bd72 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java @@ -120,9 +120,6 @@ public class UserRepository { } public void logout() { - // 通知页面更新 - EventBus.getDefault().post(new EBReuse(PersonalFragment.LOGOUT_TAG)); - mLoginObsResponseUserInfo.postValue(null); mObservableLoginToken.postValue(null); @@ -146,6 +143,9 @@ public class UserRepository { PushManager.deleteAlias(); ImManager.detachIm(); + + // 通知页面更新 + EventBus.getDefault().post(new EBReuse(PersonalFragment.LOGOUT_TAG)); } public LiveData> getLoginUserInfo() { diff --git a/app/src/main/res/layout/activity_ask_column_detail.xml b/app/src/main/res/layout/activity_ask_column_detail.xml index 308364d04d..1fefd519d1 100644 --- a/app/src/main/res/layout/activity_ask_column_detail.xml +++ b/app/src/main/res/layout/activity_ask_column_detail.xml @@ -20,6 +20,8 @@ + + diff --git a/app/src/main/res/layout/personal_home_item.xml b/app/src/main/res/layout/personal_home_item.xml index 1566385727..5f808e1a01 100644 --- a/app/src/main/res/layout/personal_home_item.xml +++ b/app/src/main/res/layout/personal_home_item.xml @@ -27,9 +27,9 @@ @@ -37,16 +37,16 @@ android:id = "@+id/user_icon" style = "@style/frescoCircleStyle" imageUrl = "@{personalEntity.icon}" - android:layout_width = "30dp" - android:layout_height = "30dp" + android:layout_width = "20dp" + android:layout_height = "20dp" fresco:roundAsCircle = "true" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 200dc1806c..29dc8c46fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -162,7 +162,7 @@ 欢迎畅所欲言，光环助手会努力变得更好 普通反馈 功能收录 - 你最期待的新玩法是什么 + 想法还是可以有的，万一实现了呢 发生闪退 出现App自动退出或重启的情况请及时反馈 游戏问题 @@ -442,7 +442,7 @@ 评论内容可能包括敏感信息，请修改后再发表 评论失败，未知原因 账号异常，暂时无法编辑问题 - 账号异常，暂时无法编辑答案 + 账号异常，暂时无法编辑回答 账号异常，暂时无法点赞 提交失败，请检查网络设置 diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 52e07f6a3d..58f221cea0 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 52e07f6a3d1739c84184f894a3bf09a7403285e7 +Subproject commit 58f221cea087bb23c11f2cb27ff5b43bd02c93f7