Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复光能模块若干bug

Browse Source
This commit is contained in:
lyr
2020-12-23 10:11:25 +08:00
parent 29bc098dcf
commit fdbb16b45f
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/gh/common/util/DirectUtils.kt
View File

@ -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&timestamp=%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&timestamp=%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)
}
}

6
app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt
View File

@ -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<List<EnergyTaskCompleteEntity>>() {

4
app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
View File

@ -2794,8 +2794,8 @@ public interface ApiService {
/**
* 上报光能任务
*/
@POST("devices/{device_id}/download_simulator_games")
Single<List<EnergyTaskCompleteEntity>> postEnergyTask(@Body RequestBody body);
@POST("users/{user_id}/tasks:check")
Single<List<EnergyTaskCompleteEntity>> postEnergyTask(@Path("user_id") String userId, @Body RequestBody body);
/**
* 获取商品分类列表

BIN
app/src/main/res/drawable-xxhdpi/ic_gncenter_verify.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_gncenter_verify.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

6
app/src/main/res/layout/daily_task_item.xml
View File

@ -69,7 +69,7 @@
tools:text="+5光能" />
<TextView
visibleGone="@{entity.status != `finshed`}"
visibleGone="@{!entity.status.equals(`finished`)}"
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -86,13 +86,13 @@
tools:text="0/10" />
<ImageView
visibleGone="@{entity.status == `finshed`}"
visibleGone="@{entity.status.equals(`finished`)}"
android:id="@+id/completeIv"
android:visibility="gone"
android:layout_width="38dp"
android:layout_height="32dp"
android:layout_marginRight="12dp"
android:src="@drawable/ic_gncenter_verify"
android:src="@drawable/ic_gncenter_done"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/taskIcon"
app:layout_constraintBottom_toBottomOf="@+id/taskIcon" />