代码优化

app/src/main/java/com/mints/fairyland/common/DeviceInfo.kt

@@ -567,7 +567,7 @@ class DeviceInfo private constructor() {
                     val appMap: MutableMap<String, String> = HashMap()
                     appMap["appName"] = appInfo.loadLabel(mContext!!.packageManager) as String
                     appMap["appPkg"] = pinfo.packageName
-                    if (TextUtils.equals("好赚钱", appInfo.loadLabel(mContext!!.packageManager) as String) &&
+                    if (TextUtils.equals("赚赚乐园", appInfo.loadLabel(mContext!!.packageManager) as String) &&
                             TextUtils.equals(pinfo.packageName, Constant.MINTS_PKG_NAME)) {
                         continue
                     }
@@ -600,7 +600,7 @@ class DeviceInfo private constructor() {
                     //系统程序 忽略
                 } else {
                     //非系统程序
-                    if (TextUtils.equals("好赚钱", appInfo.loadLabel(mContext!!.packageManager) as String) &&
+                    if (TextUtils.equals("赚赚乐园", appInfo.loadLabel(mContext!!.packageManager) as String) &&
                             TextUtils.equals(pinfo.packageName, Constant.MINTS_PKG_NAME)) {
                         continue
                     }
@@ -634,7 +634,7 @@ class DeviceInfo private constructor() {
                     //系统程序 忽略
                 } else {
                     //非系统程序
-                    if (TextUtils.equals("好赚钱", appInfo.loadLabel(mContext!!.packageManager) as String) &&
+                    if (TextUtils.equals("赚赚乐园", appInfo.loadLabel(mContext!!.packageManager) as String) &&
                             TextUtils.equals(pinfo.packageName, Constant.MINTS_PKG_NAME)) {
                         continue
                     }

app/src/main/java/com/mints/fairyland/ui/activitys/WxLoginActivity.kt

@@ -198,7 +198,7 @@ class WxLoginActivity : BaseActivity()
                         ds.isUnderlineText = false
                     }
                 })
-                .append("与您的利益切身相关。请您注册前务必仔细阅读!点击登录即表示您同意并愿意遵守好赚钱协议")
+                .append("与您的利益切身相关。请您注册前务必仔细阅读!点击登录即表示您同意并愿意遵守赚赚乐园协议")
                 .create()
 
     }

app/src/main/java/com/mints/fairyland/ui/fragment/FriendsFragment.kt

@@ -483,7 +483,7 @@ class FriendsFragment(private var isResume: Boolean = false) : BaseFragment(), F
             allcoinBig.divide(rateBig).setScale(2, BigDecimal.ROUND_DOWN).toString()
         }
         val content = SpanUtils()
-                .append("我已在好赚钱赚了")
+                .append("我已在赚赚乐园赚了")
                 .append(sumCoin).setFontSize(BubbleUtils.dp2px(10)).setForegroundColor(ContextCompat.getColor(mContext, R.color.color_E72C2B))
                 .append("元 ，快来跟我一起赚钱吧，满")
                 .append("0.3").setFontSize(BubbleUtils.dp2px(10)).setForegroundColor(ContextCompat.getColor(mContext, R.color.color_E72C2B))

app/src/main/java/com/mints/fairyland/ui/fragment/MyFragment.kt

@@ -1250,7 +1250,7 @@ class MyFragment : BaseFragment(),
      * 跳转QQ群弹框
      */
     private fun jumpQQGroup() {
-        DialogUtils.showDialog(mContext, "提示", "好赚钱想要打开QQ", "取消", "打开", object : DialogListener() {
+        DialogUtils.showDialog(mContext, "提示", "赚赚乐园想要打开QQ", "取消", "打开", object : DialogListener() {
             override fun onClick(dialog: Dialog?, v: View?) {
                 dialog?.dismiss()
 
@@ -1327,7 +1327,7 @@ class MyFragment : BaseFragment(),
         val ssb = SpanUtils()
                 .append("1.点击开始任务，观看广告时，点击广告中的下载APP区域\r\n" +
                         "2.等待APP下载完成后，安装该APP\r\n" +
-                        "3.通过好赚钱APP打开该APP并试玩至少30秒" +
+                        "3.通过赚赚乐园APP打开该APP并试玩至少30秒" +
                         "\n\n")
                 .append("说明:有些可能不是下载APP类型的广告，请关闭广告后重试").setFontSize(BubbleUtils.dp2px(12))
                 .create()

app/src/main/java/com/mints/fairyland/ui/fragment/PanFragment.kt

@@ -172,7 +172,7 @@ class PanFragment : BaseFragment(), PanView {
      */
     private fun getTurnUrl() {
         val tokenID = userManager.tokenID
-        val url: String = BuildConfig.MainIp + "turn/zz/turnWithInner.html?carrierType=" + carrierType + "&token=" + tokenID
+        val url: String = BuildConfig.MainIp + "turn/zzturnWithInner.html?carrierType=" + carrierType + "&token=" + tokenID
         blTurntableWebview.loadUrl(url)
     }
 

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

@@ -38,7 +38,7 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginRight="16dp"
-                    android:text="我们依据最新的法律,向您说明好赚钱软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
+                    android:text="我们依据最新的法律,向您说明赚赚乐园软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
                     android:textColor="@color/black"
                     android:textSize="14sp" />