[提交人]：王雪伟

[提交简述] ：幸福花园
[实现方案] ：更换包名

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.ddhy">
+    package="com.ym.garden">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -103,7 +103,7 @@
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" /> <!-- 微信配置 -->
         <activity
-            android:name=".wxapi.WXEntryActivity"
+            android:name="com.ym.garden.wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />

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

@@ -12,7 +12,7 @@ import android.util.Log
 import android.view.View
 import com.game.luckyfarm.UnityPlayerActivity
 import com.umeng.analytics.MobclickAgent
-import com.ym.ddhy.UserInfoEntity
+import com.ym.garden.UserInfoEntity
 import com.ym.game.activity.WxLoginActivity
 import com.ym.game.listener.IDialogViewCloseCallback
 import com.ym.game.notif.NotificationService
@@ -47,7 +47,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
 //        StatusBarUtils.transportStatus(this, resources.getColor(R.color.transparent))
 //        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // 禁用横屏
 //        window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) //禁止截屏
-        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.ddhy.R
+import com.ym.garden.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

 package com.ym.game.activity;
 
 import android.app.Activity;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
@@ -15,7 +14,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.airbnb.lottie.LottieAnimationView;
-import com.ym.ddhy.R;
+import com.ym.garden.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

 package com.ym.game.activity
 
-import android.app.Activity
 import android.content.Intent
 import android.util.Log
 import android.view.View
@@ -12,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.ddhy.R
+import com.ym.garden.R
 import com.ym.game.GameActivity
 import com.ym.game.utils.CenterDialog
 import com.ym.library.MyConstant
@@ -23,7 +22,6 @@ import com.ym.library.net.SplashContract
 import com.ym.library.net.SplashPresenter
 import com.ym.library.net.SplashPresenter.Companion.PERMISSIONS
 import com.ym.library.utils.*
-import com.ym.modulecommon.base.BaseActivity
 import com.ym.modulecommon.utils.AdPreference
 
 class SplashActivity : MyBaseActivity(), SplashContract.View {

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.ddhy.R
+import com.ym.garden.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

@@ -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.ddhy.R
+import com.ym.garden.R
 import kotlinx.android.synthetic.main.activity_wx_login.*
 import org.jetbrains.anko.act
 

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

@@ -4,7 +4,6 @@ import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.app.Activity
 import android.app.Dialog
-import android.content.Context
 import android.text.Html
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -15,7 +14,7 @@ import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddhy.R
+import com.ym.garden.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.ddhy.R
+import com.ym.garden.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.ddhy.R
+import com.ym.garden.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.ddhy.R
+import com.ym.garden.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.ddhy.R
+import com.ym.garden.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

 package com.ym.game.adapter
 
 import android.content.Context
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,7 +8,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.ym.library.base.BaseRecyclerAdapter
-import com.ym.ddhy.R
+import com.ym.garden.R
 import com.ym.library.module.SinginEntity
 
 /**

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

@@ -17,12 +17,10 @@ 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.LogUtils
 import com.ym.library.utils.Utils
-import com.ym.ddhy.R
+import com.ym.garden.R
 import com.ym.library.module.NewsEntity
 import com.ym.library.module.TaskCompleteEntity
-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/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.ddhy.R
+import com.ym.garden.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

@@ -4,7 +4,6 @@ import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
 import android.app.Activity
 import android.text.TextUtils
-import android.util.Log
 import android.view.*
 import android.widget.*
 import androidx.recyclerview.widget.RecyclerView
@@ -17,10 +16,9 @@ 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.ddhy.R
+import com.ym.garden.R
 import com.ym.library.module.NewsEntity
 import com.ym.library.module.TaskCompleteEntity
-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/WelfareDiamondAdapter.kt

@@ -8,11 +8,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddhy.R
+import com.ym.garden.R
 import com.ym.library.base.BaseRecyclerAdapter
 import com.ym.library.listener.OnRecycleItemClickListener
 import com.ym.library.module.DiamondEntity
-import com.ym.library.module.NewsEntity
 import com.ym.library.utils.Utils
 
 /**

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

@@ -3,8 +3,6 @@ package com.ym.game.adapter
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
 import android.app.Activity
-import android.text.TextUtils
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,7 +12,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.ddhy.R
+import com.ym.garden.R
 import com.ym.library.module.NewsEntity
 
 /**

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

 package com.ym.game.notif;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -18,7 +17,7 @@ import android.widget.RemoteViews;
 
 import androidx.core.app.NotificationCompat;
 
-import com.ym.ddhy.R;
+import com.ym.garden.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,11 +11,10 @@ import android.text.style.ForegroundColorSpan
 import android.view.Gravity
 import android.view.View
 import android.widget.TextView
-import com.ym.ddhy.R
+import com.ym.garden.R
 import com.ym.library.base.BaseDialog
 import com.ym.library.net.NetConfig
 import com.ym.library.utils.JumpUtils
-import org.jetbrains.anko.act
 
 /**
  * Created by gaoleichao on 2018/8/17.
@@ -73,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/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.ddhy.R
+import com.ym.garden.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.ddhy.R
+import com.ym.garden.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

@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import android.widget.*
 import com.ym.game.listener.IDialogViewCloseCallback
 import com.ym.modulecommon.AppliContext
-import com.ym.ddhy.R
+import com.ym.garden.R
 import com.ym.library.module.FlyBoxEntity
 import com.ym.library.module.TurntableEntity
 import com.ym.library.utils.*

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.ddhy.R
+import com.ym.garden.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.ddhy.R
+import com.ym.garden.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.ddhy.R
+import com.ym.garden.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

@@ -3,7 +3,6 @@ package com.ym.game.view
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
-import android.content.Context
 import android.os.CountDownTimer
 import android.util.Log
 import android.view.Gravity
@@ -22,8 +21,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.ddhy.R
-import com.ym.library.listener.IAdVideoListener
+import com.ym.garden.R
 import com.ym.library.module.StatusEntity
 import com.ym.library.module.TurntableEntity
 import com.ym.library.net.GameApiClient

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

@@ -5,19 +5,14 @@ import android.content.Context
 import android.view.Gravity
 import android.widget.ImageView
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.ddhy.R
-import com.ym.game.adapter.RecordAdapter
+import com.ym.garden.R
 import com.ym.game.adapter.WareHouseAdapter
 import com.ym.game.contract.WareHouseContract
-import com.ym.game.presenter.RecordPresenter
 import com.ym.game.presenter.WareHousePresenter
 import com.ym.library.module.FlyBoxEntity
-import com.ym.library.module.WateringTaskEntity
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.utils.EventUtils
-import com.ym.library.utils.LogUtils
 
 object WareHouseDialog : WareHouseContract.View {
 

app/src/main/java/com/ym/ddhy/wxapi/WXEntryActivity.java → app/src/main/java/com/ym/garden/wxapi/WXEntryActivity.java

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

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.garden
-VERSION_CODE=200
-VERSION_NAME=2.0.0
\ No newline at end of file
+VERSION_CODE=5
+VERSION_NAME=1.0.4
\ No newline at end of file

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

@@ -382,7 +382,7 @@ public class MyConstant {
 
     public static class Param {
         //public static String mPacketName = PhoneUtils.INSTANCE.getAppPackage();
-        public static String mPacketName = "com.ym.ddhy";
+        public static String mPacketName = "com.ym.garden";
         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/module/UserInfoEntity.kt

-package com.ym.ddhy
+package com.ym.garden
 
 import java.io.Serializable
 

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

 package com.ym.library.net
 
-import com.ym.ddhy.UserInfoEntity
+import com.ym.garden.UserInfoEntity
 import com.ym.library.module.*
 import io.reactivex.Observable
 import okhttp3.ResponseBody

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

@@ -67,20 +67,18 @@ 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/huayuan/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/huayuan/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/huayuan/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/huayuan/privacy.html";
         public static final String URL_EVENT = "logCollection/log/v1/userLogCollection";
         public static String big_award = "";
-
     }
 
 
@@ -114,13 +112,15 @@ public class NetConfig {
 
         public static String WEB_URL_ABOUT_US;//TODO 关于我们页面
 
-        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/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_PRIVACY = Other.PRIVACY_PROTOCOL_URL;//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/duoduohuayuan/user.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_USER = Other.USER_PROTOCOL_URL;//TODO 用户协议
 
         public static String WEB_URL_SHARE_LAND; //TODO
 

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

@@ -3,7 +3,7 @@ package com.ym.library.net
 import android.app.Activity
 import android.os.Build
 import android.text.TextUtils
-import com.ym.ddhy.UserInfoEntity
+import com.ym.garden.UserInfoEntity
 import com.ym.library.MyConstant
 import com.ym.library.utils.*
 import com.ym.library.utils.SettingPreference.saveUserInfo

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

@@ -608,7 +608,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/utils/JumpUtils.java

@@ -6,7 +6,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 
-import com.ym.ddhy.UserInfoEntity;
+import com.ym.garden.UserInfoEntity;
 import com.ym.library.listener.IAdVideoListener;
 import com.ym.library.module.NewsEntity;
 import com.ym.library.module.ShaveListEntity;

library/src/main/java/com/ym/library/utils/SettingPreference.java

@@ -7,7 +7,7 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 
 import com.ym.commen.module.VideoEntity;
-import com.ym.ddhy.UserInfoEntity;
+import com.ym.garden.UserInfoEntity;
 import com.ym.library.MyConstant;
 import com.ym.library.module.WithdrawCardEntity;
 import com.ym.library.module.WithdrawEntity;

library/src/main/java/com/ym/library/utils/WxImplUtils.java

@@ -9,7 +9,7 @@ import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.UMShareConfig;
 import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.ym.ddhy.UserInfoEntity;
+import com.ym.garden.UserInfoEntity;
 import com.ym.library.MyConstant;
 import com.ym.library.R;
 import com.ym.library.module.WxBindEntity;

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

 package com.ym.library.wechat
 
-import com.ym.ddhy.UserInfoEntity
+import com.ym.garden.UserInfoEntity
 import com.ym.library.module.*
 import com.ym.library.net.NetConfig
 import com.ym.library.net.Response

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/java/com/ym/userinfo/module/contract/UserContract.kt

 package com.ym.userinfo.module.contract
 
-import com.ym.ddhy.UserInfoEntity
+import com.ym.garden.UserInfoEntity
 import com.ym.library.module.WithdrawEntity
 import com.ym.userinfo.module.entity.LotteryEntity
 

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

 package com.ym.userinfo.module.net
 
-import com.ym.ddhy.UserInfoEntity
+import com.ym.garden.UserInfoEntity
 import com.ym.library.module.*
 import com.ym.library.net.NetConfig
 import com.ym.library.net.Response

userinfo/src/main/java/com/ym/userinfo/module/presenter/UserPresenter.kt

 package com.ym.userinfo.module.presenter
 
-import com.ym.ddhy.UserInfoEntity
+import com.ym.garden.UserInfoEntity
 import com.ym.library.module.WithdrawEntity
 import com.ym.library.net.BaseObserver
 import com.ym.library.net.RxSchedulers

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>