代码优化，解决冲突

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt

@@ -155,7 +155,8 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
         when (carrierType) {
             Constant.CARRIER_HOMEVEDIO_CHALLENGE, Constant.CARRIER_MINIVEDIO_CHALLENGE,
             Constant.CARRIER_GAME_ONLINE, Constant.CARRIER_EATMEAL,
-            Constant.CARRIER_RUISHINEWS_CHALLANGE, Constant.CARRIER_ZHANGYUE_CHALLENGE -> {
+            Constant.CARRIER_RUISHINEWS_CHALLANGE, Constant.CARRIER_ZHANGYUE_CHALLENGE,
+            Constant.CARRIER_XMLY_CHALLENGE -> {
                 val vo = HashMap<String, Any>()
                 vo["carrierType"] = carrierType
                 awardPresenter.reportAddCoinMsg(vo)

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MainActivity.kt

@@ -150,6 +150,12 @@ class MainActivity : BaseActivity(), MainView, View.OnClickListener {
         }
     }
 
+    fun selectXmly() {
+        moneyFragment?.let {
+            (it as MoneyFragment).selectXmly()
+        }
+    }
+
     /**
      * 点击第二个tab
      */

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/XmlyPlayActivity.kt

@@ -8,6 +8,8 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mints.goodmoney.MintsApplication
 import com.mints.goodmoney.R
+import com.mints.goodmoney.ad.express.TTPreLoadExpressXmlyManager
+import com.mints.goodmoney.common.AppConfig
 import com.mints.goodmoney.manager.TrackManager
 import com.mints.goodmoney.manager.UserManager
 import com.mints.goodmoney.mvp.presenters.XmlyPlayPresenter
@@ -111,7 +113,7 @@ class XmlyPlayActivity : BaseActivity(), View.OnClickListener, XmlyPlayAdapter.O
 
                 mPlayerManager.removeOnConnectedListerner(this)
                 mPlayerManager.playMode = XmPlayListControl.PlayMode.PLAY_MODEL_LIST_LOOP
-                Toast.makeText(this@XmlyPlayActivity, "播放器初始化成功", Toast.LENGTH_SHORT).show()
+//                Toast.makeText(this@XmlyPlayActivity, "播放器初始化成功", Toast.LENGTH_SHORT).show()
 
                 loadUnlockMsg()
                 loadData()
@@ -119,6 +121,13 @@ class XmlyPlayActivity : BaseActivity(), View.OnClickListener, XmlyPlayAdapter.O
         })
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        // 刷新喜马拉雅信息流
+        TTPreLoadExpressXmlyManager.getInstance().loadTtFrameLayout()
+    }
+
     private fun loadUnlockMsg() {
         xmlyPlayPresenter.getXmlyUnlockMsg(userManager.userID, mCategoryId.toString(), mAlbumId.toString())
     }
@@ -140,7 +149,7 @@ class XmlyPlayActivity : BaseActivity(), View.OnClickListener, XmlyPlayAdapter.O
                             tv_title.text = p0.albumTitle
                             GlideUtils.loadImageView(this@XmlyPlayActivity, p0.coverUrlMiddle, sound_cover)
                         }
-
+                        control_bar.visibility = View.VISIBLE
                         getDataSuc(p0.tracks)
                     }
 
@@ -420,10 +429,16 @@ class XmlyPlayActivity : BaseActivity(), View.OnClickListener, XmlyPlayAdapter.O
                 return
             }
         }
-        readyGo(XmlyAwardActivity::class.java)
-        xmlyPlayPresenter.pushXmlyUnlockMsg(userManager.userID, mCategoryId.toString(), mAlbumId.toString(), (position + 1).toString())
-        mUnlockList.add((position + 1).toString())
-        xmlyPlayAdapter.notifyItemChanged(position)
+
+        // 广告解锁
+        if (AppConfig.xmlyAdFlag) {
+            readyGo(XmlyAwardActivity::class.java)
+            xmlyPlayPresenter.pushXmlyUnlockMsg(userManager.userID, mCategoryId.toString(), mAlbumId.toString(), (position + 1).toString())
+            mUnlockList.add((position + 1).toString())
+            xmlyPlayAdapter.notifyItemChanged(position)
+        } else {
+            showToast("解锁失败，请重试")
+        }
     }
 
     override fun getXmlyUnlockMsgSuc(list: List<String>) {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/MainMyAdapter.kt

@@ -42,6 +42,9 @@ class MainMyAdapter(context: Context, taskData: MutableList<MyInfo.AutoListBean>
 
         // 电魂
         const val TO_DHGAME = "TO_DHGAME"
+
+        // 喜马拉雅
+        const val TO_XMLY = "TO_XMLY"
     }
 
     private var mContext: Context = context

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MoneyFragment.kt

@@ -144,6 +144,13 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
         addOrShowFragment(childFragmentManager, bookStoreFragment!!, FRAGMENT_TAG_BOOKSTORE)
     }
 
+    fun selectXmly() {
+        if (xmlyGameFragment == null) {
+            xmlyGameFragment = XmlyFragment()
+        }
+        addOrShowFragment(childFragmentManager, xmlyGameFragment!!, FRAGMENT_TAG_XMLY)
+    }
+
     override fun onTabReselected(tab: XTabLayout.Tab) {
     }
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt

@@ -564,6 +564,13 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
 
                         readyGo(DhGameActivity::class.java)
                     }
+                    MainMyAdapter.TO_XMLY -> {
+                        val activity: MainActivity? = activity as MainActivity?
+                        activity?.let {
+                            it.clickTab1Layout()
+                            it.selectXmly()
+                        }
+                    }
                 }
             }
         }
@@ -661,8 +668,6 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
                     }
                     Constant.HOT_ACTIVITY_LIEBAO -> {
                         readyGo(LiebaoGameActivity::class.java)
-//                        readyGo(XmlyActivity::class.java)
-//                        readyGo(XmlyAwardActivity::class.java)
                     }
                     Constant.HOT_ACTIVITY_MORNINGCLOCK -> {
                         TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_MORNINGCLOCK)

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/XmlyPageFragment.kt

@@ -7,14 +7,14 @@ import com.mints.goodmoney.ui.activitys.XmlyPlayActivity
 import com.mints.goodmoney.ui.adapter.XmlyPageAdapter
 import com.mints.goodmoney.ui.fragment.base.LazyLoadBaseFragment
 import com.mints.goodmoney.utils.LogUtil
-import com.ximalaya.ting.android.opensdk.constants.DTransferConstants
-import com.ximalaya.ting.android.opensdk.datatrasfer.CommonRequest
-import com.ximalaya.ting.android.opensdk.datatrasfer.IDataCallBack
-import com.ximalaya.ting.android.opensdk.model.album.AlbumList
 import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener
+import com.ximalaya.ting.android.opensdk.constants.DTransferConstants
+import com.ximalaya.ting.android.opensdk.datatrasfer.CommonRequest
+import com.ximalaya.ting.android.opensdk.datatrasfer.IDataCallBack
 import com.ximalaya.ting.android.opensdk.model.album.Album
+import com.ximalaya.ting.android.opensdk.model.album.AlbumList
 import kotlinx.android.synthetic.main.fragment_main_xmly_page.*
 
 /**

GoodMoney/app/src/main/res/layout/activity_xmly_play.xml

@@ -9,6 +9,7 @@
     <include layout="@layout/header_layout" />
 
     <RelativeLayout
+        android:visibility="invisible"
         android:id="@+id/control_bar"
         android:layout_width="match_parent"
         android:layout_height="116dp"