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

光环助手V3.6.3 RELEASE（20190331-1830）测试问题汇总（前端）(1.3.4.10) https://gitlab.ghzhushou.com/pm/halo-app-issues/issues/483

Browse Source
This commit is contained in:
kehaoyuan
2019-04-01 17:57:08 +08:00
parent 1a5ed3c05f
commit 426019ea7c
13 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.content.Intent
import android.content.SharedPreferences
import android.os.Build
import android.os.Bundle
import android.preference.PreferenceManager
import android.support.v4.app.Fragment
@ -167,6 +168,10 @@ class AskFragment : BaseFragment<Any>() {
mColumnLine.visibility = View.VISIBLE
}
})
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mPutQuestions.elevation = 10F
}
}
override fun onResume() {

2
app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt
View File

@ -218,7 +218,7 @@ class AnswerEditViewModel(application: Application,
override fun onFailure(e: HttpException?) {
super.onFailure(e)
if (isExit) saveDraftsLiveData.postValue(true)
if (isExit) saveDraftsLiveData.postValue(false)
}
})
}

3
app/src/main/java/com/gh/gamecenter/qa/entity/Questions.kt
View File

@ -17,4 +17,5 @@ data class Questions(@SerializedName("_id")
var answerCount: Int = 0,
var description: String? = null,
var images: List<String> = ArrayList(),
val time: Long = 0) : Parcelable
val time: Long = 0,
val count: Count = Count()) : Parcelable

3
app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java
View File

@ -131,9 +131,10 @@ public class AskSearchActivity extends BaseActivity {
} else {
mSearchEt.setHint("标签内搜索");
}
} else {
getCommunityDefaultSearch();
}
getCommunityDefaultSearch();
changeFragment();
mSearchEt.setOnEditorActionListener((v, actionId, event) -> {

5
app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchFragment.kt
View File

@ -22,6 +22,11 @@ abstract class BaseAskSearchFragment<T, VM : BaseListViewModel<T>> : ListFragmen
return setBaseAskListAdapter()
}
override fun onCreate(savedInstanceState: Bundle?) {
questionTag = arguments?.getString(EntranceUtils.KEY_QUESTION_TAG)
columnId = arguments?.getString(EntranceUtils.KEY_COLUMN_ID)
super.onCreate(savedInstanceState)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val searchKey = arguments?.getString(EntranceUtils.KEY_SEARCHKEY)

17
app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt
View File

@ -9,6 +9,7 @@ import android.view.View
import butterknife.OnClick
import com.gh.base.fragment.BaseFragment
import com.gh.common.util.DialogUtils
import com.gh.common.util.EntranceUtils
import com.gh.gamecenter.R
import com.gh.gamecenter.db.AskSearchHistoryDao
import kotterknife.bindView
@ -21,7 +22,7 @@ class HistoryFragment : BaseFragment<Any>() {
private val mCleanBtn by bindView<View>(R.id.search_history_clean)
private val mHotContainer by bindView<View>(R.id.search_hot_container)
private var dao: AskSearchHistoryDao? = null
private var mDao: AskSearchHistoryDao? = null
private var mHistoryAdapter: HistoryFragmentAdapter? = null
private lateinit var mViewModel: HistoryViewModel
@ -32,17 +33,16 @@ class HistoryFragment : BaseFragment<Any>() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
mDao = AskSearchHistoryDao(context)
mViewModel = ViewModelProviders.of(this).get(HistoryViewModel::class.java)
mViewModel.hotSearchLiveData.observe(this, Observer {
if (it?.size!! > 0) {
mHotRecyclerView.adapter = HotFragmentAdapter(context!!, it)
mHotRecyclerView.adapter = HotFragmentAdapter(context!!, it, mDao!!)
mHotContainer.visibility = View.VISIBLE
} else {
mHotContainer.visibility = View.GONE
}
})
dao = AskSearchHistoryDao(context)
mRecyclerView.layoutManager = object : GridLayoutManager(activity, 2) {
override fun canScrollVertically(): Boolean {
return false
@ -53,17 +53,22 @@ class HistoryFragment : BaseFragment<Any>() {
return false
}
}
mHistoryAdapter = HistoryFragmentAdapter(context!!, dao!!, historyEmptyCallback = {
mHistoryAdapter = HistoryFragmentAdapter(context!!, mDao!!, historyEmptyCallback = {
mHistoryContainer.visibility = View.GONE
})
mRecyclerView.adapter = mHistoryAdapter
if (activity?.intent?.getStringExtra(EntranceUtils.KEY_QUESTION_TAG).isNullOrEmpty() &&
activity?.intent?.getStringExtra(EntranceUtils.KEY_COLUMN_ID).isNullOrEmpty()) {
mViewModel.getHotSearch()
}
}
@OnClick(R.id.search_history_clean)
fun onDeleteClick() {
DialogUtils.showWarningDialog(activity, "清空记录", "确定清空历史搜索记录？") {
dao?.deleteAll()
mDao?.deleteAll()
mHistoryAdapter?.clearSearchResult()
mHistoryContainer.visibility = View.GONE
}

6
app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt
View File

@ -14,11 +14,7 @@ class HistoryViewModel(application: Application) : AndroidViewModel(application)
val hotSearchLiveData = MutableLiveData<List<CommunityHotSearch>>()
init {
getHotSearch()
}
private fun getHotSearch() {
fun getHotSearch() {
RetrofitManager.getInstance(getApplication()).api
.getCommunityHotSearch(UserManager.getInstance().community.id)
.subscribeOn(Schedulers.io())

12
app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt
View File

@ -6,6 +6,7 @@ import com.gh.base.BaseRecyclerViewHolder
import com.gh.common.util.MtaHelper
import com.gh.gamecenter.R
import com.gh.gamecenter.databinding.CommunitySearchHotItemBinding
import com.gh.gamecenter.db.AskSearchHistoryDao
import com.gh.gamecenter.eventbus.EBSearch
import com.gh.gamecenter.manager.UserManager
import com.gh.gamecenter.qa.entity.CommunityHotSearch
@ -14,7 +15,9 @@ import com.lightgame.adapter.BaseRecyclerAdapter
import com.lightgame.utils.Util_System_Keyboard
import org.greenrobot.eventbus.EventBus
class HotFragmentAdapter(context: Context, val list: List<CommunityHotSearch>)
class HotFragmentAdapter(context: Context,
private val mListEntity: List<CommunityHotSearch>,
private val mDao:AskSearchHistoryDao)
: BaseRecyclerAdapter<HotFragmentAdapter.HotViewHolder>(context) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HotFragmentAdapter.HotViewHolder {
@ -23,15 +26,16 @@ class HotFragmentAdapter(context: Context, val list: List<CommunityHotSearch>)
}
override fun getItemCount(): Int {
if (list.size > 8) return 8 // 最多显示8个
return list.size
if (mListEntity.size > 8) return 8 // 最多显示8个
return mListEntity.size
}
override fun onBindViewHolder(holder: HotFragmentAdapter.HotViewHolder, position: Int) {
val data = list[position]
val data = mListEntity[position]
holder.binding.setPosition(position + 1)
holder.binding.data = data
holder.itemView.setOnClickListener { v ->
mDao.add(data.keyword, UserManager.getInstance().community.id)
EventBus.getDefault().post(EBSearch(AskSearchActivity.ASK_SEARCH_EB_TYPE, data.keyword))
Util_System_Keyboard.hideSoftKeyboardByIBinder(mContext, v.windowToken)

3
app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt
View File

@ -2,7 +2,6 @@ package com.gh.gamecenter.qa.search.hottest
import android.arch.lifecycle.ViewModelProviders
import android.text.TextUtils
import com.gh.common.util.EntranceUtils
import com.gh.common.util.UrlFilterUtils
import com.gh.gamecenter.baselist.NormalListViewModel
import com.gh.gamecenter.manager.UserManager
@ -36,8 +35,6 @@ class HottestFragment : BaseAskSearchFragment<SearchHottestEntity, NormalListVie
}
override fun provideDataObservable(page: Int): Observable<List<SearchHottestEntity>>? {
questionTag = activity?.intent?.getStringExtra(EntranceUtils.KEY_QUESTION_TAG)
columnId = activity?.intent?.getStringExtra(EntranceUtils.KEY_COLUMN_ID)
val api = RetrofitManager.getInstance(context).api
return if (TextUtils.isEmpty(mSearchKey)) null
else if (!questionTag.isNullOrEmpty()) {

3
app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt
View File

@ -2,7 +2,6 @@ package com.gh.gamecenter.qa.search.newest
import android.arch.lifecycle.ViewModelProviders
import android.text.TextUtils
import com.gh.common.util.EntranceUtils
import com.gh.common.util.UrlFilterUtils
import com.gh.gamecenter.baselist.NormalListViewModel
import com.gh.gamecenter.manager.UserManager
@ -36,8 +35,6 @@ class NewestFragment : BaseAskSearchFragment<SearchNewestEntity, NormalListViewM
}
override fun provideDataObservable(page: Int): Observable<List<SearchNewestEntity>>? {
questionTag = activity?.intent?.getStringExtra(EntranceUtils.KEY_QUESTION_TAG)
columnId = activity?.intent?.getStringExtra(EntranceUtils.KEY_COLUMN_ID)
val api = RetrofitManager.getInstance(context).api
return if (TextUtils.isEmpty(mSearchKey)) null
else if (!questionTag.isNullOrEmpty()) {

2
app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt
View File

@ -32,7 +32,7 @@ class QuestionAdapter(context: Context,
if (holder is AskSearchQuestionItemViewHolder) {
val entity = mEntityList[position]
holder.binding.questionsTitle.text = Html.fromHtml(replayKeyword(entity.title))
holder.binding.questionsAnswerCount.text = (NumberUtils.transSimpleCount(entity.answerCount) + " 回答")
holder.binding.questionsAnswerCount.text = (NumberUtils.transSimpleCount(entity.count.answer) + " 回答")
holder.itemView.setOnClickListener {
val questions = Questions()
questions.id = entity.id

3
app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt
View File

@ -2,7 +2,6 @@ package com.gh.gamecenter.qa.search.question
import android.arch.lifecycle.ViewModelProviders
import android.text.TextUtils
import com.gh.common.util.EntranceUtils
import com.gh.common.util.UrlFilterUtils
import com.gh.gamecenter.baselist.NormalListViewModel
import com.gh.gamecenter.manager.UserManager
@ -36,8 +35,6 @@ class QuestionFragment : BaseAskSearchFragment<Questions, NormalListViewModel<Qu
}
override fun provideDataObservable(page: Int): Observable<List<Questions>>? {
questionTag = activity?.intent?.getStringExtra(EntranceUtils.KEY_QUESTION_TAG)
columnId = activity?.intent?.getStringExtra(EntranceUtils.KEY_COLUMN_ID)
val api = RetrofitManager.getInstance(context).api
return if (TextUtils.isEmpty(mSearchKey)) null
else if (!questionTag.isNullOrEmpty()) {

3
app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt
View File

@ -4,7 +4,6 @@ import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.text.TextUtils
import com.gh.common.util.EntranceUtils
import com.gh.common.util.UrlFilterUtils
import com.gh.gamecenter.entity.FollowersOrFansEntity
import com.gh.gamecenter.manager.UserManager
@ -47,8 +46,6 @@ class UserFragment : BaseAskSearchFragment<FollowersOrFansEntity, UserViewModel>
}
override fun provideDataObservable(page: Int): Observable<List<FollowersOrFansEntity>>? {
questionTag = activity?.intent?.getStringExtra(EntranceUtils.KEY_QUESTION_TAG)
columnId = activity?.intent?.getStringExtra(EntranceUtils.KEY_COLUMN_ID)
val api = RetrofitManager.getInstance(context).api
return if (TextUtils.isEmpty(mSearchKey)) null
else if (!questionTag.isNullOrEmpty()) {