From 309d42fdc1e56bebb04f329339c9213639ec5dfb Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Sun, 10 Jun 2018 17:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81(=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=B8=B8=E6=88=8F=E5=88=86=E5=8C=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/entity/GameEntity.kt | 2 +- .../com/gh/gamecenter/game/GameFragment.kt | 7 ++---- .../gh/gamecenter/game/GameFragmentAdapter.kt | 3 +++ .../gh/gamecenter/game/GameSubjectAdapter.kt | 25 ------------------- .../game/GameSubjectItemViewHolder.kt | 8 ------ .../com/gh/gamecenter/game/GameViewModel.kt | 2 ++ .../game/{ => data}/GameItemData.kt | 2 +- .../game/{ => data}/GameSubjectData.kt | 2 +- .../{ => horizontal}/GameHorizontalAdapter.kt | 2 +- .../GameHorizontalItemViewHolder.kt | 2 +- .../GameHorizontalListViewHolder.kt | 2 +- .../fragment/game/GameFragmentAdapter.java | 4 +-- libraries/LGLibrary | 2 +- 13 files changed, 16 insertions(+), 47 deletions(-) delete mode 100644 app/src/main/java/com/gh/gamecenter/game/GameSubjectAdapter.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/game/GameSubjectItemViewHolder.kt rename app/src/main/java/com/gh/gamecenter/game/{ => data}/GameItemData.kt (93%) rename app/src/main/java/com/gh/gamecenter/game/{ => data}/GameSubjectData.kt (74%) rename app/src/main/java/com/gh/gamecenter/game/{ => horizontal}/GameHorizontalAdapter.kt (97%) rename app/src/main/java/com/gh/gamecenter/game/{ => horizontal}/GameHorizontalItemViewHolder.kt (88%) rename app/src/main/java/com/gh/gamecenter/game/{ => horizontal}/GameHorizontalListViewHolder.kt (88%) 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 49d1ba7b24..36c9237ac6 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt @@ -4,7 +4,7 @@ import android.os.Parcel import android.os.Parcelable import android.support.v4.util.ArrayMap import com.gh.common.constant.Config -import com.gh.gamecenter.game.GameSubjectData +import com.gh.gamecenter.game.data.GameSubjectData import com.google.gson.annotations.SerializedName import com.lightgame.download.DownloadEntity diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt index 5135182e9c..b1ccf2fc88 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt @@ -15,6 +15,7 @@ import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.databinding.FragmentGameBinding import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage +import com.gh.gamecenter.game.data.ItemData import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity import org.greenrobot.eventbus.Subscribe @@ -113,11 +114,7 @@ class GameFragment : BaseFragment() { fun onEventMainThread(busFour: EBPackage) { val data = mListAdapter?.getGameEntityByPackage(busFour.packageName) if (data != null) { - if (data.position == 1) { - mViewModel?.initPlugin() // 卸载是无法更新插件化模块 - } else { - mListAdapter?.notifyItemChanged(data.position) - } + mListAdapter?.notifyItemChanged(data.position) } } 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 5fe58fa47f..77cfe39bb6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -23,6 +23,9 @@ import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus +import com.gh.gamecenter.game.data.ItemData +import com.gh.gamecenter.game.horizontal.GameHorizontalAdapter +import com.gh.gamecenter.game.horizontal.GameHorizontalListViewHolder import com.halo.assistant.fragment.game.GamePluginAdapter import com.halo.assistant.fragment.game.GamePluginViewHolder import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/game/GameSubjectAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameSubjectAdapter.kt deleted file mode 100644 index 1fde1515f4..0000000000 --- a/app/src/main/java/com/gh/gamecenter/game/GameSubjectAdapter.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.gh.gamecenter.game - -import android.content.Context -import android.view.ViewGroup -import com.gh.gamecenter.R -import com.gh.gamecenter.databinding.GameItemBinding -import com.gh.gamecenter.entity.GameEntity -import com.lightgame.adapter.BaseRecyclerAdapter - -class GameSubjectAdapter(context: Context, gameList: List) : BaseRecyclerAdapter(context) { - - private val mGameList = gameList - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameItemViewHolder? { - return GameItemViewHolder(GameItemBinding.bind(mLayoutInflater.inflate(R.layout.game_item, parent, false))) - } - - override fun onBindViewHolder(holder: GameItemViewHolder, position: Int) { - holder.binding.game = mGameList[position] - } - - override fun getItemCount(): Int { - return if (mGameList[0].id.isNullOrEmpty()) mGameList.size else mGameList.size - 1 - } -} diff --git a/app/src/main/java/com/gh/gamecenter/game/GameSubjectItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/GameSubjectItemViewHolder.kt deleted file mode 100644 index 77e034ba3e..0000000000 --- a/app/src/main/java/com/gh/gamecenter/game/GameSubjectItemViewHolder.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.gh.gamecenter.game - -import com.gh.base.BaseRecyclerViewHolder -import com.gh.gamecenter.databinding.GameSubjectItemBinding - -class GameSubjectItemViewHolder(bind: GameSubjectItemBinding) : BaseRecyclerViewHolder(bind.root) { - var binding = bind -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt index d03211234f..85e3ab998b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt @@ -11,6 +11,8 @@ import com.gh.common.util.RandomUtils import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.entity.* +import com.gh.gamecenter.game.data.GameSubjectData +import com.gh.gamecenter.game.data.ItemData import com.gh.gamecenter.manager.PackageManager import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/gamecenter/game/GameItemData.kt b/app/src/main/java/com/gh/gamecenter/game/data/GameItemData.kt similarity index 93% rename from app/src/main/java/com/gh/gamecenter/game/GameItemData.kt rename to app/src/main/java/com/gh/gamecenter/game/data/GameItemData.kt index a5daeb2b8b..258f8c7e3b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameItemData.kt +++ b/app/src/main/java/com/gh/gamecenter/game/data/GameItemData.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.game +package com.gh.gamecenter.game.data import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SlideEntity diff --git a/app/src/main/java/com/gh/gamecenter/game/GameSubjectData.kt b/app/src/main/java/com/gh/gamecenter/game/data/GameSubjectData.kt similarity index 74% rename from app/src/main/java/com/gh/gamecenter/game/GameSubjectData.kt rename to app/src/main/java/com/gh/gamecenter/game/data/GameSubjectData.kt index dbe3261800..249706ab94 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameSubjectData.kt +++ b/app/src/main/java/com/gh/gamecenter/game/data/GameSubjectData.kt @@ -1,3 +1,3 @@ -package com.gh.gamecenter.game +package com.gh.gamecenter.game.data data class GameSubjectData(val name: String?, val tag: String?, val position: Int?, val isOrder: Boolean) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameHorizontalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt similarity index 97% rename from app/src/main/java/com/gh/gamecenter/game/GameHorizontalAdapter.kt rename to app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt index fcd2e819c0..dd307d0cbe 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameHorizontalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.game +package com.gh.gamecenter.game.horizontal import android.content.Context import android.view.ViewGroup diff --git a/app/src/main/java/com/gh/gamecenter/game/GameHorizontalItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalItemViewHolder.kt similarity index 88% rename from app/src/main/java/com/gh/gamecenter/game/GameHorizontalItemViewHolder.kt rename to app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalItemViewHolder.kt index c9cbbf0af4..7d4d84883f 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameHorizontalItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalItemViewHolder.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.game +package com.gh.gamecenter.game.horizontal import com.gh.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.GameHorizontalItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/game/GameHorizontalListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalListViewHolder.kt similarity index 88% rename from app/src/main/java/com/gh/gamecenter/game/GameHorizontalListViewHolder.kt rename to app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalListViewHolder.kt index 36e42d5bb4..2ae57796c6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameHorizontalListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalListViewHolder.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.game +package com.gh.gamecenter.game.horizontal import com.gh.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.GameHorizontalListBinding diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java index 1965b73802..0e2e9a9604 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java @@ -43,11 +43,11 @@ //import com.gh.gamecenter.NewsDetailActivity; //import com.gh.gamecenter.R; //import com.gh.gamecenter.SubjectActivity; -//import com.gh.gamecenter.game.GameHorizontalAdapter; +//import com.gh.gamecenter.game.horizontal.GameHorizontalAdapter; //import com.gh.gamecenter.adapter.ImagePagerAdapter; //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; //import com.gh.gamecenter.adapter.viewholder.GameHeadViewHolder; -//import com.gh.gamecenter.game.GameHorizontalListViewHolder; +//import com.gh.gamecenter.game.horizontal.GameHorizontalListViewHolder; //import com.gh.gamecenter.adapter.viewholder.GameImageViewHolder; //import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; //import com.gh.gamecenter.adapter.viewholder.GameTestViewHolder; diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 5b735b0e09..c5515615fa 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 5b735b0e099fa7cb6d3b8ec259567e14e6c99065 +Subproject commit c5515615fac5d52e601aeb81c7d50e0619ec42ad