Commit e4c4e958 authored by maxiaoliang's avatar maxiaoliang

提交代码11

parent 5cc21ecc
<?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.bbnc">
package="com.ym.xync">
<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="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
......@@ -50,7 +50,7 @@
<data
android:host="clockinwithdraw"
android:scheme="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
<activity
......@@ -62,7 +62,7 @@
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="nomal_web"
android:scheme="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
<meta-data
......@@ -97,7 +97,7 @@
android:launchMode="singleTask" /> <!-- 友盟配置 -->
<meta-data
android:name="UMENG_APPKEY"
android:value="5f9bb48945b2b751a91fb2d5" />
android:value="5f9181e94d7bf81a2ea919c2" />
<meta-data
android:name="UMENG_CHANNEL"
android:value="${UMENG_CHANNEL_VALUE}" /> <!-- 微信配置 -->
......
......@@ -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)
}
......
......@@ -4,7 +4,7 @@ import android.app.Dialog
import android.text.Html
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import com.ym.bbnc.R
import com.ym.xync.R
import com.ym.game.adapter.ClockInWithdrawAdpater
import com.ym.game.contract.ClockInWithdrawContract
import com.ym.game.presenter.ClockInWithdrawPresenter
......
......@@ -14,7 +14,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.airbnb.lottie.LottieAnimationView;
import com.ym.bbnc.R;
import com.ym.xync.R;
import com.ym.game.monopoly.LollipopFixedWebView;
import com.ym.library.activity.JavaInterface;
import com.ym.library.net.MyBaseActivity;
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.game.GameActivity
import com.ym.game.utils.CenterDialog
import com.ym.library.MyConstant
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.game.adapter.WelfareDiamondAdapter
import com.ym.game.adapter.WelfareTaskAdpater
import com.ym.game.contract.WelfareContract
......
......@@ -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.bbnc.R
import com.ym.xync.R
import kotlinx.android.synthetic.main.activity_wx_login.*
import org.jetbrains.anko.act
......
......@@ -15,7 +15,7 @@ import android.widget.ImageView
import android.widget.ProgressBar
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.xync.R
import com.ym.library.module.WithDrawEntity2
import com.ym.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.utils.Utils
......
......@@ -5,7 +5,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.xync.R
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.PuzzleEntity
import com.ym.modulecommon.AppliContext
......
......@@ -5,7 +5,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.xync.R
import com.ym.library.module.PuzzleEntity
import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.base.BaseRecyclerAdapter
......
......@@ -6,7 +6,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.xync.R
import com.ym.modulecommon.AppliContext
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.WdHistoryEntity
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.module.SinginEntity
/**
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskCompleteEntity
import com.ym.library.module.WateringTaskEntity
......
......@@ -7,7 +7,7 @@ import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.xync.R
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.FlyBoxEntity
import com.ym.modulecommon.AppliContext
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskCompleteEntity
import com.ym.library.module.WateringTaskEntity
......
......@@ -8,7 +8,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.xync.R
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.DiamondEntity
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.module.NewsEntity
/**
......
......@@ -69,10 +69,10 @@ class BaseApplication : BaseApplication() {
LogUtils.getConfig().logSwitch = isDebug
AppLibraryConfig.NetConfig.isDebug = isDebug
// Constant.appLs = "afcbef40e31631d3"//appls
AdManager.init(this, "7025878009b4cca3")
AdManager.init(this, "a03d5320d905cf3b")
UMConfigure.setLogEnabled(false)
UMConfigure.init(this, "5fe446a944bb94418a636569", "", UMConfigure.DEVICE_TYPE_PHONE, "")
UMConfigure.init(this, "5f9181e94d7bf81a2ea919c2", "", UMConfigure.DEVICE_TYPE_PHONE, "")
PlatformConfig.setWeixin(MyConstant.WX_APPID, MyConstant.WX_APPKEY)
......@@ -87,7 +87,7 @@ class BaseApplication : BaseApplication() {
// 设置是否为上报进程
strategy.isUploadProcess = processName == null || processName == packageName
//Bugly初始化
CrashReport.initCrashReport(this, "3bac59d22f", isDebug, strategy)
CrashReport.initCrashReport(this, "6432d43d7e", isDebug, strategy)
//========== Bugly ==========
//小满
......
......@@ -18,7 +18,7 @@ import android.widget.RemoteViews;
import androidx.core.app.NotificationCompat;
import com.ym.bbnc.R;
import com.ym.xync.R;
import com.ym.game.GameActivity;
import com.ym.library.utils.LogUtils;
import java.lang.reflect.Method;
......
......@@ -11,7 +11,7 @@ import android.text.style.ForegroundColorSpan
import android.view.Gravity
import android.view.View
import android.widget.TextView
import com.ym.bbnc.R
import com.ym.xync.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(
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.utils.EventUtils
object CashExchangeDialog : CashExchangeContract.View {
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.game.adapter.RecordAdapter
import com.ym.game.contract.RecordContract
import com.ym.game.presenter.RecordPresenter
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.MyConstant
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.TurntableEntity
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.game.contract.PuzzleContract
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.presenter.PuzzlePresenter
......
......@@ -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.bbnc.R
import com.ym.xync.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()
......
......@@ -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.bbnc.R
import com.ym.xync.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()
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.StatusEntity
import com.ym.library.module.TurntableEntity
......
......@@ -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.bbnc.R
import com.ym.xync.R
import com.ym.game.adapter.RecordAdapter
import com.ym.game.adapter.WareHouseAdapter
import com.ym.game.contract.WareHouseContract
......
package com.ym.bbnc.wxapi;
package com.ym.xync.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity;
......
......@@ -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" />
......
<resources>
<string name="app_name">芭芭农场</string>
<string name="app_name">幸运农场</string>
</resources>
PACKAGE_NAME=com.ym.bbnc
VERSION_CODE=11
PACKAGE_NAME=com.ym.xync
VERSION_CODE=12
VERSION_NAME=1.1.0
\ No newline at end of file
......@@ -85,7 +85,7 @@
<data
android:host="web"
android:scheme="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
......@@ -100,7 +100,7 @@
<data
android:host="ad_web"
android:scheme="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
......@@ -115,7 +115,7 @@
<data
android:host="new_web"
android:scheme="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
......@@ -130,7 +130,7 @@
<data
android:host="xiaoman"
android:scheme="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
......
......@@ -17,15 +17,15 @@ import java.util.List;
public class MyConstant {
public static int REQUEST_CODE_ASK_PERMISSIONS = 0x0101;
public static final String scheme = "bbnc";
public static final String scheme = "xync";
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 = "wx807bc179331f37a6";
public static String WX_APPID = "wx29c1884b0a06cdd5";
// public static String WX_APPID = "wxcd4157d1e36f5cd8";
public static String WX_APPKEY = "7a9ab9dbc24a03504030762b91e833b8";
public static String WX_APPKEY = "a45ff15ec4d387fbd37740238689bd11";
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.bbnc";
public static String mPacketName = "com.ym.xync";
public static String vendor = Build.MANUFACTURER;
public static String svn = Build.VERSION.SDK_INT + "";
public static String androidId = "";
......
......@@ -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/babanongchang/privacy.html";//TODO 隐私协议
public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/nongchang/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/babanongchang/user.html";//TODO 用户协议
public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/nongchang/user.html";//TODO 用户协议
public static String WEB_URL_SHARE_LAND; //TODO
......
......@@ -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)
......
......@@ -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>
......
......@@ -15,7 +15,7 @@
<data
android:host="setting"
android:scheme="bbnc" />
android:scheme="xync" />
</intent-filter>
</activity>
</application>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment