Merge remote-tracking branch 'origin/develop_dd_garden_1.0.1' into develop_dd_garden_1.0.1

# Conflicts:
#	library/src/main/java/com/ym/library/net/NetConfig.java

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

@@ -50,6 +50,9 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
     @SuppressLint("CheckResult")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+//        StatusBarUtils.transportStatus(this, resources.getColor(R.color.transparent))
+//        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // 禁用横屏
+//        window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) //禁止截屏
         EventUtils.onEvent("tab_imp", "多多花园")
         if (SettingPreference.getIsShowGuide()) {
             SettingPreference.setIsShowGuide(false)

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

@@ -83,8 +83,13 @@ class WateringTaskAdpater :
             holder.imgcoin.setImageResource(R.mipmap.icon_popupwater_icon)
             if (!TextUtils.isEmpty(data.description)) {
                 holder.btnProgess.visibility = View.GONE
-                holder.tvTitle.text = data.title+" (${data.current_nums}/${data.awardLimit})"
                 holder.tvProgess.text = data.description
+                if(data.awardLimit!!>1){
+                    holder.tvTitle.text = data.title+" (${data.current_nums}/${data.awardLimit})"
+                }else{
+                    holder.tvTitle.text = data.title
+                }
+
             } else {
                 holder.btnProgess.visibility = View.VISIBLE
                 holder.btnProgess.max = data.awardLimit!!

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

@@ -26,6 +26,7 @@ import com.ym.library.activity.presenter.NewWebPresenter
 import com.ym.library.module.ReportEntity
 import com.ym.library.net.BaseActivity
 import com.ym.library.rxbus.RxBusConstant
+import com.ym.library.rxbus.RxBusConstant.RX_MAIN_WATER_DROP_UPDATE
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.utils.*
 import com.ym.library.widget.ScrollWebView
@@ -373,6 +374,8 @@ class NewWebActivity : BaseActivity(), NewWebContract.View, ScrollWebView.OnScro
         super.onPause()
         RxBusUtil.getDefault()
             .send(RxBusConstant.RX_SPEED_WATER_TASK_LIST)
+        RxBusUtil.getDefault()
+            .send( RX_MAIN_WATER_DROP_UPDATE)
         MobclickAgent.onPause(this)
 //        EventUtils.onEvent("page_status", Utils.obj2Str(ReportEntity(Constant.ReportSessionId, "NewWebActivity", "onPause")))
         if (webview != null) {

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

@@ -12,17 +12,17 @@ import android.net.http.SslError
 import android.os.Build
 import android.text.TextUtils
 import android.util.Log
-import android.view.*
+import android.view.KeyEvent
+import android.view.MotionEvent
+import android.view.View
 import android.webkit.*
 import androidx.annotation.RequiresApi
 import com.badoo.mobile.util.WeakHandler
 import com.umeng.analytics.MobclickAgent
 import com.umeng.socialize.UMShareAPI
-import com.ym.library.Constant
 import com.ym.library.R
 import com.ym.library.module.CoinEntity
 import com.ym.library.module.NewsEntity
-import com.ym.library.module.ReportEntity
 import com.ym.library.module.TaskEntity
 import com.ym.library.net.ApiClient
 import com.ym.library.net.BaseActivity
@@ -34,14 +34,6 @@ import com.ym.library.utils.*
 import com.ym.library.widget.ScrollWebView
 import com.ym.modulecommon.AppliContext
 import kotlinx.android.synthetic.main.activity_web.*
-import kotlinx.android.synthetic.main.activity_web.id_activity_web_back_layout
-import kotlinx.android.synthetic.main.activity_web.id_activity_web_close
-import kotlinx.android.synthetic.main.activity_web.id_activity_web_progress
-import kotlinx.android.synthetic.main.activity_web.id_activity_web_timer_desc
-import kotlinx.android.synthetic.main.activity_web.id_activity_web_timer_layout
-import kotlinx.android.synthetic.main.activity_web.id_activity_web_titlebar
-import kotlinx.android.synthetic.main.activity_web.id_activity_web_top_tips
-import kotlinx.android.synthetic.main.activity_web.webview
 import java.util.regex.Pattern
 
 
@@ -447,6 +439,8 @@ class WebActivity : BaseActivity(), View.OnClickListener {
         MobclickAgent.onPause(this)
         RxBusUtil.getDefault()
             .send(RxBusConstant.RX_SPEED_WATER_TASK_LIST)
+        RxBusUtil.getDefault()
+            .send(RxBusConstant.RX_MAIN_WATER_DROP_UPDATE)
     }
 
     private fun queryTask() {

library/src/main/java/com/ym/library/activity/WebViewActivity.java

@@ -22,6 +22,8 @@ import com.ym.library.utils.StatusBarUtil;
 
 import org.jetbrains.annotations.NotNull;
 
+import static com.ym.library.rxbus.RxBusConstant.RX_MAIN_WATER_DROP_UPDATE;
+
 public class WebViewActivity extends BaseActivity {
 
     private String url;
@@ -148,8 +150,6 @@ public class WebViewActivity extends BaseActivity {
             webView.loadUrl("javascript:onPause()");
         }
         MobclickAgent.onPause(this);
-        RxBusUtil.getDefault()
-                .send(RxBusConstant.RX_SPEED_WATER_TASK_LIST);
     }
 
     @Override

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

@@ -184,7 +184,7 @@ public class NetConfig {
         public static final String URL_GAME_OPEN_BOX = "app/v1/game/farm/open_box";//开宝箱
         public static final String URL_GAME_ORDER_DATA = "app/v1/game/farm/order_data";//订单数据
         public static final String URL_GAME_ORDER_RECEIVE = "app/v1/game/farm/order_receive";//订单领取
-//        public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
+        //        public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
         public static final String URL_GAME_USE_ACCELERATORS = "app/v1/game/farm/use_accelerators";//加速剂加速
         public static final String URL_GAME_WAREHOUSE_DATA = "app/v1/game/farm/warehouseData";//仓库列表
         public static final String URL_GAME_TURNTABLE_LIST = "app/v1/game/farm/turntable_list";//转盘列表
@@ -199,7 +199,7 @@ public class NetConfig {
         public static final String URL_GAME_FARM_RANK_RECEIVE = "app/v1/game/farm/rank_receive";//排行榜领取
         public static final String URL_GAME_THIRD_PARTY = "app/v1/game/third_party";//加速剂任务看视频
 
-//        public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表
+        //        public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表
 //       public static final String URL_GAME_DOWD = "app/v1/game/ddcy/do_wd";//兑换接口
         public static final String URL_GAME_WD_HISTORY = "app/v1/game/ddcy/wd_history";//兑换记录
         public static final String URL_GAME_ACCELERATORS_TASK_RECEIVE = "app/v1/game/ddcy/accelerators_task_receiveV2";//加速剂任务领取
@@ -227,7 +227,7 @@ public class NetConfig {
         public static final String URL_COLLECT_CARD_OPEN = "app/v1/collect-card/open";//开宝箱
         public static final String URL_COLLECT_CARD_ADV_PUT_OR_ADD = "app/v1/collect-card/advPutOrAdd";//看广告单个图片获取或者拼图
         public static final String URL_COLLECT_CARD_ADD_CARD = "app/v1/collect-card/addCard";//收金币获得卡片
-//        public static final String URL_GAME_HOME_WD_LIST = "app/v1/game/ddcy/home_wd_list";//首页展示果实列表
+        //        public static final String URL_GAME_HOME_WD_LIST = "app/v1/game/ddcy/home_wd_list";//首页展示果实列表
         public static final String URL_CLOCK_BOX_RECEIVE = "app/v1/game/ddcy/clock_box_receive";//打卡普通打卡任务领取
 
         public static final String URL_GAME_VIDEO_TASK_COMPLETE = "app/v1/game/video_task_complete";//看领金币视频任务

userinfo/src/main/res/layout/activity_setting.xml

@@ -257,6 +257,7 @@
                             android:gravity="center_vertical"
                             android:paddingLeft="16dp"
                             android:paddingTop="10dp"
+                            android:paddingBottom="10dp"
                             android:paddingRight="20dp"
                             android:text="@string/user_about_us"
                             android:textColor="#642D2D"