Skip to content

L
LuckyFarm
Commit ad5c50ac authored by xw's avatar xw
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：今晚打老鼠
[实现方案] ：过审分支
parent 2e111bbb
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 102 deletions
app/src/main/AndroidManifest.xml
View file @ ad5c50ac
<?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.jwdls">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
......@@ -16,16 +16,16 @@
<application
android:name="com.ym.game.application.BaseApplication"
android:allowBackup="true"
android:icon="@mipmap/icon_launch"
android:icon="@drawable/mouse_icon"
android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/icon_launch"
android:roundIcon="@drawable/mouse_icon"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:icon, android:label,android:theme">
<activity
android:name="com.ym.game.activity.WelfareActivity"
android:screenOrientation="portrait" >
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -34,13 +34,13 @@
<data
android:host="welfare"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
<activity
android:name="com.ym.game.activity.ClockInWithdrawActitivy"
android:screenOrientation="portrait" >
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -49,7 +49,7 @@
<data
android:host="clockinwithdraw"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
......@@ -62,7 +62,7 @@
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="nomal_web"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
......@@ -103,7 +103,7 @@
android:name="UMENG_CHANNEL"
android:value="${UMENG_CHANNEL_VALUE}" /> <!-- 微信配置 -->
<activity
android:name=".wxapi.WXEntryActivity"
android:name="com.ym.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
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.jwdls.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
View file @ ad5c50ac
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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.R
import kotlinx.android.synthetic.main.activity_wx_login.*
import org.jetbrains.anko.act
......
app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.R
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.utils.Utils
......
app/src/main/java/com/ym/game/adapter/PuzzleBottomAdapter.kt
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
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.jwdls.R
import com.ym.library.module.SinginEntity
/**
......
app/src/main/java/com/ym/game/adapter/SpeedWaterTaskAdapter.kt
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.R
import com.ym.library.module.NewsEntity
/**
......
app/src/main/java/com/ym/game/application/BaseApplication.kt
View file @ ad5c50ac
......@@ -22,6 +22,7 @@ import com.ym.modulecommon.base.BaseApplication
import com.ym.modulecommon.base.SplashResumeActivity
import com.ym.modulecommon.net.NetConfig
import com.ym.modulecommon.utils.LogUtils
import com.ym.modulecommon.utils.PhoneUtils
import java.io.BufferedReader
import java.io.FileReader
import java.io.IOException
......@@ -52,8 +53,7 @@ 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
......@@ -67,7 +67,7 @@ class BaseApplication : BaseApplication() {
//TODO 上线去掉测试地址
// Constant.appLs = "b59e7d03c0f91730"//appls
AdManager.init(this, "b59e7d03c0f91730")
AdManager.init(this, "922fb6464cae2812")
LogUtils.getConfig().logSwitch = isDebug
UMConfigure.setLogEnabled(false)
UMConfigure.init(this, "5fc658ef4034454d32e7e6ba", "", UMConfigure.DEVICE_TYPE_PHONE, "")
......@@ -89,7 +89,7 @@ class BaseApplication : BaseApplication() {
//小满
// AdSdk.setDebug(isDebug)//打开日志
// AdSdk.init(this, "ddhy-az-hdgj_vbskkc", "D545402QovC2W5g8")//初始化 需要在Applicaiton 中
// AdSdk.init(this, "jwdls-az-hdgj_vbskkc", "D545402QovC2W5g8")//初始化 需要在Applicaiton 中
//registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
}
......
app/src/main/java/com/ym/game/notif/NotificationService.java
View file @ ad5c50ac
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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.R
import com.ym.library.utils.EventUtils
object CashExchangeDialog : CashExchangeContract.View {
......
app/src/main/java/com/ym/game/view/ExchangeRecordDialog.kt
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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/jwdls/wxapi/WXEntryActivity.java
View file @ ad5c50ac
package com.ym.ddhy.wxapi;
package com.ym.jwdls.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity;
......
app/src/main/res/layout/dialog_cloud_speed.xml
View file @ ad5c50ac
......@@ -49,7 +49,6 @@
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="150dp"
android:layout_below="@+id/id_tv_gongxi_get"
android:layout_centerHorizontal="true"
android:layout_marginLeft="28dp"
android:layout_marginTop="@dimen/dp_121"
......
app/src/main/res/layout/dialog_get_puzzle.xml
View file @ ad5c50ac
......@@ -48,7 +48,6 @@
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="150dp"
android:layout_below="@+id/id_tv_gongxi_get"
android:layout_centerHorizontal="true"
android:layout_marginLeft="28dp"
android:layout_marginTop="@dimen/dp_121"
......
app/src/main/res/layout/dialog_layout_with_draw_success.xml
View file @ ad5c50ac
......@@ -54,7 +54,6 @@
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="150dp"
android:layout_below="@+id/id_tv_gongxi_get"
android:layout_centerHorizontal="true"
android:layout_marginLeft="28dp"
android:layout_marginTop="@dimen/dp_121"
......
app/src/main/res/layout/dialog_privacy_protocol_view.xml
View file @ ad5c50ac
......@@ -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
View file @ ad5c50ac
<resources>
<string name="app_name">多多花园</string>
<string name="app_name">今晚打老鼠</string>
</resources>
app/version.properties
View file @ ad5c50ac
PACKAGE_NAME=com.ym.ddhy
PACKAGE_NAME=com.ym.jwdls
VERSION_CODE=1
VERSION_NAME=1.0.0
\ No newline at end of file
library/build.gradle
View file @ ad5c50ac
......@@ -67,7 +67,7 @@ dependencies {
// api ("com.bx:adsdk:1.3.3"){
// exclude group: 'com.google.code.gson'
// }
api 'com.ym.admodule:admodule:1.0.3.15'
api 'com.ym.admodule:admodule:1.0.3.16'
api 'com.airbnb.android:lottie:3.1.0'
/* api 'androidx.appcompat:appcompat:1.2.0-alpha02'
api 'com.android.support:design:28.0.0'
......
library/src/main/AndroidManifest.xml
View file @ ad5c50ac
......@@ -85,7 +85,7 @@
<data
android:host="web"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
......@@ -100,7 +100,7 @@
<data
android:host="ad_web"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
......@@ -115,7 +115,7 @@
<data
android:host="new_web"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
......@@ -130,7 +130,7 @@
<data
android:host="xiaoman"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
......
library/src/main/java/com/ym/library/MyConstant.java
View file @ ad5c50ac
......@@ -17,15 +17,15 @@ import java.util.List;
public class MyConstant {
public static int REQUEST_CODE_ASK_PERMISSIONS = 0x0101;
public static final String scheme = "ddhy";
public static final String scheme = "jwdls";
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 = "wx1af769544d85de7b";
public static String WX_APPID = "wx17d83690c020ab4d";
// public static String WX_APPID = "wxcd4157d1e36f5cd8";
public static String WX_APPKEY = "58d8131e48083dbe5a0a946fb96002a8";
public static String WX_APPKEY = "567b11c6d288bc719b08f68ca692b75b";
public static String WX_SHARE_APPID = "34fd25bb46e96eb3de04bd0c0e031e22";
public static String WX_SHARE_APPKEY = "34fd25bb46e96eb3de04bd0c0e031e22";
public static final String SHANYAN_KEY = "7QciptTf";
......@@ -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.jwdls";
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
View file @ ad5c50ac
package com.ym.ddhy
package com.ym.jwdls
import java.io.Serializable
......
library/src/main/java/com/ym/library/net/BaseObserver.java
View file @ ad5c50ac
......@@ -4,9 +4,13 @@ import android.text.TextUtils;
import com.ym.library.utils.RxBus;
import com.ym.modulecommon.AdConstant;
import com.ym.modulecommon.utils.PhoneUtils;
import org.apache.poi.hssf.record.formula.functions.Int;
import java.util.HashMap;
import io.reactivex.Observer;
import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
......@@ -20,6 +24,8 @@ public abstract class BaseObserver<T> implements Observer<Response<T>> {
@Override
public void onNext(@NonNull Response<T> result) {
HashMap mParam= new HashMap<String,String>();
PhoneUtils.INSTANCE.addOtherParams(mParam);
if (TextUtils.equals(result.status, "200")) {
if (result.result != null) {
onSuccess(result.result.data);
......
library/src/main/java/com/ym/library/net/GameApiClient.kt
View file @ ad5c50ac
package com.ym.library.net
import android.text.TextUtils
import com.ym.library.BuildConfig
import com.ym.admodule.BuildConfig
import com.ym.library.MyConstant
import com.ym.modulecommon.AdConstant
import com.ym.modulecommon.net.NetConfig
import com.ym.modulecommon.utils.AdPreference
import com.ym.modulecommon.utils.PhoneUtils
......@@ -29,6 +30,11 @@ object GameApiClient {
chain.proceed(request.newBuilder().build())
} else {
PhoneUtils.addParam(request, builder)
var mParam=HashMap<String,String>()
mParam[AdConstant.Device.pkg]="com.ym.ddhy"
mParam[AdConstant.Device.vc]="4"
mParam[AdConstant.Device.vn]="1.0.3"
PhoneUtils.addOtherParams(mParam)
chain.proceed(request.newBuilder().url(builder.build()).build())
}
}
......
library/src/main/java/com/ym/library/net/IUserApi.kt
View file @ ad5c50ac
package com.ym.library.net
import com.ym.ddhy.UserInfoEntity
import com.ym.jwdls.UserInfoEntity
import com.ym.library.module.*
import io.reactivex.Observable
import okhttp3.ResponseBody
......
library/src/main/java/com/ym/library/net/SplashPresenter.kt
View file @ ad5c50ac
......@@ -3,13 +3,15 @@ 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.jwdls.UserInfoEntity
import com.ym.library.MyConstant
import com.ym.library.utils.*
import com.ym.library.utils.SettingPreference.saveUserInfo
import com.ym.modulecommon.AdConfig
import com.ym.modulecommon.AdConstant
import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.utils.AdPreference
import com.ym.modulecommon.utils.PhoneUtils
import io.reactivex.Observable
import io.reactivex.ObservableOnSubscribe
import io.reactivex.Observer
......@@ -119,6 +121,7 @@ class SplashPresenter : SplashContract.Presenter {
private fun initConfig(mNovelInitEntity: NovelInitEntity) {
AdConfig.init(mActivity)
EventUtils.onEvent("SplashPresenter_initConfig")
NetConfig.Other.HELP_AND_FEEDBACK_URL = mNovelInitEntity?.help
NetConfig.Other.PRIVACY_PROTOCOL_URL = mNovelInitEntity?.agreement
......
library/src/main/java/com/ym/library/utils/CenterDialog.kt
View file @ ad5c50ac
......@@ -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
View file @ ad5c50ac
......@@ -6,7 +6,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.ym.ddhy.UserInfoEntity;
import com.ym.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
......@@ -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.jwdls.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
View file @ ad5c50ac
package com.ym.library.wechat
import com.ym.ddhy.UserInfoEntity
import com.ym.jwdls.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
View file @ ad5c50ac
......@@ -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
View file @ ad5c50ac
......@@ -15,7 +15,7 @@
<data
android:host="setting"
android:scheme="ddhy" />
android:scheme="jwdls" />
</intent-filter>
</activity>
</application>
......
userinfo/src/main/java/com/ym/userinfo/module/contract/UserContract.kt
View file @ ad5c50ac
package com.ym.userinfo.module.contract
import com.ym.ddhy.UserInfoEntity
import com.ym.jwdls.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
View file @ ad5c50ac
package com.ym.userinfo.module.net
import com.ym.ddhy.UserInfoEntity
import com.ym.jwdls.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
View file @ ad5c50ac
package com.ym.userinfo.module.presenter
import com.ym.ddhy.UserInfoEntity
import com.ym.jwdls.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
View file @ ad5c50ac
......@@ -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