Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckyFarm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
LuckyFarm
Commits
de0fc700
Commit
de0fc700
authored
Dec 15, 2020
by
xw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[提交人]:王雪伟
[提交简述] :多多菜园1.0.9 [实现方案] :修改正式环境 删除log
parent
b28c60f3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
36 deletions
+7
-36
GameActivity.kt
app/src/main/java/com/ym/game/GameActivity.kt
+0
-25
BaseApplication.kt
app/src/main/java/com/ym/game/application/BaseApplication.kt
+7
-7
TurntableDialog.kt
app/src/main/java/com/ym/game/view/TurntableDialog.kt
+0
-2
JavaInterface.kt
...ry/src/main/java/com/ym/library/activity/JavaInterface.kt
+0
-1
UpdateVersionPresenter.kt
...c/main/java/com/ym/library/down/UpdateVersionPresenter.kt
+0
-1
No files found.
app/src/main/java/com/ym/game/GameActivity.kt
View file @
de0fc700
This diff is collapsed.
Click to expand it.
app/src/main/java/com/ym/game/application/BaseApplication.kt
View file @
de0fc700
...
@@ -52,19 +52,19 @@ class BaseApplication : BaseApplication() {
...
@@ -52,19 +52,19 @@ class BaseApplication : BaseApplication() {
private
var
backToFrontTime
:
Long
=
0
private
var
backToFrontTime
:
Long
=
0
override
fun
onCreate
()
{
override
fun
onCreate
()
{
super
.
onCreate
()
super
.
onCreate
()
NetConfig
.
setBase_Url
(
NetConfig
.
Environment
.
DEV
)
// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
NetConfig
.
setBase_Url
(
NetConfig
.
Environment
.
PRODUCT
)
// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
//
NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
NetConfig
.
BASE_FEED_URL
=
"https://fsapi.ihuomao.com/"
//
NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
NetConfig
.
BASE_AD_URL
=
"https://bs.ihuomao.com/"
//
NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
NetConfig
.
URL_REPORT_BASE
=
"http://report.ihuomao.com/"
//TODO 上线去掉测试地址
//TODO 上线去掉测试地址
NetConfig
.
BASE_FEED_URL
=
"http://feedapitest2.zhangxinhulian.com/"
//
NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
// Constant.appLs = "afcbef40e31631d3"//appls
// Constant.appLs = "afcbef40e31631d3"//appls
AdManager
.
init
(
this
,
"afcbef40e31631d3"
)
AdManager
.
init
(
this
,
"afcbef40e31631d3"
)
LogUtils
.
getConfig
().
logSwitch
=
tru
e
LogUtils
.
getConfig
().
logSwitch
=
fals
e
UMConfigure
.
setLogEnabled
(
tru
e
)
UMConfigure
.
setLogEnabled
(
fals
e
)
UMConfigure
.
init
(
this
,
"5f9bb48945b2b751a91fb2d5"
,
""
,
UMConfigure
.
DEVICE_TYPE_PHONE
,
""
)
UMConfigure
.
init
(
this
,
"5f9bb48945b2b751a91fb2d5"
,
""
,
UMConfigure
.
DEVICE_TYPE_PHONE
,
""
)
PlatformConfig
.
setWeixin
(
MyConstant
.
WX_APPID
,
MyConstant
.
WX_APPKEY
)
PlatformConfig
.
setWeixin
(
MyConstant
.
WX_APPID
,
MyConstant
.
WX_APPKEY
)
...
...
app/src/main/java/com/ym/game/view/TurntableDialog.kt
View file @
de0fc700
...
@@ -321,12 +321,10 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
...
@@ -321,12 +321,10 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
.
compose
(
RxSchedulers
.
observableIO2Main
())
.
compose
(
RxSchedulers
.
observableIO2Main
())
.
subscribe
(
object
:
BaseObserver
<
StatusEntity
>()
{
.
subscribe
(
object
:
BaseObserver
<
StatusEntity
>()
{
override
fun
onSuccess
(
result
:
StatusEntity
?)
{
override
fun
onSuccess
(
result
:
StatusEntity
?)
{
Log
.
d
(
"wxw"
,
"看视频上报 Success"
)
mPresenter
?.
getTurntableLotteryResult
()
mPresenter
?.
getTurntableLotteryResult
()
}
}
override
fun
onFailure
(
e
:
Throwable
?,
code
:
String
?,
errorMsg
:
String
?)
{
override
fun
onFailure
(
e
:
Throwable
?,
code
:
String
?,
errorMsg
:
String
?)
{
Log
.
d
(
"wxw"
,
"看视频上报 error"
)
}
}
})
})
}
}
...
...
library/src/main/java/com/ym/library/activity/JavaInterface.kt
View file @
de0fc700
...
@@ -513,7 +513,6 @@ abstract class JavaInterface {
...
@@ -513,7 +513,6 @@ abstract class JavaInterface {
@JavascriptInterface
@JavascriptInterface
fun
apiClientPost
(
url
:
String
,
tag
:
String
)
{
fun
apiClientPost
(
url
:
String
,
tag
:
String
)
{
Log
.
d
(
"wxw"
,
"url$url"
);
ApiClient
.
userApi
.
webApiPost
(
url
).
compose
(
RxSchedulers
.
observableIO2Main
())
ApiClient
.
userApi
.
webApiPost
(
url
).
compose
(
RxSchedulers
.
observableIO2Main
())
.
subscribe
(
object
:
.
subscribe
(
object
:
Observer
<
Response
<
ResponseBody
>>
{
Observer
<
Response
<
ResponseBody
>>
{
...
...
library/src/main/java/com/ym/library/down/UpdateVersionPresenter.kt
View file @
de0fc700
...
@@ -97,7 +97,6 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter {
...
@@ -97,7 +97,6 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter {
.
subscribe
(
object
:
BaseObserver
<
VersionEntity
?>()
{
.
subscribe
(
object
:
BaseObserver
<
VersionEntity
?>()
{
override
fun
onSuccess
(
dataBean
:
VersionEntity
?)
{
override
fun
onSuccess
(
dataBean
:
VersionEntity
?)
{
if
(
dataBean
!=
null
)
{
if
(
dataBean
!=
null
)
{
Log
.
d
(
"wxw"
,
"version"
+
Utils
.
obj2Str
(
dataBean
))
if
(
dataBean
.
vc
>
PhoneUtils
.
getAppVersionCode
(
AppliContext
.
get
())
&&
""
!=
dataBean
.
dl_url
)
{
if
(
dataBean
.
vc
>
PhoneUtils
.
getAppVersionCode
(
AppliContext
.
get
())
&&
""
!=
dataBean
.
dl_url
)
{
mUrl
=
dataBean
.
dl_url
mUrl
=
dataBean
.
dl_url
if
(
dataBean
.
type
==
1
)
{
if
(
dataBean
.
type
==
1
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment