修改bug

app/src/main/java/com/ym/game/GameActivity.kt

@@ -23,6 +23,7 @@ import com.ym.library.net.BaseObserver
 import com.ym.library.net.RxSchedulers
 import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
+import com.ym.library.utils.EventUtils
 import com.ym.library.utils.SettingPreference
 import com.ym.library.utils.JumpUtils
 import com.ym.library.utils.Utils
@@ -42,7 +43,7 @@ import java.lang.reflect.Method
  * @detail :
  */
 class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
-    private var mOrderString="";
+    private var mOrderString = "";
     private var mLoading: LoadingDialog? = null
     private val mContext = AppliContext.get()
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -58,12 +59,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         mLoading?.dismiss()
         TurntableDialog.initTurntableAnim()
         ToponManager.initRewardAd(this, AdID.mPlacementId_Reward_video_luck_farm)
+        getRankReceive()
     }
 
-    override fun onBackPressed() {
-        super.onBackPressed()
-        Log.d("wxw","back")
-    }
+
     /**
      * 调用Unity的方法
      * @param gameObjectName    调用的GameObject的名称
@@ -134,7 +133,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             override fun run() {
                 if (Utils.isFastClick()) {
                     TurntableDialog.showTurntable(this@GameActivity, this@GameActivity)
-                    RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_TURNTABLE_LOTTERYED)
                 }
 
             }
@@ -157,8 +155,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
      * 点击飞行宝箱看视频
      */
     fun adFlyBox() {
-        Log.e("M", "点击宝箱看视频")
-
         ToponManager.loadReward(this, object : ToponRewardListener {
             override fun onRewardedVideoAdPlayClicked(entity: ATAdInfo) {
                 Log.d("wxw", "onRewardedVideoAdPlayClicked")
@@ -168,7 +164,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                 Log.d("wxw", "onRewardedVideoAdClosed")
                 //看视频上报
                 getVideoAcceleratorsReceive();
-                 getFlyBoxReceive()
+                getFlyBoxReceive()
 
             }
 
@@ -355,11 +351,11 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             })
     }
 
-    fun jumpOrderDialog(){
+    fun jumpOrderDialog() {
 //        var inten = Intent(this,OrderListActivity::class.java)
 //        inten.putExtra("orderJson",mOrderString)
 //        startActivity(inten)
-        if (mOrderString!=null&&!mOrderString.equals("")){
+        if (mOrderString != null && !mOrderString.equals("")) {
             MainDialog.showOrderDialog(
                 this@GameActivity,
                 mOrderString
@@ -367,12 +363,13 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         }
 
     }
+
     //订单数据
     fun getOrderData(callback: IUnitySendMessageCallback?) {
         GameApiClient.gameApi.getOrderData().compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<OrderListEntity>() {
                 override fun onSuccess(result: OrderListEntity?) {
-                    mOrderString=Utils.obj2Str(result)
+                    mOrderString = Utils.obj2Str(result)
                     Log.d("wxw", "订单数据" + Utils.obj2Str(result))
                     callback?.onOrderListSuccess(true, Utils.obj2Str(result))
                 }
@@ -544,7 +541,8 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                                 this@GameActivity, type,
                                 "宝箱奖励",
                                 result.awardNum ?: 0,
-                                result
+                                result,
+                                this@GameActivity
                             )
                         }
                     }
@@ -556,10 +554,33 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             })
     }
 
+    fun getRankReceive() {
+        GameApiClient.gameApi.getRankReceive()
+            .compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<RankReceiveEntity>() {
+                override fun onSuccess(result: RankReceiveEntity?) {
+                    if (result != null) {
+                        if (result.awardCents > 0) {
+                            MainDialog.showgetRankRedPackage(
+                                this@GameActivity,
+                                result.awardCents, result.rank,
+                                this@GameActivity
+                            )
+                        }
+                    }
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                }
+            })
+    }
+
     override fun onCloseViewSuccess(isSuccess: Boolean) {
         //关闭view
         Log.d("wxw", "关闭view")
-        Log.d("wxw","关闭view")
-        callUnity("TitleView", "getHomeInfo","")
+        callUnity("TitleView", "getHomeInfo", "")
+    }
+    fun GameEvent(keyName: String,valueName:String){
+        EventUtils.onEvent(keyName,valueName);
     }
 }
\ No newline at end of file

app/src/main/java/com/ym/game/adapter/WateringTaskAdpater.kt

@@ -2,6 +2,7 @@ package com.ym.game.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -63,7 +64,7 @@ class WateringTaskAdpater :
                 holder.tvProgess.text = "${data.completedNum}/${data.targetNum}"
             }
 
-
+            holder.ivStatus.addClickScale()
             holder.ivStatus.setOnClickListener {
                 if (Utils.isFastClick()) {
                     when (data.status) {
@@ -138,4 +139,22 @@ class WateringTaskAdpater :
             override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {}
         })
     }
+
+    /**
+     * 添加点击缩放效果
+     */
+    fun View.addClickScale(scale: Float = 0.9f, duration: Long = 150) {
+        this.setOnTouchListener { _, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    this.animate().scaleX(scale).scaleY(scale).setDuration(duration).start()
+                }
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                    this.animate().scaleX(1f).scaleY(1f).setDuration(duration).start()
+                }
+            }
+            // 点击事件处理，交给View自身
+            this.onTouchEvent(event)
+        }
+    }
 }
\ No newline at end of file

app/src/main/java/com/ym/game/module/RankReceiveEntity.kt

+package com.ym.game.module
+
+class RankReceiveEntity {
+    var awardCents: Int = 0
+    var rank: Int = 0
+}
\ No newline at end of file

app/src/main/java/com/ym/game/net/IGameApi.kt

@@ -125,6 +125,7 @@ interface IGameApi {
      */
     @POST(NetConfig.Game.URL_GAME_INCR_SEED)
     fun getVideoSeedReceive(@Query("id") id: Int): Observable<Response<StatusEntity>>
+
     /**
      * 看视频获得加速剂
      * @param
@@ -143,7 +144,7 @@ interface IGameApi {
     @POST(NetConfig.Game.URL_GAME_OPEN_BOX)
     fun getopenBox(): Observable<Response<FlyBoxEntity>>
 
-   /**
+    /**
      * 看视频上报
      * @param
      * @paramq
@@ -152,8 +153,6 @@ interface IGameApi {
     @POST(NetConfig.Game.URL_GAME_AD_VIDEO_REPORT)
     fun adVideoReport(): Observable<Response<StatusEntity>>
 
-
-
     /**
      * 任务领取奖励
      * @param
@@ -162,4 +161,14 @@ interface IGameApi {
      */
     @POST(NetConfig.Game.URL_GAME_DAILY_TASK_RECEIVE)
     fun getTaskReceive(@Query("id") id: Int, @Query("type") type: Int): Observable<Response<Any>>
+
+    /**
+     * 排行榜领取
+     * @param
+     * @paramq
+     * @return
+     */
+    @POST(NetConfig.Game.URL_GAME_FARM_RANK_RECEIVE)
+    fun getRankReceive(): Observable<Response<RankReceiveEntity>>
+
 }
\ No newline at end of file

app/src/main/java/com/ym/game/view/MainDialog.kt

@@ -10,6 +10,7 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import com.ym.game.IDialogViewCloseCallback
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.ym.game.adapter.GameOrderListAdapter
@@ -20,6 +21,7 @@ import com.ym.library.AppliContext
 import com.ym.library.utils.PhoneUtils
 import com.ym.library.utils.Utils
 import com.ym.xync.R
+import java.text.DecimalFormat
 import kotlinx.android.synthetic.main.activity_order_list.*
 
 object MainDialog {
@@ -84,20 +86,22 @@ object MainDialog {
         val llcontent3 = mDialogView?.findViewById<LinearLayout>(R.id.id_ll_content_3)
         val ivGetDropBg3 = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_bg3)
         val tvGetDropCount3 = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count3)
+        var tvget = mDialogView?.findViewById<TextView>(R.id.id_tv_get)
         //3 种子 4 金币 5 加速剂
         when (type) {
             3 -> {
+                tvget.text = "恭喜获得种子"
                 llcontent2.visibility = View.GONE
                 llcontent3.visibility = View.GONE
                 if (list?.seedList?.size == 1) {
                     setImage(ivGetDropBg, list?.seedList[0].id)
-                    tvGetDropCount.text = "x${list?.seedList[0].num}"
+                    tvGetDropCount.text = "+${list?.seedList[0].num}"
                 } else if (list?.seedList?.size == 2) {
                     llcontent2.visibility = View.VISIBLE
                     setImage(ivGetDropBg, list?.seedList[0].id)
-                    tvGetDropCount.text = "x${list?.seedList[0].num}"
+                    tvGetDropCount.text = "+${list?.seedList[0].num}"
                     setImage(ivGetDropBg2, list?.seedList[1].id)
-                    tvGetDropCount2.text = "x${list?.seedList[1].num}"
+                    tvGetDropCount2.text = "+${list?.seedList[1].num}"
 
                 } else if (list?.seedList?.size == 3) {
                     llcontent2.visibility = View.VISIBLE
@@ -105,17 +109,19 @@ object MainDialog {
                     setImage(ivGetDropBg, list?.seedList[0].id)
                     setImage(ivGetDropBg2, list?.seedList[1].id)
                     setImage(ivGetDropBg3, list?.seedList[2].id)
-                    tvGetDropCount.text = "x${list?.seedList[0].num}"
-                    tvGetDropCount2.text = "x${list?.seedList[1].num}"
-                    tvGetDropCount3.text = "x${list?.seedList[2].num}"
+                    tvGetDropCount.text = "+${list?.seedList[0].num}"
+                    tvGetDropCount2.text = "+${list?.seedList[1].num}"
+                    tvGetDropCount3.text = "+${list?.seedList[2].num}"
                 }
 
             }
             4 -> {
+                tvget.text = "恭喜获得金币"
                 ivGetDropBg.setImageResource(R.mipmap.icon_coin)
                 tvGetDropCount.text = "+${rewardCount}"
             }
             5 -> {
+                tvget.text = "恭喜获得加速剂"
                 ivGetDropBg.setImageResource(R.mipmap.icon_speed_water)
                 tvGetDropCount.text = "+${rewardCount}"
             }
@@ -194,9 +200,9 @@ object MainDialog {
             )
 
         val tvmoneycount = mDialogView?.findViewById<TextView>(R.id.id_tv_moeny_count)
-        tvmoneycount.text = "${rewardCount / 100}"
-
-
+        val df = DecimalFormat("0.00")
+        val d = rewardCount.toDouble() / 100.00
+        tvmoneycount.text = "${df.format(d)}"
         mDialogView.findViewById<TextView>(R.id.id_tv_get).setOnClickListener {
             mDialog.dismiss()
         }
@@ -210,7 +216,8 @@ object MainDialog {
         type: Int,
         adType: String,
         rewardCount: Int,
-        result: FlyBoxEntity
+        result: FlyBoxEntity,
+        mListener: IDialogViewCloseCallback
     ) {
         if (context == null) {
             return
@@ -235,20 +242,22 @@ object MainDialog {
         val llcontent3 = mDialogView?.findViewById<LinearLayout>(R.id.id_ll_content_3)
         val ivGetDropBg3 = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_bg3)
         val tvGetDropCount3 = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count3)
+        var tvget = mDialogView?.findViewById<TextView>(R.id.id_tv_get)
         //3 种子 4 金币 5 加速剂
         when (type) {
             1 -> {
+                tvget.text = "恭喜获得种子"
                 llcontent2.visibility = View.GONE
                 llcontent3.visibility = View.GONE
                 if (result.seedList?.size == 1) {
                     setImage(ivGetDropBg, result.seedList[0].id)
-                    tvGetDropCount.text = "x${result.seedList[0].num}"
+                    tvGetDropCount.text = "+${result.seedList[0].num}"
                 } else if (result.seedList?.size == 2) {
                     llcontent2.visibility = View.VISIBLE
                     setImage(ivGetDropBg, result.seedList[0].id)
                     setImage(ivGetDropBg2, result.seedList[1].id)
-                    tvGetDropCount.text = "x${result.seedList[0].num}"
-                    tvGetDropCount2.text = "x${result.seedList[1].num}"
+                    tvGetDropCount.text = "+${result.seedList[0].num}"
+                    tvGetDropCount2.text = "+${result.seedList[1].num}"
 
                 } else if (result.seedList?.size == 3) {
                     llcontent2.visibility = View.VISIBLE
@@ -256,17 +265,19 @@ object MainDialog {
                     setImage(ivGetDropBg, result.seedList[0].id)
                     setImage(ivGetDropBg2, result.seedList[1].id)
                     setImage(ivGetDropBg3, result.seedList[2].id)
-                    tvGetDropCount.text = "x${result.seedList[0].num}"
-                    tvGetDropCount2.text = "x${result.seedList[1].num}"
-                    tvGetDropCount3.text = "x${result.seedList[2].num}"
+                    tvGetDropCount.text = "+${result.seedList[0].num}"
+                    tvGetDropCount2.text = "+${result.seedList[1].num}"
+                    tvGetDropCount3.text = "+${result.seedList[2].num}"
                 }
 
             }
             2 -> {
+                tvget.text = "恭喜获得金币"
                 ivGetDropBg.setImageResource(R.mipmap.icon_coin)
                 tvGetDropCount.text = "+${rewardCount}"
             }
             3 -> {
+                tvget.text = "恭喜获得加速剂"
                 ivGetDropBg.setImageResource(R.mipmap.icon_speed_water)
                 tvGetDropCount.text = "+${rewardCount}"
             }
@@ -276,9 +287,11 @@ object MainDialog {
 
         mDialogView.findViewById<TextView>(R.id.btn_get_drop_happy_accept).setOnClickListener {
             mDialog.dismiss()
+            mListener.onCloseViewSuccess(true)
         }
         mDialogView.findViewById<ImageView>(R.id.lv_get_drop_close).setOnClickListener {
             mDialog.dismiss()
+            mListener.onCloseViewSuccess(true)
         }
 
         mDialog.setCanceledOnTouchOutside(false)
@@ -303,21 +316,22 @@ object MainDialog {
                 Gravity.CENTER
             )
         var orderListAdapter: GameOrderListAdapter? = null;
-        if (orderStr!=null&&!orderStr.equals("")){
+        if (orderStr != null && !orderStr.equals("")) {
             val str2Obj = Utils.str2Obj(orderStr, OrderListEntity::class.java) as OrderListEntity
-            var recyList = mDialogView.findViewById<RecyclerView>(R.id.id_rel_game_order_list);
+            var recyList = mDialogView.findViewById<RecyclerView>(R.id.id_rel_game_order_list)
+            var tvtitle = mDialogView.findViewById<TextView>(R.id.id_tv_orderlist_title)
             //猜歌任务列表
             orderListAdapter = GameOrderListAdapter()
             recyList?.adapter = orderListAdapter
             recyList?.layoutManager = LinearLayoutManager(context)
             orderListAdapter?.appendToList(str2Obj.farmOrderDataList)
+            tvtitle.text = "完成当前订单将获得${str2Obj.awardCash}元"
         }
-
         //shwoAd(adType, context, layoutAd)
 
-//        mDialogView.findViewById<TextView>(R.id.btn_get_drop_happy_accept).setOnClickListener {
-//            mDialog.dismiss()
-//        }
+        mDialogView.findViewById<TextView>(R.id.btn_get_drop_happy_accept).setOnClickListener {
+            mDialog.dismiss()
+        }
         mDialogView.findViewById<ImageView>(R.id.id_order_list_close).setOnClickListener {
             mDialog.dismiss()
         }
@@ -327,5 +341,43 @@ object MainDialog {
         mDialog.show()
     }
 
+    /**
+     *  排行榜得到红包奖励
+     * awardCents:   奖励钱数
+     * rank:   排名
+     */
+    fun showgetRankRedPackage(
+        context: Context?,
+        awardCents: Int,
+        rank: Int,
+        mListener: IDialogViewCloseCallback
+    ) {
+        if (context == null) {
+            return
+        }
+        val mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme)
+        val mDialogView =
+            showBottomDialog(
+                R.layout.dialog_layout_get_rank_red_package,
+                context,
+                mDialog,
+                0,
+                Gravity.CENTER
+            )
+
+        val tvmoneycount = mDialogView?.findViewById<TextView>(R.id.id_tv_moeny_count)
+        val tvrank = mDialogView?.findViewById<TextView>(R.id.id_tv_rank)
+        val df = DecimalFormat("0.00")
+        val d = awardCents.toDouble() / 100.00
+        tvmoneycount.text = "${df.format(d)}"
+        tvrank.text = "${rank}"
+        mDialogView.findViewById<TextView>(R.id.id_tv_get).setOnClickListener {
+            mDialog.dismiss()
+            mListener.onCloseViewSuccess(true)
+        }
+        mDialog.setCanceledOnTouchOutside(false)
+        mDialog.setCancelable(false)
+        mDialog.show()
+    }
 
 }
\ No newline at end of file

app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt

@@ -68,6 +68,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
 //        ToponManager.initRewardAd((mContext as Activity), AdID.AD_LUCKY_WATER_HIGH_VIDEO)
         mPresenter = WateringRewardPresenter(this)
         view = LayoutInflater.from(mContext).inflate(R.layout.layout_popup_drops, null)
+        EventUtils.onEvent("show_receive_coin_task_dialog", "领金币任务")
         init(view)
         initView()
         mPresenter?.getOrchardSignTask()
@@ -81,6 +82,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     }
 
     private fun initView() {
+
         tvPopupSigninDrops = view?.findViewById<TextView>(R.id.tv_popup_signin_drops)
         val recyclerSigninDrops =
             view?.findViewById<RecyclerView>(R.id.recycler_popup_signin_drops)
@@ -114,7 +116,6 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                     1 -> {
                         dismiss()
                         TurntableDialog.showTurntable(mContext, mListener!!)
-                        RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_TURNTABLE_LOTTERYED)
                     }
                     2 -> {
                         dismiss()
@@ -123,9 +124,11 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                     3 -> dismiss()
                     6 -> {
                         dismiss()
+                        EventUtils.onEvent("click_welfare_task_video_btn","福利任务视频")
                         JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false)
                     }
                     4 -> {
+                        EventUtils.onEvent("click_receive_coin_task_video_btn","领金币任务视频")
                         //看广告
                         ToponManager.loadReward(
                             (mContext as Activity), object : ToponRewardListener {
@@ -209,10 +212,9 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     }
 
     override fun dismiss() {
+        mListener?.onCloseViewSuccess(true)
         super.dismiss()
         LogUtils.i(TAG, "dismiss")
-        RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_UPDATE_HOME_INFO)
-        RxBusUtil.getDefault().unregister(this)
     }
 
     private fun init(view: View?) {

app/src/main/java/com/ym/game/view/TurntableDialog.kt

@@ -6,6 +6,7 @@ import android.app.Dialog
 import android.content.Context
 import android.os.CountDownTimer
 import android.view.Gravity
+import android.view.MotionEvent
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -37,7 +38,7 @@ import com.ym.xync.R
  */
 object TurntableDialog : TurntableUtils(), TurntableContract.View {
     private var TAG = "Turntable"
-    private var mListener: IDialogViewCloseCallback?=null
+    private var mListener: IDialogViewCloseCallback? = null
     private var isStartAnim = true
     private var isUpdate = false
 
@@ -62,11 +63,12 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     /**
      *幸运转盘
      */
-    fun showTurntable(context: Context?,mListener: IDialogViewCloseCallback) {
+    fun showTurntable(context: Context?, mListener: IDialogViewCloseCallback) {
         if (context == null) {
             return
         }
         this.context = context
+        EventUtils.onEvent("show_lucky_turntable","幸运转盘")
 //        ToponManager.initNativeAd((context as Activity), AdID.AD_LUCKY_TURNTABLE_BIGIMAGE)
 //        ToponManager.initRewardAd((context as Activity), AdID.AD_LUCKY_TURNTABLE_VIDEO)
         mPresenter = TurntablePresenter(this)
@@ -87,19 +89,20 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
         btnTurntableLottery = mDialogView?.findViewById<ImageView>(R.id.btn_turntable_lottery)
         btnCountdown = mDialogView?.findViewById<ImageView>(R.id.btn_turntable_lottery_countdown)
         tvTime = mDialogView?.findViewById<TextView>(R.id.tv_main_turntable_time)
-
+        btnTurntableLottery?.addClickScale()
         btnTurntableLottery?.setOnClickListener {
             if (Utils.isFastClick()) {
 
                 if (turntables?.showVideo == 0 && turntables?.countDownSecond!! < 0) {
                     //开启转盘
+                    EventUtils.onEvent("click_lucky_turntable_lottery","幸运转盘抽奖")
                     btnTurntableLottery?.isEnabled = false
                     isStartAnim = true
                     mPresenter?.getTurntableLotteryResult()
                 } else if (turntables?.showVideo == 1) {
                     //看广告 结束调用转盘结果接口 刷新列表 并开启转盘动画
-                    EventUtils.onEvent("turntable_video_dialog_click", "转盘视频")
-                     showAd()
+                    EventUtils.onEvent("click_lucky_turntable_lottery_look_video", "幸运转盘抽奖视频")
+                    showAd()
                 }
             }
         }
@@ -162,7 +165,10 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
             }
 
             override fun onRewardedVideoAdPlayEnd(entity: ATAdInfo) {
-                EventUtils.onEvent("ad_ended", Utils.obj2Str(AdEntity("ad_ended", "ad_ended", "幸运转盘激励视频广告")))
+                EventUtils.onEvent(
+                    "ad_ended",
+                    Utils.obj2Str(AdEntity("ad_ended", "ad_ended", "幸运转盘激励视频广告"))
+                )
             }
 
             override fun onRewardedVideoAdPlayStart(entity: ATAdInfo) {
@@ -320,4 +326,22 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     private fun reset() {
         ivTurntableBg?.setImageResource(R.mipmap.icon_main_turntable_bg)
     }
+
+    /**
+     * 添加点击缩放效果
+     */
+    fun View.addClickScale(scale: Float = 0.9f, duration: Long = 150) {
+        this.setOnTouchListener { _, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    this.animate().scaleX(scale).scaleY(scale).setDuration(duration).start()
+                }
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                    this.animate().scaleX(1f).scaleY(1f).setDuration(duration).start()
+                }
+            }
+            // 点击事件处理，交给View自身
+            this.onTouchEvent(event)
+        }
+    }
 }
\ No newline at end of file

app/src/main/java/com/ym/muisc/application/BaseApplication.kt

@@ -32,7 +32,7 @@ class BaseApplication : MultiDexApplication() {
         //第一步初始化 application
         AppliContext.init(this)
         Config.init(this)
-        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
 
         Constant.appLs = "5ea353dac826a125 "//appls
 //        //步行多多  广告id

app/src/main/java/com/ym/muisc/utils/CenterDialog.kt

@@ -41,12 +41,12 @@ object CenterDialog:BaseDialog() {
             .setOnClickListener { activity.finish() }
         val clickUa: ClickableSpan = object : ClickableSpan() {
             override fun onClick(widget: View) {
-                JumpUtils.h5Jump("隐私政策", NetConfig.H5.WEB_URL_PRIVACY,false)
+                JumpUtils.h5Jump("隐私政策", NetConfig.H5.WEB_URL_PRIVACY,true)
             }
         }
         val clickPrivat: ClickableSpan = object : ClickableSpan() {
             override fun onClick(widget: View) {
-                JumpUtils.h5Jump("用户协议", NetConfig.H5.WEB_URL_USER,false)
+                JumpUtils.h5Jump("用户协议", NetConfig.H5.WEB_URL_USER,true)
             }
         }
 //        《隐私政策》和《用户协议》，请您在使用前仔细阅读并了解
@@ -72,7 +72,7 @@ object CenterDialog:BaseDialog() {
         desc.setMovementMethod(LinkMovementMethod.getInstance());
 
 
-        val str = "欢迎使用趣味猜歌！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
+        val str = "欢迎使用幸运农场！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
         val ss = SpannableStringBuilder("查看完整《用户协议》和《隐私政策》，请您在使用前仔细阅读并了解。")
 
         ss.setSpan(

app/src/main/java/com/ym/quwei/guessing/wxapi/WXEntryActivity.java

-package com.ym.xync.wxapi;
-
-import com.umeng.socialize.weixin.view.WXCallbackActivity;
-
-public class WXEntryActivity extends WXCallbackActivity {
-
-}

app/src/main/res/drawable/btn_selector.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/icon_shouxia_bg" android:state_pressed="false"/>
+    <item android:drawable="@mipmap/icon_press" android:state_pressed="true"/>
+</selector>
\ No newline at end of file

app/src/main/res/drawable/normal.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file

app/src/main/res/drawable/pressed.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file

app/src/main/res/layout/activity_order_list.xml

@@ -3,38 +3,61 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
     <ImageView
         android:id="@+id/id_img_home_ware_bg"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="480dp"
         android:layout_centerInParent="true"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
         android:src="@mipmap/home_bg" />
 
     <LinearLayout
         android:id="@+id/id_order_list_content_rel"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="310dp"
         android:layout_centerInParent="true"
-        android:layout_marginLeft="100dp"
-        android:gravity="center"
-        android:background="@mipmap/home_cotent_bg"
+        android:background="@mipmap/icon_content_bg"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
         android:padding="@dimen/dp_5">
 
+        <TextView
+            android:id="@+id/id_tv_orderlist_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/id_rel_game_order_list"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_30" />
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/btn_get_drop_happy_accept"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/id_order_list_content_rel"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginBottom="28dp"
+        android:background="@drawable/btn_selector"
+        android:gravity="center"
+        android:text="继续种植完成订单"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_18"
+        android:textStyle="bold" />
+
     <TextView
         android:id="@+id/id_img_order_list_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@+id/id_order_list_content_rel"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="-30dp"
+        android:layout_marginBottom="-50dp"
         android:background="@mipmap/icon_top_bg"
         android:gravity="center"
         android:paddingBottom="@dimen/dp_30"
@@ -50,5 +73,4 @@
         android:layout_alignTop="@id/id_img_order_list_title"
         android:layout_alignRight="@id/id_img_order_list_title"
         android:src="@mipmap/home_close" />
-
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/dialog_get_water_drop.xml

@@ -24,11 +24,13 @@
 
                 <LinearLayout
                     android:id="@+id/id_ll_content"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginLeft="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_20"
                     android:background="@mipmap/icon_content_bg"
-
                     android:orientation="horizontal">
 
                     <LinearLayout
@@ -41,8 +43,8 @@
 
                         <ImageView
                             android:id="@+id/iv_get_drop_bg"
-                            android:layout_width="@dimen/dp_70"
-                            android:layout_height="@dimen/dp_70"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
                             android:layout_gravity="center"
                             android:src="@mipmap/icon_coin" />
 
@@ -52,7 +54,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_10"
                             android:textColor="@color/color_7C1714"
-                            android:textSize="18sp"
+                            android:textSize="24sp"
                             tools:text="+40g" />
                     </LinearLayout>
 
@@ -68,9 +70,8 @@
 
                         <ImageView
                             android:id="@+id/iv_get_drop_bg2"
-                            android:layout_width="@dimen/dp_70"
-                            android:layout_height="@dimen/dp_70"
-                            android:layout_gravity="center"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
                             android:src="@mipmap/icon_coin" />
 
                         <TextView
@@ -79,7 +80,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_10"
                             android:textColor="@color/color_7C1714"
-                            android:textSize="18sp"
+                            android:textSize="24sp"
                             tools:text="+40g" />
                     </LinearLayout>
 
@@ -95,8 +96,8 @@
 
                         <ImageView
                             android:id="@+id/iv_get_drop_bg3"
-                            android:layout_width="@dimen/dp_70"
-                            android:layout_height="@dimen/dp_70"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
                             android:layout_gravity="center"
                             android:src="@mipmap/icon_coin" />
 
@@ -106,7 +107,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_10"
                             android:textColor="@color/color_7C1714"
-                            android:textSize="18sp"
+                            android:textSize="24sp"
                             tools:text="+40g" />
                     </LinearLayout>
                 </LinearLayout>
@@ -119,11 +120,12 @@
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="28dp"
-                    android:background="@mipmap/icon_happpy_get"
+                    android:background="@drawable/btn_selector"
                     android:gravity="center"
                     android:text="开心收下"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_18" />
+                    android:textSize="@dimen/sp_18"
+                    android:textStyle="bold" />
             </RelativeLayout>
 
 
@@ -134,21 +136,22 @@
                 android:src="@mipmap/icon_top_bg" />
 
             <TextView
+                android:id="@+id/id_tv_get"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="@dimen/dp_40"
                 android:text="恭喜获得"
                 android:textColor="@color/white"
-                android:textSize="30sp" />
+                android:textSize="24sp"
+                android:textStyle="bold" />
 
             <ImageView
                 android:id="@+id/lv_get_drop_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="16dp"
-                android:paddingRight="@dimen/dp_30"
+                android:paddingRight="20dp"
                 android:src="@mipmap/icon_main_popup_close" />
         </RelativeLayout>
 

app/src/main/res/layout/dialog_layout_get_rank_red_package.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/icon_red_package_bg"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="80dp"
+            android:text="恭喜上榜"
+            android:textColor="@color/white"
+            android:textSize="36sp" />
+
+        <TextView
+            android:id="@+id/id_tv_rank"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_20"
+            android:text="第0名"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_40"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/id_tv_moeny_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0"
+                android:textColor="@color/white"
+                android:textSize="58sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_2"
+                android:text="元"
+                android:textColor="@color/white"
+                android:textSize="28sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/id_tv_get"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@mipmap/icon_get_bg"
+            android:gravity="center"
+            android:text="开心收下"
+            android:textColor="#27292B"
+            android:textStyle="bold"
+            android:textSize="24sp" />
+    </LinearLayout>
+</LinearLayout>

app/src/main/res/layout/dialog_layout_get_red_package.xml

@@ -62,6 +62,7 @@
             android:gravity="center"
             android:text="开心收下"
             android:textColor="#27292B"
+            android:textStyle="bold"
             android:textSize="24sp" />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/dialog_layout_open_box.xml

@@ -147,8 +147,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="16dp"
-                android:paddingRight="@dimen/dp_30"
+                android:paddingRight="@dimen/dp_20"
                 android:src="@mipmap/icon_main_popup_close" />
         </RelativeLayout>
 

app/src/main/res/layout/dialog_turntable.xml

@@ -52,6 +52,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/dp_20"
                     android:src="@mipmap/icon_main_turntable_center" />
 
             </RelativeLayout>

app/src/main/res/layout/layout_popup_drops.xml

@@ -73,8 +73,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginTop="10dp"
-            android:paddingRight="@dimen/dp_8"
+            android:layout_marginRight="20dp"
             android:src="@mipmap/icon_main_popup_close" />
 
         <ImageView

library/src/main/java/com/ym/library/Constant.java

@@ -21,9 +21,9 @@ public class Constant {
 
     //    public static final String WX_APPID = "wx4d3a3aa6fb634c17";//1.0.0版本使用的微信appid
 //    public static final String WX_APPKEY = "7c98910f81dc3cec4b992d722bdcbaf3";//1.0.0版本使用的微信key
-    public static String WX_APPID = "wx608e270dfb1eb935";
+    public static String WX_APPID = "wx29c1884b0a06cdd5";
     //    public static String WX_APPID = "wxcd4157d1e36f5cd8";
-    public static String WX_APPKEY = "b5b9ab0214d850d35b33f4468bbd6a5c";
+    public static String WX_APPKEY = "a45ff15ec4d387fbd37740238689bd11";
     public static String WX_SHARE_APPID = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static String WX_SHARE_APPKEY = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static final String SHANYAN_KEY = "7QciptTf";
@@ -155,7 +155,7 @@ public class Constant {
     public static int isNewUserDialog = 0; //是否弹出新人弹窗
     public static int isDialogActivity = 0; //是否弹出活动弹窗
     public static int kkz_award_render_type = 0;
-
+    public static int qq = 0;//
     public static class Permission {
         public static final String PERMISSION_CAMERA = Manifest.permission.CAMERA;
 

library/src/main/java/com/ym/library/activity/JavaInterface.kt

@@ -614,6 +614,7 @@ abstract class JavaInterface {
 
     @JavascriptInterface
     fun jumpSetting() {
+
         JumpUtils.jumpSettingActivity()
     }
 
@@ -879,6 +880,13 @@ abstract class JavaInterface {
     fun eventUtils(action: String) {
         EventUtils.onEvent(action)
     }
+    /**
+     * h5跳h5
+     */
+    @JavascriptInterface
+    fun h5Jump(h5: String) {
+        mWebView?.loadUrl(h5)
+    }
 
     /**
      * 获取金币弹窗
@@ -886,15 +894,15 @@ abstract class JavaInterface {
      */
     @JavascriptInterface
     fun showDialog(waterDropCount: Int, type: Int) {
-//        mWebView.context.runOnUiThread {
-//            CenterDialog.showgetWaterDrop(mWebView.context,type,waterDropCount,object :DialogInterface.OnCancelListener {
-//                override fun onCancel(p0: DialogInterface?) {
-//                    mWebView.context.runOnUiThread {
-//                        mWebView?.loadUrl("javascript:onResume()")
-//                    }
-//                }
-//            },mWebView)
-//        }
+        mWebView.context.runOnUiThread {
+            CenterDialog.showgetWaterDrop(mWebView.context,type,waterDropCount,object :DialogInterface.OnCancelListener {
+                override fun onCancel(p0: DialogInterface?) {
+                    mWebView.context.runOnUiThread {
+                        mWebView?.loadUrl("javascript:onResume()")
+                    }
+                }
+            },mWebView)
+        }
     }
 
     /**
@@ -906,4 +914,5 @@ abstract class JavaInterface {
             //    CenterDialog.showGuideGetMoney(act,cashStr,mWebView)
         }
     }
+
 }
\ No newline at end of file

library/src/main/java/com/ym/library/net/NetConfig.java

@@ -144,13 +144,13 @@ public class NetConfig {
 
         public static String WEB_URL_ABOUT_US;//TODO 关于我们页面
 
-        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/quweicaige/privacy.html";//TODO 隐私协议
+        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/nongchang/privacy.html";//TODO 隐私协议
 
         public static String WEB_URL_FEEDBACK;//TODO 用户反馈
 
         public static String WEB_URL_CLEARINSTRUCTIONS;//TODO
 
-        public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/quweicaige/user.html";//TODO 用户协议
+        public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/nongchang/user.html";//TODO 用户协议
 
         public static String WEB_URL_SHARE_LAND; //TODO
 
@@ -255,6 +255,7 @@ public class NetConfig {
         public static final String URL_GAME_INCR_SEED="app/v1/game/farm/incr_seed";//看视频获得种子
         public static final String URL_GAME_INCR_ACCELERATORS="app/v1/game/farm/incr_accelerators";//看视频获得加速剂
         public static final String URL_GAME_DAILY_TASK_RECEIVE="app/v1/game/farm/daily_task_receive";//看视频获得加速剂
+        public static final String URL_GAME_FARM_RANK_RECEIVE="app/v1/game/farm/rank_receive";//排行榜领取
 
 
     }

library/src/main/java/com/ym/library/net/NovelInitEntity.kt

@@ -62,7 +62,7 @@ class NovelInitEntity {
         var first_open_navigate: Int = 0
         var home_today_data_switch: Int = 0
         var fex: Int = 0
-
+        var qq:Int = 0
         var task_tab_switch: Int = 0
         var ishomepay: Int = 0
         var isFree: Int = 0
@@ -88,7 +88,6 @@ class NovelInitEntity {
         var expect_award: String? = ""
         var invite_help: String? = ""
         var read_help: String? = ""
-        var welfareCenterUrl: String? = ""
         var task_center: String? = ""
         var about_us: String? = ""
         var video: String? = ""
@@ -128,6 +127,10 @@ class NovelInitEntity {
         var FeedBackuUrl: String? = ""
         var PlayUrl: String? = ""
         var shareUrl: String? = ""
+        var welfareurl:String?=""//福利中心
+        var clockInzurl:String?=""//打卡提现
+        var rankingurl:String?=""//排行榜
+        var withdrawurl:String?=""//提现页面
     }
 
     class WxConfig {

library/src/main/java/com/ym/library/net/SplashPresenter.kt

@@ -145,7 +145,7 @@ class SplashPresenter : SplashContract.Presenter {
         Constant.SdkKey.kdxf_app_id = mNovelInitEntity.global_config?.ad_sdk_cfg?.kdxf?.app_id
         Constant.PLAY_URL = mNovelInitEntity.h5_url?.PlayUrl
         Constant.ISENTERTAINMENT = mNovelInitEntity.switch?.isEntertainment?:1
-
+        Constant.qq = mNovelInitEntity?.switch?.qq ?: 0
         //广点通广告配置信息
         val gdtStr = Utils.obj2Str(mNovelInitEntity.global_config?.ad_sdk_cfg?.gdt)
         if (!TextUtils.isEmpty(gdtStr)) {
@@ -264,7 +264,7 @@ class SplashPresenter : SplashContract.Presenter {
             NetConfig.Other.ABOUT_US_URL = mNovelInitEntity?.h5_url?.aboutUs
             Constant.Param.coinUrl = mNovelInitEntity?.h5_url?.coinUrl
             Constant.Param.inviteUrl = mNovelInitEntity?.h5_url?.inviteUrl
-            SettingPreference.setWelfareCenterUrl(mNovelInitEntity.h5_url?.welfareCenterUrl)
+
             NetConfig.H5.WEB_URL_READ_HELP = mNovelInitEntity.h5_url?.read_help
             NetConfig.H5.WEB_URL_GLOD_DETAIL = mNovelInitEntity.h5_url?.glod_detail
             NetConfig.H5.WEB_URL_CHANGE_DETAIL = mNovelInitEntity.h5_url?.change_detail
@@ -297,6 +297,12 @@ class SplashPresenter : SplashContract.Presenter {
             Constant.Param.tipsUrl = mNovelInitEntity.h5_url?.tipsUrl
             Constant.Param.Refundurl = mNovelInitEntity.h5_url?.Refundurl
             Constant.Param.FeedBackuUrl = mNovelInitEntity.h5_url?.FeedBackuUrl
+            Constant.Param.WelfareCenter = mNovelInitEntity.h5_url?.welfareurl
+            SettingPreference.setWelfareCenterUrl(mNovelInitEntity.h5_url?.welfareurl)
+            Constant.Param.PunchRecord = mNovelInitEntity.h5_url?.clockInzurl
+            Constant.Param.RankList = mNovelInitEntity.h5_url?.rankingurl
+            Constant.Param.WithDraw = mNovelInitEntity.h5_url?.withdrawurl
+
         }
 
 

library/src/main/java/com/ym/library/utils/CenterDialog.kt

@@ -3,11 +3,15 @@ package com.ym.library.utils
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
 import android.os.Build
 import android.os.CountDownTimer
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.View
+import android.view.animation.AnimationUtils
+import android.webkit.WebView
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.RelativeLayout
@@ -326,6 +330,89 @@ object CenterDialog : BaseDialog() {
         mDialog?.show()
         countDown(3000, tv_time, img_close)
     }
+    /**
+     * 水滴发放
+     * type:   1水滴   2金币
+     * waterDropCount:   奖励数量
+     * adType: 广告的类型
+     */
+    fun showgetWaterDrop(
+        context: Context?,
+        type: Int,
+        rewardCount: Int,
+        listener: DialogInterface.OnCancelListener,
+        mWebView: WebView
+    ) {
+        if (context == null) {
+            return
+        }
+        val mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme)
+        val mDialogView =
+            showBottomDialog(
+                R.layout.dialog_get_water_drop,
+                context,
+                mDialog,
+                0,
+                Gravity.CENTER
+            )
+
+        val ivGetDropLoght = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_loght)
+        val ivGetDropBg = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_bg)
+        val tvGetDropCount = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count)
+        val layoutAd = mDialogView?.findViewById<FrameLayout>(R.id.layout_get_drop_ad)
+
+        ivGetDropLoght.animation = AnimationUtils.loadAnimation(context, R.anim.rotate_anim_lib)
+
+        if (type == 1) {
+            tvGetDropCount.text = "+${rewardCount}g"
+            ivGetDropBg.setImageResource(R.drawable.icon_main_dialog_popupwater_icon_lib)
+        } else if (type == 2) {
+            tvGetDropCount.text = "+${rewardCount}"
+            ivGetDropBg.setImageResource(R.drawable.icon_main_dialog_popupwater_coin_lib)
+        }
+
+        ToponManager.loadNative((context as Activity),layoutAd,object : ToponNativeListener {
+            override fun onAdImpressed(atAdInf: ATAdInfo) {
+                EventUtils.onEvent(
+                    "ad_show",
+                   Utils.obj2Str(AdEntity(atAdInf.adNetworkType, AdID.mPlacementId_daily_task_finish_bigimage, "福利中心大图广告"))
+                )
+            }
+
+            override fun onAdClicked(atAdInf: ATAdInfo, view: ATNativeAdView) {
+                EventUtils.onEvent(
+                    "ad_click",
+                    Utils.obj2Str(AdEntity(atAdInf.adNetworkType, AdID.mPlacementId_daily_task_finish_bigimage, "福利中心大图广告"))
+                )
+            }
+
+            override fun onAdVideoStart() {
+            }
+
+            override fun onAdVideoEnd() {
+            }
+
+        },AdID.mPlacementId_Reward_video_luck_farm)
+
+        mDialogView.findViewById<ImageView>(R.id.btn_get_drop_happy_accept).setOnClickListener {
+            mWebView?.loadUrl("javascript:onResume()")
+            mDialog?.dismiss()
+        }
+        mDialogView.findViewById<ImageView>(R.id.lv_get_drop_close).setOnClickListener {
+            mWebView?.loadUrl("javascript:onResume()")
+            mDialog?.dismiss()
+        }
+
+        mDialog?.setOnCancelListener {
+            listener.onCancel(it)
+        }
+
+        mDialog?.setCanceledOnTouchOutside(false)
+        mDialog?.setCancelable(false)
+        mDialog?.show()
+    }
+
+
     var coinsDialog: Dialog? = null
     @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     fun showNewCoinsDialog(context: Activity, rewardCoins: Int): Dialog? {

library/src/main/res/anim/rotate_anim_lib.xml

+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="0"
+    android:toDegrees="359"
+    android:pivotX="50%"
+    android:pivotY="50%"
+    android:duration="5000"
+    android:interpolator="@android:anim/linear_interpolator"
+    android:repeatCount="-1"/>

library/src/main/res/drawable/btn_selector.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_shouxia_bg" android:state_pressed="false"/>
+    <item android:drawable="@drawable/icon_press" android:state_pressed="true"/>
+</selector>
\ No newline at end of file

library/src/main/res/layout/dialog_get_gold.xml

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginRight="18dp"
+                android:background="@drawable/icon_main_dialog_get_drops_bg">
+
+                <FrameLayout
+                    android:id="@+id/layout_get_water_drop"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="31dp"
+                    android:visibility="visible">
+
+                    <ImageView
+                        android:id="@+id/iv_get_drop_loght"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:src="@drawable/icon_main_dialog_popupwater_light_lib" />
+
+                    <ImageView
+                        android:id="@+id/iv_get_drop_bg"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:src="@drawable/icon_main_dialog_popupwater_coin_lib" />
+
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/tv_get_drop_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/layout_get_water_drop"
+                    android:layout_centerHorizontal="true"
+                    android:textColor="#7C1714"
+                    android:textSize="18sp"
+                    tools:text="+40g" />
+
+                <ImageView
+                    android:id="@+id/btn_get_drop_happy_accept"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_get_drop_count"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginBottom="28dp"
+                    android:src="@drawable/icon_main_happy_accept_lib" />
+            </RelativeLayout>
+
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:src="@drawable/icon_main_dialog_get_drops_lib" />
+
+            <ImageView
+                android:id="@+id/lv_get_drop_close"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="16dp"
+                android:paddingRight="12dp"
+                android:src="@drawable/icon_main_popup_close_lib" />
+        </RelativeLayout>
+
+        <FrameLayout
+            android:id="@+id/layout_get_drop_ad"
+            android:layout_width="match_parent"
+            android:layout_height="265dp"
+            android:layout_marginLeft="18dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="18dp"
+            android:visibility="gone" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="14dp"
+            android:src="@drawable/icon_main_dialog_see_details_lib"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file

library/src/main/res/layout/dialog_get_water_drop.xml

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18dp"
+                android:layout_marginTop="71dp"
+                android:layout_marginRight="18dp"
+                android:background="@drawable/icon_main_dialog_get_drops_bg">
+
+                <LinearLayout
+                    android:id="@+id/id_ll_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginRight="20dp"
+                    android:background="@drawable/icon_content_bg"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:id="@+id/iv_get_drop_bg"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:layout_gravity="center"
+                            android:src="@drawable/icon_coin" />
+
+                        <TextView
+                            android:id="@+id/tv_get_drop_count"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="10dp"
+                            android:textColor="#7C1714"
+                            android:textSize="24sp"
+                            tools:text="+40g" />
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/btn_get_drop_happy_accept"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/id_ll_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginBottom="28dp"
+                    android:background="@drawable/btn_selector"
+                    android:gravity="center"
+                    android:text="开心收下"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+            </RelativeLayout>
+
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:src="@drawable/icon_top_bg" />
+
+            <TextView
+                android:id="@+id/id_tv_get"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="40dp"
+                android:text="恭喜获得金币"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold" />
+
+            <ImageView
+                android:id="@+id/lv_get_drop_close"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:paddingRight="20dp"
+                android:src="@drawable/icon_main_popup_close" />
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file

userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt

 package com.ym.userinfo.module.activity
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
 import com.ym.library.Constant
 import com.ym.library.down.UpdateVersionManager
 import com.ym.library.net.BaseActivity
 import com.ym.library.utils.JumpUtils
+import com.ym.library.utils.SettingPreference
 import com.ym.library.utils.StatusBarUtil
+import com.ym.library.utils.Utils
 import com.ym.module.userinfo.R
 import kotlinx.android.synthetic.main.activity_setting.*
 import kotlinx.android.synthetic.main.layout_user_toolbar.*
@@ -19,19 +24,29 @@ class SettingActivity : BaseActivity() {
     }
 
     override fun init() {
+        id_tv_id.text = "ID: ${SettingPreference.getUserInfoData().uid}"
+        if (Constant.qq != 0) {
+            id_tv_qq.text = "官方QQ群: ${Constant.qq}"
+        } else {
+            id_tv_qq.text = ""
+        }
+        //复制
+        id_iv_copy.setOnClickListener {
+            copy()
+        }
         id_iv_back.setOnClickListener { finish() }
-        tv_user_toolbar_title.text = "设置"
+        // tv_user_toolbar_title.text = "设置"
         //用户协议
         tv_setting_user_agreement.setOnClickListener {
-            JumpUtils.h5Jump("用户协议", Constant.Param.USER,false)
+            JumpUtils.h5Jump("用户协议", Constant.Param.USER, true)
         }
         //隐私条款
         tv_setting_privacy_policy.setOnClickListener {
-            JumpUtils.h5Jump("隐私条款", Constant.Param.PRIVACY,false)
+            JumpUtils.h5Jump("隐私条款", Constant.Param.PRIVACY, true)
         }
         //关于我们
         tv_setting_about_us.setOnClickListener {
-            JumpUtils.h5Jump("关于我们", Constant.Param.ABOUTUS,false)
+            JumpUtils.h5Jump("关于我们", Constant.Param.ABOUTUS, true)
         }
         //版本升级
         id_setting_update_version.setOnClickListener {
@@ -39,4 +54,16 @@ class SettingActivity : BaseActivity() {
             updateVersionManager?.checkUpdate(true)
         }
     }
+
+    private fun copy() {
+        //获取剪贴板管理器：
+        val cm: ClipboardManager =
+            this?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        // 创建普通字符型ClipData
+        val mClipData: ClipData =
+            ClipData.newPlainText("Label", "${SettingPreference.getUserInfoData().uid}")
+        // 将ClipData内容放到系统剪贴板里。
+        cm.setPrimaryClip(mClipData)
+        Utils.showToast(this, "已复制到剪切板")
+    }
 }

userinfo/src/main/res/values/strings.xml

@@ -9,7 +9,7 @@
     <string name="user_precautions2">2、单笔提现金额最低0.3元，最高2000元</string>
     <string name="user_precautions3">3、提现申请通常1–3个工作日内审核到帐，请您耐心等待，体谅一下客服妹子哦</string>
     <string name="user_precautions4">4、0.3元提现是新人专享福利，每个账号可享受一次</string>
-    <string name="user_precautions5">5、如发现作弊、外挂等违规手段获取奖励，趣味猜歌猜歌有权判定获得奖励无效</string>
+    <string name="user_precautions5">5、如发现作弊、外挂等违规手段获取奖励，幸运农场有权判定获得奖励无效</string>
     <string name="user_agreement">用户协议</string>
     <string name="user_privacy_policy">隐私条款</string>
     <string name="user_about_us">关于我们</string>