[提交人]：王雪伟

[提交简述] ：多多花园1.0.0
[实现方案] ：花园提交审核包，替换接口参数为菜园参数

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.ym.ddcy">
+    package="com.ym.ddhy">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -34,7 +34,7 @@
 
                 <data
                     android:host="welfare"
-                    android:scheme="ddcy" />
+                    android:scheme="ddhy" />
             </intent-filter>
 
         </activity>
@@ -49,7 +49,7 @@
 
                 <data
                     android:host="clockinwithdraw"
-                    android:scheme="ddcy" />
+                    android:scheme="ddhy" />
             </intent-filter>
         </activity>
 

app/src/main/java/com/ym/ddcy/wxapi/WXEntryActivity.java

-package com.ym.ddcy.wxapi;
+package com.ym.ddhy.wxapi;
 
 import com.umeng.socialize.weixin.view.WXCallbackActivity;
 

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

@@ -51,14 +51,14 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
     @SuppressLint("CheckResult")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        EventUtils.onEvent("tab_imp", "多多菜园")
+        EventUtils.onEvent("tab_imp", "多多花园")
         if (SettingPreference.getIsShowGuide()) {
             SettingPreference.setIsShowGuide(false)
         }
         mRefreshLoginObservable = RxBus.get().register("refresh_login", String::class.java)
         TurntableDialog.initTurntableAnim()
         getUserInfo()
-        checkUpdateApp()
+//        checkUpdateApp()
         mRefreshLoginObservable?.observeOn(AndroidSchedulers.mainThread())?.subscribe({
             when (it) {
                 "not_login" -> {
@@ -513,6 +513,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                                 override fun onSuccess(result: StatusEntity?) {
                                     Log.d("wxw", "云朵加速" + Utils.obj2Str(result))
                                     callback?.onCloudSpeedSuccess(true, Utils.obj2Str(result))
+                                    getListLandNew(2)
                                 }
 
                                 override fun onFailure(

app/src/main/java/com/ym/game/activity/ClockInWithdrawActitivy.kt

@@ -5,7 +5,7 @@ import android.text.Html
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bird.cc.id
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.game.adapter.ClockInWithdrawAdpater
 import com.ym.game.contract.ClockInWithdrawContract
 import com.ym.game.presenter.ClockInWithdrawPresenter

app/src/main/java/com/ym/game/activity/SplashActivity.kt

@@ -12,7 +12,7 @@ import com.gyf.immersionbar.ImmersionBar
 import com.umeng.analytics.MobclickAgent
 import com.ym.admodule.config.AdManager
 import com.ym.admodule.listener.ZXADSplashListener
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.game.GameActivity
 import com.ym.game.utils.CenterDialog
 import com.ym.library.Constant

app/src/main/java/com/ym/game/activity/WelfareActivity.kt

@@ -7,7 +7,7 @@ import android.content.DialogInterface
 import android.view.View
 import android.view.animation.AnimationUtils
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.game.adapter.WelfareDiamondAdapter
 import com.ym.game.adapter.WelfareTaskAdpater
 import com.ym.game.contract.WelfareContract

app/src/main/java/com/ym/game/activity/WxLoginActivity.kt

@@ -12,7 +12,7 @@ import com.ym.library.net.*
 import com.ym.library.utils.*
 import com.ym.library.utils.EventUtils.onEvent
 import com.ym.library.wechat.UserApiClient
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import kotlinx.android.synthetic.main.activity_wx_login.*
 import org.jetbrains.anko.act
 

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

@@ -14,7 +14,7 @@ import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.module.WithDrawEntity2
 import com.ym.game.view.MainDialog
 import com.ym.library.base.BaseRecyclerAdapter

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

@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bird.cc.it
 import com.ym.library.listener.OnRecycleItemClickListener
 import com.ym.library.base.BaseRecyclerAdapter
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.Constant
 import com.ym.library.module.ClockInWithdrawEntity
 import com.ym.library.utils.Utils

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

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.listener.OnRecycleItemClickListener
 import com.ym.library.module.PuzzleEntity
 import com.ym.modulecommon.AppliContext

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

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.module.PuzzleEntity
 import com.ym.modulecommon.AppliContext
 import com.ym.modulecommon.base.BaseRecyclerAdapter

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

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.modulecommon.AppliContext
 import com.ym.library.base.BaseRecyclerAdapter
 import com.ym.library.module.WdHistoryEntity

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

@@ -9,7 +9,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.ym.library.base.BaseRecyclerAdapter
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.module.SinginEntity
 
 /**

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

@@ -16,7 +16,7 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.utils.LogUtils
 import com.ym.library.utils.Utils
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.module.WateringTaskEntity
 import com.ym.library.net.GameApiClient
 import com.ym.library.utils.EventUtils

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

@@ -16,7 +16,7 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.utils.LogUtils
 import com.ym.library.utils.Utils
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.module.NewsEntity
 import com.ym.library.module.TaskCompleteEntity
 import com.ym.library.module.WateringTaskEntity

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

@@ -8,7 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.base.BaseRecyclerAdapter
 import com.ym.library.listener.OnRecycleItemClickListener
 import com.ym.library.module.DiamondEntity

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

@@ -10,7 +10,7 @@ import com.bird.cc.it
 import com.ym.library.listener.OnRecycleItemClickListener
 import com.ym.library.base.BaseRecyclerAdapter
 import com.ym.library.utils.Utils
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.module.NewsEntity
 import com.ym.library.module.TaskListEntity
 

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

@@ -18,6 +18,7 @@ import com.tencent.bugly.crashreport.CrashReport
 import com.umeng.commonsdk.UMConfigure
 import com.umeng.socialize.PlatformConfig
 import com.ym.admodule.config.AdManager
+import com.ym.library.BuildConfig
 import com.ym.library.Constant
 import com.ym.modulecommon.AppliContext
 import com.ym.modulecommon.base.SplashResumeActivity
@@ -60,11 +61,11 @@ class BaseApplication : MultiDexApplication() {
 
 
         //TODO 上线去掉测试地址
-            //     NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
+//                 NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
 //        Constant.appLs = "afcbef40e31631d3"//appls
-        AdManager.init(this,"afcbef40e31631d3")
+        AdManager.init(this,"b59e7d03c0f91730")
         LogUtils.getConfig().logSwitch = false
-        UMConfigure.setLogEnabled(true)
+        UMConfigure.setLogEnabled(false)
         UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "")
         PlatformConfig.setWeixin(Constant.WX_APPID, Constant.WX_APPKEY)
 
@@ -88,7 +89,7 @@ class BaseApplication : MultiDexApplication() {
 
         //小满
         AdSdk.setDebug(isDebug)//打开日志
-        AdSdk.init(this, "ddcy-az-hdgj_vbskkc", "D545402QovC2W5g8")//初始化 需要在Applicaiton 中
+        AdSdk.init(this, "ddhy-az-hdgj_vbskkc", "D545402QovC2W5g8")//初始化 需要在Applicaiton 中
         //registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
     }
 

app/src/main/java/com/ym/game/notif/NotificationService.java

@@ -18,7 +18,7 @@ import android.widget.RemoteViews;
 
 import androidx.core.app.NotificationCompat;
 
-import com.ym.ddcy.R;
+import com.ym.ddhy.R;
 import com.ym.game.GameActivity;
 import com.ym.library.utils.LogUtils;
 import java.lang.reflect.Method;

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

@@ -11,7 +11,7 @@ import android.text.style.ForegroundColorSpan
 import android.view.Gravity
 import android.view.View
 import android.widget.TextView
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.base.BaseDialog
 import com.ym.library.net.NetConfig
 import com.ym.library.utils.JumpUtils
@@ -73,7 +73,7 @@ object CenterDialog:BaseDialog() {
         desc.setMovementMethod(LinkMovementMethod.getInstance());
 
 
-        val str = "欢迎使用多多菜园！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
+        val str = "欢迎使用多多花园！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
         val ss = SpannableStringBuilder("查看完整《用户协议》和《隐私政策》，请您在使用前仔细阅读并了解。")
 
         ss.setSpan(

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

@@ -16,7 +16,7 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.utils.EventUtils
 
 object CashExchangeDialog : CashExchangeContract.View {

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

@@ -6,7 +6,7 @@ import android.view.Gravity
 import android.widget.ImageView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.game.adapter.RecordAdapter
 import com.ym.game.contract.RecordContract
 import com.ym.game.presenter.RecordPresenter

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

@@ -18,7 +18,7 @@ import com.ym.admodule.config.AdManager
 import com.ym.admodule.config.ZXADSizeConfig
 import com.ym.game.listener.IDialogViewCloseCallback
 import com.ym.modulecommon.AppliContext
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.Constant
 import com.ym.library.module.FlyBoxEntity
 import com.ym.library.module.TurntableEntity

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

@@ -26,7 +26,7 @@ import com.airbnb.lottie.LottieAnimationView
 import com.google.gson.annotations.Until
 import com.ym.admodule.config.AdManager
 import com.ym.admodule.listener.ZXADVideoListener
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.game.contract.PuzzleContract
 import com.ym.game.listener.IDialogViewCloseCallback
 import com.ym.game.presenter.PuzzlePresenter

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

@@ -26,7 +26,7 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.*
 import com.ym.library.net.GameApiClient
@@ -108,10 +108,10 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                 // 跳转页面 1转盘 2高额水滴任务 3首页 4激励视频 直客任务链接"
                 // if()
                 //  appmodel_id
-                // 应用类模块跳转 跳转到多多菜园首页 65
-                //应用类模块跳转到多多菜园转盘抽奖 63
-                //应用类模块跳转到多多菜园开宝箱 64
-                //应用类模块跳转到多多菜园福利中心 66
+                // 应用类模块跳转 跳转到多多花园首页 65
+                //应用类模块跳转到多多花园转盘抽奖 63
+                //应用类模块跳转到多多花园开宝箱 64
+                //应用类模块跳转到多多花园福利中心 66
                 if (data.opentype == 7) {
                     if (data.appmodel_id == 65) {
                         dismiss()

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

@@ -25,7 +25,7 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.WateringTaskEntity
 import com.ym.library.net.GameApiClient

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

@@ -22,7 +22,7 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.StatusEntity
 import com.ym.library.module.TurntableEntity

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

@@ -39,7 +39,7 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginRight="16dp"
-                    android:text="我们依据最新法律，向您说明多多菜园\n软件的隐私政策，特向您推送本提示，\n请您阅读并充分理解相关条款。"
+                    android:text="我们依据最新法律，向您说明多多花园\n软件的隐私政策，特向您推送本提示，\n请您阅读并充分理解相关条款。"
                     android:textColor="#666666"
                     android:textSize="15sp" />
 

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

 <resources>
-    <string name="app_name">多多菜园</string>
+    <string name="app_name">多多花园</string>
 </resources>

app/version.properties

-PACKAGE_NAME=com.ym.ddcy
+PACKAGE_NAME=com.ym.ddhy
 VERSION_CODE=1
 VERSION_NAME=1.0.0
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">LuckyFarm</string>
+  <string name="app_name">多多花园</string>
   <string name="game_view_content_description">Game view</string>
 </resources>
\ No newline at end of file

library/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     api ("com.bx:adsdk:1.3.3"){
         exclude group: 'com.google.code.gson'
     }
-    api 'com.ym.admodule:admodule:1.0.2.20'
+    api 'com.ym.admodule:admodule:1.0.2.21'
     api 'com.airbnb.android:lottie:3.1.0'
     /* api 'androidx.appcompat:appcompat:1.2.0-alpha02'
      api 'com.android.support:design:28.0.0'

library/src/main/AndroidManifest.xml

@@ -85,7 +85,7 @@
 
                 <data
                     android:host="web"
-                    android:scheme="ddcy" />
+                    android:scheme="ddhy" />
             </intent-filter>
         </activity>
 
@@ -100,7 +100,7 @@
 
                 <data
                     android:host="ad_web"
-                    android:scheme="ddcy" />
+                    android:scheme="ddhy" />
             </intent-filter>
         </activity>
 
@@ -115,7 +115,7 @@
 
                 <data
                     android:host="new_web"
-                    android:scheme="ddcy" />
+                    android:scheme="ddhy" />
             </intent-filter>
         </activity>
 
@@ -130,7 +130,7 @@
 
                 <data
                     android:host="xiaoman"
-                    android:scheme="ddcy" />
+                    android:scheme="ddhy" />
             </intent-filter>
         </activity>
 

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

@@ -15,15 +15,15 @@ import java.util.List;
 public class Constant {
 
     public static int REQUEST_CODE_ASK_PERMISSIONS = 0x0101;
-    public static final String scheme = "ddcy";
+    public static final String scheme = "ddhy";
     public static final String withdraw_right_top = "withdraw_right_top";
     public static final String sign_in_again_video = "sign_in_again_video";
 
     //    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 = "wxe7a03eb52cce1b51";
+    public static String WX_APPID = "wx1af769544d85de7b";
     //    public static String WX_APPID = "wxcd4157d1e36f5cd8";
-    public static String WX_APPKEY = "6fa72a89ea188c4dff5729cff328b587";
+    public static String WX_APPKEY = "58d8131e48083dbe5a0a946fb96002a8";
     public static String WX_SHARE_APPID = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static String WX_SHARE_APPKEY = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static final String SHANYAN_KEY = "7QciptTf";
@@ -370,7 +370,7 @@ public class Constant {
 
     public static class Param {
         //public static String mPacketName = PhoneUtils.INSTANCE.getAppPackage();
-        public static String mPacketName = "com.ym.ddcy";
+        public static String mPacketName = "com.ym.ddhy";
         public static String vendor = Build.MANUFACTURER;
         public static String svn = Build.VERSION.SDK_INT + "";
         public static String androidId = "";

library/src/main/java/com/ym/library/down/UpdateVersionPresenter.kt

@@ -97,7 +97,6 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter {
             .subscribe(object : BaseObserver<VersionEntity?>() {
                 override fun onSuccess(dataBean: VersionEntity?) {
                     if (dataBean != null) {
-                        Log.d("wxw", "version" + Utils.obj2Str(dataBean))
                         if (dataBean.vc > PhoneUtils.getAppVersionCode(AppliContext.get()) && "" != dataBean.dl_url) {
                             mUrl = dataBean.dl_url
                             if (dataBean.type == 1) {

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

@@ -26,7 +26,8 @@ object ApiClient {
         if (request.url().toString().contains("yilan")) {
             chain.proceed(request.newBuilder().build())
         } else {
-            PhoneUtils.addParam(request, builder)
+//            PhoneUtils.addParam(request, builder)
+            com.ym.library.utils.PhoneUtils.addParam(request, builder)
             chain.proceed(request.newBuilder().url(builder.build()).build())
         }
     }

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

@@ -28,7 +28,8 @@ object GameApiClient {
         if (request.url().toString().contains("yilan")) {
             chain.proceed(request.newBuilder().build())
         } else {
-            PhoneUtils.addParam(request, builder)
+//            PhoneUtils.addParam(request, builder)
+            com.ym.library.utils.PhoneUtils.addParam(request, builder)
             chain.proceed(request.newBuilder().url(builder.build()).build())
         }
     }

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

@@ -67,17 +67,17 @@ public class NetConfig {
     public static class Other {
         public static final String APP_CONFIG = "app/v1/novel/lua";
         //关于我们
-        public static String ABOUT_US_URL = "http://newspool.zhangxinhulian.com/sspapiNovel/su/custom/guazixiaoshuoapp/aboutMe.html";
+        public static String ABOUT_US_URL = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/aboutMe.html";
         //隐私协议
-        public static String PRIVACY_PROTOCOL_URL = "http://newspool.zhangxinhulian.com/sspapiNovel/su/custom/guazixiaoshuoapp/privacy.html";
+        public static String PRIVACY_PROTOCOL_URL = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/privacy.html";
 
         //用户协议
-        public static final String USER_PROTOCOL_URL = "http://newspool.zhangxinhulian.com/sspapiNovel/su/custom/guazixiaoshuoapp/user.html";
+        public static final String USER_PROTOCOL_URL = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/user.html";
         //帮助与反馈
         public static String HELP_AND_FEEDBACK_URL = "http://newspool.zhangxinhulian.com/sspapiNovel/su/custom/guazixiaoshuoapp/help.html";
         public static final String INIT_URL = "http://feed.ssp.zhangxinhulian.com/app/v1/novel/info?appKey=faba1d018f76086";
 
-        public static String FENLEI_URL = "http://newspool.zhangxinhulian.com/sspapiNovel/su/custom/guazixiaoshuoapp/privacy.html";
+        public static String FENLEI_URL = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/privacy.html";
         public static final String URL_EVENT = "logCollection/log/v1/userLogCollection";
         public static String big_award = "";
 
@@ -145,13 +145,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/duoduocaiyuan/privacy.html";//TODO 隐私协议
+        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/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/duoduocaiyuan/privacy.html\n";//TODO 用户协议
+        public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/user.html\n";//TODO 用户协议
 
         public static String WEB_URL_SHARE_LAND; //TODO
 

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

@@ -28,6 +28,8 @@ object ADConfig{
   //    867 清理后激励视频广告位 after_cleaning_video
   //    868 Draw视频广告位 small_video_list_bigimage
   //=================================农场
-  val AD_REWARD_VIDIO = "common_video"//激励视频
-  val AD_IMG_FADE = "common_bigimage"//大图
+//  val AD_REWARD_VIDIO = "common_video"//激励视频
+//  val AD_IMG_FADE = "common_bigimage"//大图
+  val AD_REWARD_VIDIO = "video"//激励视频
+  val AD_IMG_FADE = "bigimage"//大图
 }
\ No newline at end of file

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

@@ -95,11 +95,11 @@ object AdUtils {
             .compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
-                    Log.d("wxw", "看视频上报 Success")
+
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
-                    Log.d("wxw", "看视频上报 error")
+
                 }
             })
     }

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

@@ -68,15 +68,15 @@ object EventUtils {
 
     fun onEvent(action: String) {
         val jsonObj = getJSON(action)
-        apiClient(jsonObj)
-        MobclickAgent.onEvent(AppliContext.get(), action)
+//        apiClient(jsonObj)
+//        MobclickAgent.onEvent(AppliContext.get(), action)
     }
 
     fun onEvent(action: String, value: String) {
         val jsonObj = getJSON(action)
         jsonObj.put("value", value)
-        apiClient(jsonObj)
-        MobclickAgent.onEvent(AppliContext.get(), action, value)
+//        apiClient(jsonObj)
+//        MobclickAgent.onEvent(AppliContext.get(), action, value)
     }
     //广告成功展示
     fun onEventShow(entity: NewsEntity) {
@@ -114,7 +114,7 @@ object EventUtils {
 
 
     fun onEventUM(action: String, value: String) {
-        MobclickAgent.onEvent(AppliContext.get(), action, value)
+//        MobclickAgent.onEvent(AppliContext.get(), action, value)
     }
     fun onVideoEvent(action: String, id: String?, viewTime: Int, value: String) {
         val jsonObj = getJSON(action)
@@ -129,7 +129,7 @@ object EventUtils {
      */
     fun onClick(text: String) {
         val jsonObj = getJSON(getAction(text))
-        apiClient(jsonObj)
+//        apiClient(jsonObj)
 
     }
 

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

@@ -18,11 +18,15 @@ import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.view.ViewTreeObserver
+import com.ayl.ces.jni.CesCore
 import com.ym.commen.module.VideoEntity
 import com.ym.library.Constant
 import com.ym.library.module.NewsEntity
 import com.ym.library.module.NovelEntity
 import com.ym.modulecommon.AppliContext
+import com.ym.modulecommon.net.MapKeyComparator
+import com.ym.modulecommon.utils.SettingPreference.getAndroidId
+import okhttp3.HttpUrl
 import okhttp3.Request
 import java.io.*
 import java.net.NetworkInterface
@@ -695,74 +699,75 @@ object PhoneUtils {
     val KEY_DEVICE_VALIDATION_TOKEN = "token"
 
 
-//    fun addParam(request: Request, builder: HttpUrl.Builder) {
-//        val params = addCommonParam()
-//        params.put("appKey", "faba1d018f76086")
+    fun addParam(request: Request, builder: HttpUrl.Builder) {
+        val params = addCommonParam()
+        params.put("appKey", "faba1d018f76086")
 //        params.put("appLs", Constant.appLs)
-//        params.put("gender", SettingPreference.getGender().toString())
-//
-//        for (i in 0 until request.url().querySize()) {
-//            val url = request.url()
-//            params.put(url.queryParameterName(i), url.queryParameterValue(i))
-//        }
-//
-//        for (i in 0 until request.url().querySize()) {
-//            val url = request.url()
-//            builder.removeAllQueryParameters(url.queryParameterName(i))
-//        }
-//
-////        Utils.showToast(AppliContext.get(), SettingPreference.getSource())
-//
-//        if (params != null && params.size > 0) {
-//            if (CesCore.getInstance().isInit) {
-//                val json = buildMap(params)
-//                builder.addQueryParameter("datamd5", Utils.md5(json))
-//                params.put("datamd5", Utils.md5(json))
-//
-//                val data = CesCore.getInstance().Dowork(json, SettingPreference.getAndroidId())
-//                if (!TextUtils.isEmpty(data)) {
-//                    val data = URLEncoder.encode(data, "utf-8")
-//                    builder.addQueryParameter("data", data)
-//                } else {
-//                    val putkeys = params.keys
-//                    for (s in putkeys) {
-//                        builder.addQueryParameter(s, params[s])
-//                    }
-//                }
-//            } else {
+        params.put("appLs", "afcbef40e31631d3")
+        params.put("gender", SettingPreference.getGender().toString())
+
+        for (i in 0 until request.url().querySize()) {
+            val url = request.url()
+            params.put(url.queryParameterName(i), url.queryParameterValue(i))
+        }
+
+        for (i in 0 until request.url().querySize()) {
+            val url = request.url()
+            builder.removeAllQueryParameters(url.queryParameterName(i))
+        }
+
+//        Utils.showToast(AppliContext.get(), SettingPreference.getSource())
+
+        if (params != null && params.size > 0) {
+            if (CesCore.getInstance().isInit) {
+                val json = buildMap(params)
+                builder.addQueryParameter("datamd5", Utils.md5(json))
+                params.put("datamd5", Utils.md5(json))
+
+                val data = CesCore.getInstance().Dowork(json, com.ym.modulecommon.utils.SettingPreference.getAndroidId())
+                if (!TextUtils.isEmpty(data)) {
+                    val data = URLEncoder.encode(data, "utf-8")
+                    builder.addQueryParameter("data", data)
+                } else {
+                    val putkeys = params.keys
+                    for (s in putkeys) {
+                        builder.addQueryParameter(s, params[s])
+                    }
+                }
+            } else {
+                val putkeys = params.keys
+                for (s in putkeys) {
+                    builder.addQueryParameter(s, params[s])
+                }
+            }
+            var string = ""
+            val sortMap = TreeMap<String, String>(MapKeyComparator())
+            sortMap.putAll(params)
+            for ((item, value) in sortMap) {
+                string += value
+            }
+            Log.d("glc", string)
+            string = CesCore.getInstance().Sgwork(string)
+            builder.addQueryParameter("sign", string)
+        }
 //        val putkeys = params.keys
 //        for (s in putkeys) {
 //            builder.addQueryParameter(s, params[s])
 //        }
-//            }
+//
 //        var string = ""
 //        val sortMap = TreeMap<String, String>(MapKeyComparator())
 //        sortMap.putAll(params)
-//            for ((item, value) in sortMap) {
+//        for ((_, value) in sortMap) {
+//            if (!TextUtils.isEmpty(value)) {
 //                string += value
 //            }
-//            Log.d("glc", string)
-//            string = CesCore.getInstance().Sgwork(string)
-//            builder.addQueryParameter("sign", string)
-//        }
-////        val putkeys = params.keys
-////        for (s in putkeys) {
-////            builder.addQueryParameter(s, params[s])
-////        }
-////
-////        var string = ""
-////        val sortMap = TreeMap<String, String>(MapKeyComparator())
-////        sortMap.putAll(params)
-////        for ((_, value) in sortMap) {
-////            if (!TextUtils.isEmpty(value)) {
-////                string += value
-////            }
-////        }
-////        string = Utils.md5(Utils.md5(string + Constant.a) + SettingPreference.getAppSecret()).substring(0, 16)
-////        builder.addQueryParameter("sign", string)
-//
-//        params.clear()
 //        }
+//        string = Utils.md5(Utils.md5(string + Constant.a) + SettingPreference.getAppSecret()).substring(0, 16)
+//        builder.addQueryParameter("sign", string)
+
+        params.clear()
+    }
 
     fun addHeader(builder: HashMap<String, String>) {
         builder.put(Constant.pkg, Constant.Param.mPacketName)
@@ -850,7 +855,8 @@ object PhoneUtils {
 //        params.put("appLs", Constant.appLs)
         params.put(Constant.Device.uid, com.ym.modulecommon.utils.SettingPreference.getUid())
         params.put(Constant.Device.token, com.ym.modulecommon.utils.SettingPreference.getToken())
-        params.put(Constant.Device.pkg, AppliContext.get().packageName)
+//        params.put(Constant.Device.pkg, AppliContext.get().packageName)
+        params.put(Constant.Device.pkg, "com.ym.ddcy")
         params.put(Constant.Device.aid, com.ym.modulecommon.utils.SettingPreference.getAndroidId())
         params.put(Constant.Device.imei, com.ym.modulecommon.utils.SettingPreference.getImei())
         params.put(Constant.Device.device, com.ym.modulecommon.utils.SettingPreference.getDevice())
@@ -863,9 +869,11 @@ object PhoneUtils {
         params.put(Constant.Device.ip, com.ym.modulecommon.utils.SettingPreference.getIp())
         params.put(Constant.Device.imsi, com.ym.modulecommon.utils.SettingPreference.getImsi())
         params.put(Constant.Device.model, com.ym.modulecommon.utils.SettingPreference.getModel())
-        params.put(Constant.Device.vn, com.ym.modulecommon.utils.SettingPreference.getVN())
+//        params.put(Constant.Device.vn, com.ym.modulecommon.utils.SettingPreference.getVN())
+        params.put(Constant.Device.vn, "1.0.6")
         params.put(Constant.Device.ntt, com.ym.modulecommon.utils.SettingPreference.getNTT())
-        params.put(Constant.Device.vc, com.ym.modulecommon.utils.SettingPreference.getVC())
+//        params.put(Constant.Device.vc, com.ym.modulecommon.utils.SettingPreference.getVC())
+        params.put(Constant.Device.vc, "6")
         params.put(Constant.Device.source, com.ym.modulecommon.utils.SettingPreference.getSource())
         params.put(Constant.Device.ua, com.ym.modulecommon.utils.SettingPreference.getUA())
         params.put(Constant.Device.svn, com.ym.modulecommon.utils.SettingPreference.getSVN())

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

@@ -8,7 +8,7 @@
     <string name="auth_ing">授权中</string>
     <string name="wait_ing">请稍后</string>
     <string name="permission_help">帮助</string>
-    <string name="permission_help_text">多多菜园缺少必要权限：\n\n%s\n请点击"设置"-"权限"-打开所需权限。\n最后点击两次后退按钮，即可返回。</string>
+    <string name="permission_help_text">多多花园缺少必要权限：\n\n%s\n请点击"设置"-"权限"-打开所需权限。\n最后点击两次后退按钮，即可返回。</string>
     <string name="permission_camera_help_text">此功能需要权限：\n\n%s\n请点击"设置"-"权限"-打开所需权限。</string>
     <string name="permission_quit">退出</string>
     <string name="permission_setting">设置</string>

userinfo/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
 
                 <data
                     android:host="setting"
-                    android:scheme="ddcy" />
+                    android:scheme="ddhy" />
             </intent-filter>
         </activity>
     </application>

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

@@ -14,6 +14,7 @@ import com.ym.library.Constant
 import com.ym.library.down.UpdateVersionManager
 import com.ym.library.module.NewsEntity
 import com.ym.library.net.BaseActivity
+import com.ym.library.net.NetConfig
 import com.ym.library.utils.*
 import com.ym.module.userinfo.R
 import kotlinx.android.synthetic.main.activity_setting.*
@@ -67,11 +68,13 @@ class SettingActivity : BaseActivity() {
         }
         //隐私条款
         tv_setting_privacy_policy.setOnClickListener {
-            JumpUtils.h5Jump("隐私条款", Constant.Param.PRIVACY, true, this)
+//            JumpUtils.h5Jump("隐私条款", Constant.Param.PRIVACY, true, this)
+            JumpUtils.h5Jump("隐私条款",NetConfig.H5.WEB_URL_USER, true, this)
         }
         //关于我们
         tv_setting_about_us.setOnClickListener {
-            JumpUtils.h5Jump("关于我们", Constant.Param.ABOUTUS, true, this)
+//            JumpUtils.h5Jump("关于我们", Constant.Param.ABOUTUS, true, this)
+            JumpUtils.h5Jump("关于我们",NetConfig.H5.WEB_URL_ABOUT_US, true, this)
         }
         //版本升级
         id_setting_update_version.setOnClickListener {

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>