多多菜园代码改成芭芭农场1.1.0

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

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.bbnc">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -35,7 +35,7 @@
 
                 <data
                     android:host="welfare"
-                    android:scheme="ddcy" />
+                    android:scheme="bbnc" />
             </intent-filter>
 
         </activity>
@@ -50,7 +50,7 @@
 
                 <data
                     android:host="clockinwithdraw"
-                    android:scheme="ddcy" />
+                    android:scheme="bbnc" />
             </intent-filter>
         </activity>
         <activity
@@ -62,7 +62,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data
                     android:host="nomal_web"
-                    android:scheme="ddcy" />
+                    android:scheme="bbnc" />
             </intent-filter>
         </activity>
         <meta-data

app/src/main/assets/supplierconfig.json

+{
+  "supplier":{
+    "vivo":{
+      "appid":"105439490"
+    },
+    "xiaomi":{
+      "appid":"2882303761518934322"
+    },
+    "huawei":{
+      "appid":"103567121"
+    },
+    "oppo":{
+      "appid":"30443005"
+    },
+    "meizu": {
+      "appid":"330284"
+    }
+  }
+
+}

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

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

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

@@ -50,7 +50,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
 //        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // 禁用横屏
 //        window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) //禁止截屏
         super.onCreate(savedInstanceState)
-        EventUtils.onEvent("tab_imp", "多多菜园")
+        EventUtils.onEvent("tab_imp", "芭芭农场")
         if (SettingPreference.getIsShowGuide()) {
             SettingPreference.setIsShowGuide(false)
         }

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

@@ -4,7 +4,7 @@ import android.app.Dialog
 import android.text.Html
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.ym.ddcy.R
+import com.ym.bbnc.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/MonopolyWebActivity.java

@@ -14,7 +14,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.airbnb.lottie.LottieAnimationView;
-import com.ym.ddcy.R;
+import com.ym.bbnc.R;
 import com.ym.game.monopoly.LollipopFixedWebView;
 import com.ym.library.activity.JavaInterface;
 import com.ym.library.net.MyBaseActivity;

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

@@ -11,7 +11,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.bbnc.R
 import com.ym.game.GameActivity
 import com.ym.game.utils.CenterDialog
 import com.ym.library.MyConstant

app/src/main/java/com/ym/game/activity/WelfareActivityMy.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.bbnc.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/WxLoginActivityMy.kt

@@ -7,7 +7,7 @@ import com.ym.game.GameActivity
 import com.ym.library.net.*
 import com.ym.library.utils.*
 import com.ym.library.utils.EventUtils.onEvent
-import com.ym.ddcy.R
+import com.ym.bbnc.R
 import kotlinx.android.synthetic.main.activity_wx_login.*
 import org.jetbrains.anko.act
 

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

@@ -15,7 +15,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.bbnc.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

@@ -12,7 +12,7 @@ import android.widget.*
 import androidx.recyclerview.widget.RecyclerView
 import com.ym.library.listener.OnRecycleItemClickListener
 import com.ym.library.base.BaseRecyclerAdapter
-import com.ym.ddcy.R
+import com.ym.bbnc.R
 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.bbnc.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.bbnc.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.bbnc.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.bbnc.R
 import com.ym.library.module.SinginEntity
 
 /**

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

@@ -19,7 +19,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.bbnc.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/WareHouseAdapter.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.bbnc.R
 import com.ym.library.base.BaseRecyclerAdapter
 import com.ym.library.module.FlyBoxEntity
 import com.ym.modulecommon.AppliContext

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

@@ -17,7 +17,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.bbnc.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.bbnc.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

@@ -14,7 +14,7 @@ import com.bumptech.glide.Glide
 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.bbnc.R
 import com.ym.library.module.NewsEntity
 
 /**

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

@@ -54,13 +54,13 @@ class BaseApplication : BaseApplication() {
     private var backToFrontTime: Long = 0
     override fun onCreate() {
         super.onCreate()
-        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
         var isDebug = true
         if (NetConfig.sEnvironment == NetConfig.Environment.PRODUCT) {
             isDebug = false
-            NetConfig.BASE_FEED_URL = "https://fsapi.ihuomao.com/"
-            NetConfig.BASE_AD_URL = "https://bs.ihuomao.com/"
-            NetConfig.URL_REPORT_BASE = "http://report.ihuomao.com/"
+//            NetConfig.BASE_FEED_URL = "https://fsapi.ihuomao.com/"
+//            NetConfig.BASE_AD_URL = "https://bs.ihuomao.com/"
+//            NetConfig.URL_REPORT_BASE = "http://report.ihuomao.com/"
         } else {
             //TODO 上线去掉测试地址
             NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
@@ -69,10 +69,10 @@ class BaseApplication : BaseApplication() {
         LogUtils.getConfig().logSwitch = isDebug
         AppLibraryConfig.NetConfig.isDebug = isDebug
 //        Constant.appLs = "afcbef40e31631d3"//appls
-        AdManager.init(this, "afcbef40e31631d3")
+        AdManager.init(this, "7025878009b4cca3")
 
         UMConfigure.setLogEnabled(false)
-        UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "")
+        UMConfigure.init(this, "5fe446a944bb94418a636569", "", UMConfigure.DEVICE_TYPE_PHONE, "")
         PlatformConfig.setWeixin(MyConstant.WX_APPID, MyConstant.WX_APPKEY)
 
 
@@ -87,12 +87,12 @@ class BaseApplication : BaseApplication() {
         // 设置是否为上报进程
         strategy.isUploadProcess = processName == null || processName == packageName
         //Bugly初始化
-        CrashReport.initCrashReport(this, "262040511a", isDebug, strategy)
+        CrashReport.initCrashReport(this, "3bac59d22f", isDebug, strategy)
         //========== Bugly ==========
 
         //小满
-        AdSdk.setDebug(isDebug)//打开日志
-        AdSdk.init(this, "ddcy-az-hdgj_vbskkc", "D545402QovC2W5g8")//初始化 需要在Applicaiton 中
+       // AdSdk.setDebug(isDebug)//打开日志
+       // AdSdk.init(this, "ddcy-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.bbnc.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.bbnc.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

@@ -17,7 +17,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.bbnc.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.bbnc.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

@@ -12,7 +12,7 @@ import android.view.ViewGroup
 import android.widget.*
 import com.ym.game.listener.IDialogViewCloseCallback
 import com.ym.modulecommon.AppliContext
-import com.ym.ddcy.R
+import com.ym.bbnc.R
 import com.ym.library.MyConstant
 import com.ym.library.module.FlyBoxEntity
 import com.ym.library.module.TurntableEntity

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

@@ -23,7 +23,7 @@ import android.widget.RelativeLayout
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.lottie.LottieAnimationView
-import com.ym.ddcy.R
+import com.ym.bbnc.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

@@ -20,7 +20,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.bbnc.R
 import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.*
 import com.ym.library.utils.*
@@ -107,10 +107,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

@@ -19,7 +19,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.bbnc.R
 import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.TaskListEntity
 import com.ym.library.module.WateringTaskEntity
@@ -81,10 +81,10 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.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/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.bbnc.R
 import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.StatusEntity
 import com.ym.library.module.TurntableEntity

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

@@ -7,7 +7,7 @@ import android.widget.ImageView
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddcy.R
+import com.ym.bbnc.R
 import com.ym.game.adapter.RecordAdapter
 import com.ym.game.adapter.WareHouseAdapter
 import com.ym.game.contract.WareHouseContract

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

@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_above="@id/id_btn_wx_login"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_60"
+        android:layout_marginBottom="@dimen/dp_70"
         android:src="@mipmap/icon_login_bg" />
 
     <LinearLayout

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
-VERSION_CODE=10
-VERSION_NAME=1.0.9
\ No newline at end of file
+PACKAGE_NAME=com.ym.bbnc
+VERSION_CODE=11
+VERSION_NAME=1.1.0
\ No newline at end of file

library/build.gradle

@@ -56,6 +56,7 @@ repositories {
     }
 }*/
 
+
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     api fileTree(include: ['*.aar'], dir: 'libs')
@@ -67,7 +68,7 @@ dependencies {
     api ("com.bx:adsdk:1.3.7"){
         exclude group: 'com.google.code.gson'
     }
-    api 'com.ym.admodule:admodule:1.0.3.14'
+    api 'com.ym.admodule:admodule:1.0.3.28'
     api 'com.airbnb.android:lottie:3.1.0'
 
 }

library/src/main/AndroidManifest.xml

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

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

@@ -17,15 +17,15 @@ import java.util.List;
 public class MyConstant {
 
     public static int REQUEST_CODE_ASK_PERMISSIONS = 0x0101;
-    public static final String scheme = "ddcy";
+    public static final String scheme = "bbnc";
     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 = "wx807bc179331f37a6";
     //    public static String WX_APPID = "wxcd4157d1e36f5cd8";
-    public static String WX_APPKEY = "6fa72a89ea188c4dff5729cff328b587";
+    public static String WX_APPKEY = "7a9ab9dbc24a03504030762b91e833b8";
     public static String WX_SHARE_APPID = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static String WX_SHARE_APPKEY = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static final String SHANYAN_KEY = "7QciptTf";
@@ -384,7 +384,7 @@ public class MyConstant {
 
     public static class Param {
         //public static String mPacketName = PhoneUtils.INSTANCE.getAppPackage();
-        public static String mPacketName = "com.ym.ddcy";
+        public static String mPacketName = "com.ym.bbnc";
         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/VersionClient.kt

@@ -3,6 +3,7 @@ package com.ym.library.down
 import com.ym.library.MyConstant
 import com.ym.library.net.IUserApi
 import com.ym.library.utils.LogUtils
+import com.ym.modulecommon.net.DecryptInterceptor
 import okhttp3.Interceptor
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
@@ -53,6 +54,7 @@ object VersionClient {
         .hostnameVerifier { hostname, session ->
             true
         }
+        .addInterceptor(DecryptInterceptor())
         .addInterceptor(paramsInterceptor)
         .addInterceptor(headInterceptor)
         .build()!!

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

@@ -3,6 +3,7 @@ package com.ym.library.net
 import android.text.TextUtils
 import com.ym.admodule.BuildConfig
 import com.ym.library.MyConstant
+import com.ym.modulecommon.net.DecryptInterceptor
 import com.ym.modulecommon.net.NetConfig
 import com.ym.modulecommon.utils.AdPreference.getAndroidId
 import com.ym.modulecommon.utils.AdPreference.getUserAgent
@@ -52,6 +53,7 @@ object ApiClient {
         .addInterceptor(logInterceptor.apply {
             level =  if(BuildConfig.DEBUG)HttpLoggingInterceptor.Level.BODY else{HttpLoggingInterceptor.Level.NONE}
         })
+        .addInterceptor(DecryptInterceptor())
 //        .retryOnConnectionFailure(false)
         .hostnameVerifier { hostname, session ->
             true

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

@@ -2,6 +2,7 @@ package com.ym.library.net;
 
 
 import com.ym.library.MyConstant
+import com.ym.modulecommon.net.DecryptInterceptor
 import com.ym.modulecommon.net.NetConfig
 import com.ym.modulecommon.utils.PhoneUtils
 import okhttp3.Interceptor
@@ -43,6 +44,7 @@ object  EventApiClient {
         .addInterceptor(logInterceptor.apply {
             level =  HttpLoggingInterceptor.Level.BODY
         })
+        .addInterceptor(DecryptInterceptor())
         .hostnameVerifier { hostname, session ->
             true
         }

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

@@ -3,6 +3,7 @@ package com.ym.library.net
 import android.text.TextUtils
 import com.ym.admodule.BuildConfig
 import com.ym.library.MyConstant
+import com.ym.modulecommon.net.DecryptInterceptor
 import com.ym.modulecommon.net.NetConfig
 import com.ym.modulecommon.utils.PhoneUtils
 import com.ym.modulecommon.utils.AdPreference.getAndroidId
@@ -55,6 +56,7 @@ object GameApiClient {
             level =  if(BuildConfig.DEBUG)HttpLoggingInterceptor.Level.BODY else{HttpLoggingInterceptor.Level.NONE}
         })
 //        .retryOnConnectionFailure(false)
+        .addInterceptor(DecryptInterceptor())
         .hostnameVerifier { hostname, session ->
             true
         }

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

@@ -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/babanongchang/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/babanongchang/user.html";//TODO 用户协议
 
         public static String WEB_URL_SHARE_LAND; //TODO
 

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

@@ -2,6 +2,7 @@ package com.ym.library.net
 
 import android.text.TextUtils
 import com.ym.library.MyConstant
+import com.ym.modulecommon.net.DecryptInterceptor
 import com.ym.modulecommon.net.NetConfig
 import okhttp3.Interceptor
 import okhttp3.Request
@@ -34,7 +35,10 @@ object ZXADClient {
         builder.addHeader(MyConstant.aid, com.ym.modulecommon.utils.AdPreference.getAndroidId())
         builder.addHeader(MyConstant.Device.env, MyConstant.Param.env)
         if (!TextUtils.isEmpty(com.ym.modulecommon.utils.AdPreference.getUserAgent())) {
-            builder.addHeader("web-user-agent", com.ym.modulecommon.utils.AdPreference.getUserAgent())
+            builder.addHeader(
+                "web-user-agent",
+                com.ym.modulecommon.utils.AdPreference.getUserAgent()
+            )
             builder.removeHeader("User-Agent")
             builder.addHeader("User-Agent", com.ym.modulecommon.utils.AdPreference.getUserAgent())
         }
@@ -43,24 +47,25 @@ object ZXADClient {
     }
 
     private val httpClient = okhttp3.OkHttpClient.Builder()
-            .connectTimeout(10000, TimeUnit.MILLISECONDS)
-            .readTimeout(10000, TimeUnit.MILLISECONDS)
-            .addInterceptor(logInterceptor.apply {
-                level = HttpLoggingInterceptor.Level.BODY
-            })
-            .hostnameVerifier { hostname, session ->
-                true
-            }
-            .addInterceptor(paramsInterceptor)
-            .addInterceptor(headInterceptor)
-            .build()!!
+        .connectTimeout(10000, TimeUnit.MILLISECONDS)
+        .readTimeout(10000, TimeUnit.MILLISECONDS)
+        .addInterceptor(logInterceptor.apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        })
+        .addInterceptor(DecryptInterceptor())
+        .hostnameVerifier { hostname, session ->
+            true
+        }
+        .addInterceptor(paramsInterceptor)
+        .addInterceptor(headInterceptor)
+        .build()!!
 
     private val retrofit = retrofit2.Retrofit.Builder()
-            .client(httpClient)
-            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-            .addConverterFactory(GsonConverterFactory.create())
-            .baseUrl(NetConfig.BASE_AD_URL)
-            .build()
+        .client(httpClient)
+        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+        .addConverterFactory(GsonConverterFactory.create())
+        .baseUrl(NetConfig.BASE_AD_URL)
+        .build()
 
     val adApi by lazy { retrofit.create(ZXAdApi::class.java) }
 }
\ No newline at end of file

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

@@ -28,6 +28,6 @@ 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 = "video"//激励视频
+  val AD_IMG_FADE = "bigimage"//大图
 }
\ No newline at end of file

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

@@ -611,7 +611,7 @@ object CenterDialog : BaseDialog() {
             Gravity.CENTER
         )
         mDialogView.findViewById<TextView>(R.id.tv_info).text =
-            "多多菜园缺少必要权限：\n\n${title}\n请点击\"设置\"-\"权限\"-打开所需权限。\n最后点击两次后退按钮，即可返回。"
+            "芭芭农场缺少必要权限：\n\n${title}\n请点击\"设置\"-\"权限\"-打开所需权限。\n最后点击两次后退按钮，即可返回。"
 
         mDialogView.findViewById<TextView>(R.id.btn_permission_quit).setOnClickListener {
             quitListener.onClick(it)

library/src/main/java/com/ym/library/wechat/UserApiClient.kt

@@ -2,6 +2,7 @@ package com.ym.library.wechat
 
 import android.text.TextUtils
 import com.ym.library.MyConstant
+import com.ym.modulecommon.net.DecryptInterceptor
 import okhttp3.*
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
@@ -47,6 +48,7 @@ object UserApiClient {
             level = HttpLoggingInterceptor.Level.BODY
         })
 //        .retryOnConnectionFailure(false)
+        .addInterceptor(DecryptInterceptor())
         .hostnameVerifier { hostname, session ->
             true
         }

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="bbnc" />
             </intent-filter>
         </activity>
     </application>

userinfo/src/main/java/com/ym/userinfo/module/net/UserApiClient.kt

@@ -2,6 +2,7 @@ package com.ym.userinfo.module.net
 
 import android.text.TextUtils
 import com.ym.library.MyConstant
+import com.ym.modulecommon.net.DecryptInterceptor
 import okhttp3.*
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
@@ -46,6 +47,7 @@ object UserApiClient {
         .addInterceptor(logInterceptor.apply {
             level = HttpLoggingInterceptor.Level.BODY
         })
+        .addInterceptor(DecryptInterceptor())
 //        .retryOnConnectionFailure(false)
         .hostnameVerifier { hostname, session ->
             true

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>