Commit 49c8c9fb authored by maxiaoliang's avatar maxiaoliang

多多菜园1.0.5最新代码

parent a1be66b5
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
...@@ -64,8 +64,6 @@ class BaseApplication : MultiDexApplication() { ...@@ -64,8 +64,6 @@ class BaseApplication : MultiDexApplication() {
// Constant.appLs = "afcbef40e31631d3"//appls // Constant.appLs = "afcbef40e31631d3"//appls
AdManager.init(this,"afcbef40e31631d3") AdManager.init(this,"afcbef40e31631d3")
LogUtils.getConfig().logSwitch = false LogUtils.getConfig().logSwitch = false
LogUtils.e("MXL","true")
UMConfigure.setLogEnabled(true) UMConfigure.setLogEnabled(true)
UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "") UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "")
PlatformConfig.setWeixin(Constant.WX_APPID, Constant.WX_APPKEY) PlatformConfig.setWeixin(Constant.WX_APPID, Constant.WX_APPKEY)
......
PACKAGE_NAME=com.ym.ddcy PACKAGE_NAME=com.ym.ddcy
VERSION_CODE=5 VERSION_CODE=6
VERSION_NAME=1.0.4 VERSION_NAME=1.0.5
\ No newline at end of file \ No newline at end of file
...@@ -29,6 +29,15 @@ public class HomeInfoEntity { ...@@ -29,6 +29,15 @@ public class HomeInfoEntity {
private int maxClockNum;//所需打卡数量 private int maxClockNum;//所需打卡数量
private int subAcceleratorsVideoNum;//看加速剂不足视频剩余次数 private int subAcceleratorsVideoNum;//看加速剂不足视频剩余次数
private int subSeedVideoNum;//看种子不足视频剩余次数 private int subSeedVideoNum;//看种子不足视频剩余次数
private int acceleratorsVideoNum;//看视频给加速剂的个数
public int getAcceleratorsVideoNum() {
return acceleratorsVideoNum;
}
public void setAcceleratorsVideoNum(int acceleratorsVideoNum) {
this.acceleratorsVideoNum = acceleratorsVideoNum;
}
public int getSubAcceleratorsVideoNum() { public int getSubAcceleratorsVideoNum() {
return subAcceleratorsVideoNum; return subAcceleratorsVideoNum;
......
package com.ym.library.net package com.ym.library.net
import android.text.TextUtils import android.text.TextUtils
import com.ym.library.BuildConfig
import com.ym.library.Constant import com.ym.library.Constant
import com.ym.modulecommon.net.NetConfig import com.ym.modulecommon.net.NetConfig
import com.ym.modulecommon.utils.PhoneUtils import com.ym.modulecommon.utils.PhoneUtils
...@@ -48,7 +49,7 @@ object ApiClient { ...@@ -48,7 +49,7 @@ object ApiClient {
.connectTimeout(10000, TimeUnit.MILLISECONDS) .connectTimeout(10000, TimeUnit.MILLISECONDS)
.readTimeout(10000, TimeUnit.MILLISECONDS) .readTimeout(10000, TimeUnit.MILLISECONDS)
.addInterceptor(logInterceptor.apply { .addInterceptor(logInterceptor.apply {
level = HttpLoggingInterceptor.Level.NONE level = if(BuildConfig.DEBUG)HttpLoggingInterceptor.Level.BODY else{HttpLoggingInterceptor.Level.NONE}
}) })
// .retryOnConnectionFailure(false) // .retryOnConnectionFailure(false)
.hostnameVerifier { hostname, session -> .hostnameVerifier { hostname, session ->
......
package com.ym.library.net package com.ym.library.net
import android.text.TextUtils import android.text.TextUtils
import com.ym.library.BuildConfig
import com.ym.library.Constant import com.ym.library.Constant
import com.ym.modulecommon.net.NetConfig import com.ym.modulecommon.net.NetConfig
import com.ym.modulecommon.utils.PhoneUtils import com.ym.modulecommon.utils.PhoneUtils
...@@ -50,7 +51,7 @@ object GameApiClient { ...@@ -50,7 +51,7 @@ object GameApiClient {
.connectTimeout(10000, TimeUnit.MILLISECONDS) .connectTimeout(10000, TimeUnit.MILLISECONDS)
.readTimeout(10000, TimeUnit.MILLISECONDS) .readTimeout(10000, TimeUnit.MILLISECONDS)
.addInterceptor(logInterceptor.apply { .addInterceptor(logInterceptor.apply {
level = HttpLoggingInterceptor.Level.NONE level = if(BuildConfig.DEBUG)HttpLoggingInterceptor.Level.BODY else{HttpLoggingInterceptor.Level.NONE}
}) })
// .retryOnConnectionFailure(false) // .retryOnConnectionFailure(false)
.hostnameVerifier { hostname, session -> .hostnameVerifier { hostname, session ->
......
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