[提交人]：王雪伟

[提交简述] ：多多花园1.0.1
[实现方案] ：替换包名

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 → app/src/main/java/com/ym/ddhy/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

@@ -16,7 +16,7 @@ import com.bx.adsdk.AdSdk
 import com.game.luckyfarm.UnityPlayerActivity
 import com.gyf.immersionbar.ImmersionBar
 import com.umeng.analytics.MobclickAgent
-import com.ym.ddcy.R
+import com.ym.ddhy.R
 import com.ym.game.activity.WxLoginActivity
 import com.ym.game.listener.IDialogViewCloseCallback
 import com.ym.game.notif.NotificationService
@@ -53,7 +53,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)
         }
@@ -83,11 +83,11 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
 
         })
 
-        //小满上报
-        if (Constant.isReportXiaoman) {
-            AdSdk.exposure("2773", com.ym.modulecommon.utils.SettingPreference.getToken())
-            Constant.isReportXiaoman = false
-        }
+//        //小满上报
+//        if (Constant.isReportXiaoman) {
+//            AdSdk.exposure("2773", com.ym.modulecommon.utils.SettingPreference.getToken())
+//            Constant.isReportXiaoman = false
+//        }
         openNotif()
 
         AdUtils.loadNextCacheRewardVideoAd(this)
@@ -189,7 +189,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
      * 上榜赚钱
      */
     fun ranklistClick() {
-        Log.d("wxw", "上榜赚钱")
         //JumpUtils.h5Jump("上榜赚钱", Constant.Param.RankList)
         JumpUtils.h5Jump("排行榜", Constant.Param.RankList, false, act)
     }

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.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

@@ -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.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

@@ -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.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/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.ddhy.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.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

@@ -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.ddhy.R
 import com.ym.library.module.NewsEntity
 
 /**

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

@@ -88,8 +88,8 @@ class BaseApplication : BaseApplication() {
         //========== Bugly ==========
 
         //小满
-        AdSdk.setDebug(isDebug)//打开日志
-        AdSdk.init(this, "ddcy-az-hdgj_vbskkc", "D545402QovC2W5g8")//初始化 需要在Applicaiton 中
+//        AdSdk.setDebug(isDebug)//打开日志
+//        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

@@ -17,7 +17,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.TaskListEntity
 import com.ym.library.module.WateringTaskEntity
@@ -82,10 +82,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.ddhy.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.ddhy.R
 import com.ym.game.adapter.RecordAdapter
 import com.ym.game.adapter.WareHouseAdapter
 import com.ym.game.contract.WareHouseContract

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=8
-VERSION_NAME=1.0.7
+PACKAGE_NAME=com.ym.ddhy
+VERSION_CODE=2
+VERSION_NAME=1.0.1
\ No newline at end of file

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,7 +15,7 @@ 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";
 
@@ -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/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/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>