diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt index 356e7d53b3..e80fedbfc4 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -1128,7 +1128,7 @@ object DirectUtils { // 这里换个线程操作是为了做一点延时 AppExecutor.ioExecutor.execute { - EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_ASK)) + EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_VIDEO)) } } else { jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_VIDEO) }) @@ -1148,7 +1148,7 @@ object DirectUtils { // 这里换个线程操作是为了做一点延时 AppExecutor.ioExecutor.execute { - EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_ASK)) + EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_PERSONAL)) } } else { jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_PERSONAL) }) @@ -1179,7 +1179,7 @@ object DirectUtils { } url = String.format(Locale.CHINA, "%s?shopid=%s×tamp=%d", url, commodityId, (Date().time / 1000 / 1000.toFloat()).roundToInt()) - directToFullScreenWebPage(context, url, false) + directToFullScreenWebPage(context, url, true) } /** @@ -1194,7 +1194,7 @@ object DirectUtils { } url = String.format(Locale.CHINA, "%s?position=%s×tamp=%d", url, position, (Date().time / 1000 / 1000.toFloat()).roundToInt()) - directToFullScreenWebPage(context, url, false) + directToFullScreenWebPage(context, url, true) } /** @@ -1207,6 +1207,6 @@ object DirectUtils { } else { Constants.ORDER_CENTER_ADDRESS } - directToFullScreenWebPage(context, url, false) + directToFullScreenWebPage(context, url, true) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt index 9fc52b0619..ecae2e2908 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -8,13 +8,11 @@ import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView -import com.gh.base.CurrentActivityHolder import com.gh.gamecenter.R import com.gh.gamecenter.entity.EnergyTaskCompleteEntity import com.gh.gamecenter.guangneng.GuangnengCenterActivity -import com.gh.gamecenter.guangneng.GuangnengHouseActivity +import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.EmptyResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.AppManager @@ -73,7 +71,7 @@ object EnergyTaskHelper { val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) RetrofitManager.getInstance(HaloApp.getInstance().application) - .api.postEnergyTask(body) + .api.postEnergyTask(UserManager.getInstance().userId, body) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) .subscribe(object : BiResponse>() { diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 78389ff90b..4400812f93 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -2794,8 +2794,8 @@ public interface ApiService { /** * 上报光能任务 */ - @POST("devices/{device_id}/download_simulator_games") - Single> postEnergyTask(@Body RequestBody body); + @POST("users/{user_id}/tasks:check") + Single> postEnergyTask(@Path("user_id") String userId, @Body RequestBody body); /** * 获取商品分类列表 diff --git a/app/src/main/res/drawable-xxhdpi/ic_gncenter_verify.png b/app/src/main/res/drawable-xxhdpi/ic_gncenter_verify.png deleted file mode 100755 index c08eebb488..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_gncenter_verify.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gncenter_verify.png b/app/src/main/res/drawable-xxxhdpi/ic_gncenter_verify.png deleted file mode 100755 index 670f42ce44..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_gncenter_verify.png and /dev/null differ diff --git a/app/src/main/res/layout/daily_task_item.xml b/app/src/main/res/layout/daily_task_item.xml index 7948a27bce..73221a38ab 100644 --- a/app/src/main/res/layout/daily_task_item.xml +++ b/app/src/main/res/layout/daily_task_item.xml @@ -69,7 +69,7 @@ tools:text="+5光能" />