Merge remote-tracking branch 'origin/develop_ddcy_1.0.4' into develop_ddcy_1.0.4

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/ym/game/GameActivity.kt

@@ -738,12 +738,12 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                 object : IAdVideoListener {
                     override fun onAdClose() {
                         videoSeedClick = true
-                        callUnity("Form_land", "onVideoSeedReceiveSuccess", "" + (id - 1))
                         GameApiClient.gameApi.getVideoSeedReceive(id)
                             .compose(RxSchedulers.observableIO2Main())
                             .subscribe(object : BaseObserver<StatusEntity>() {
                                 override fun onSuccess(result: StatusEntity?) {
                                     Log.d("wxw", "看视频领取种子同步" + Utils.obj2Str(result))
+                                    callUnity("Form_land", "onVideoSeedReceiveSuccess", "" + (id - 1))
                                 }
 
                                 override fun onFailure(

app/src/main/java/com/ym/game/application/BaseApplication.kt

@@ -52,13 +52,13 @@ class BaseApplication : MultiDexApplication() {
     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
         NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
         NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
         NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
 
-
-       // NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
+        //TODO 上线去掉测试地址
+        NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
 //        Constant.appLs = "afcbef40e31631d3"//appls
         AdManager.init(this,"afcbef40e31631d3")
         LogUtils.getConfig().logSwitch = true

app/version.properties

 PACKAGE_NAME=com.ym.ddcy
-VERSION_CODE=4
-VERSION_NAME=1.0.3
+VERSION_CODE=5
+VERSION_NAME=1.0.4
\ No newline at end of file