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

光环助手V4.6.0-新增[光能中心-任务管理] 1230测试 https://git.ghzs.com/pm/halo-app-issues/-/issues/1063#note_83291

Browse Source
This commit is contained in:
lyr
2021-01-04 11:26:16 +08:00
parent 80c56def08
commit f53710fdf5
11 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,27 @@ object EnergyTaskHelper {
postEnergyTask(action, null, null, url)
}
@JvmStatic
fun postEnergyTaskForShare(type: String, id: String, url: String) {
when (type) {
"游戏详情" -> postEnergyTask("share_game_detail", id)
"视频" -> postEnergyTask("share_video", id)
"资讯文章" -> postEnergyTask("share_article", id)
"问题详情" -> postEnergyTask("share_question", id)
"回答详情" -> postEnergyTask("share_answer", id)
"文章详情" -> postEnergyTask("share_community_article", id)
"工具箱" -> postEnergyTask("share_toolkit", id)
"web链接" -> postEnergyTaskForWeb("share_web", url)
}
}
@SuppressLint("CheckResult")
@JvmStatic
fun postEnergyTask(action: String, id: String? = null, packageName: String? = null, url: String? = null) {

29
app/src/main/java/com/gh/common/util/ShareUtils.java
View File

@ -124,6 +124,7 @@ public class ShareUtils {
EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
LogUtils.uploadShareResult(shareType, ShareUtils.shareEntrance.getName(), "success",
ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl());
}
@Override
@ -679,34 +680,6 @@ public class ShareUtils {
listener.onItemClick(holder.getAdapterPosition());
}
switch (mShareEntrance) {
case game:
case plugin:
EnergyTaskHelper.postEnergyTask("share_game_detail", resourceId);
break;
case video:
EnergyTaskHelper.postEnergyTask("share_video", resourceId);
break;
case news:
EnergyTaskHelper.postEnergyTask("share_article", resourceId);
break;
case askNormal:
EnergyTaskHelper.postEnergyTask("share_question", resourceId);
break;
case answerNormal:
EnergyTaskHelper.postEnergyTask("share_answer", resourceId);
break;
case communityArticle:
EnergyTaskHelper.postEnergyTask("share_community_article", resourceId);
break;
case tools:
EnergyTaskHelper.postEnergyTask("share_toolkit", resourceId);
break;
case web:
EnergyTaskHelper.postEnergyTaskForWeb("share_web", shareUrl);
break;
}
switch (holder.getPosition()) {
case 0:
shareType = "wechat_friend";

2
app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java
View File

@ -10,6 +10,7 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import com.gh.common.util.BiCallback;
import com.gh.common.util.EnergyTaskHelper;
import com.gh.common.util.ImageUtils;
import com.gh.common.util.LogUtils;
import com.gh.common.util.ShareUtils;
@ -154,6 +155,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback {
LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success",
ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl());
finish();
}

4
app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt
View File

@ -64,10 +64,10 @@ class CommodityAdapter(context: Context, val entrance: String): ListAdapter<Comm
executePendingBindings()
if (commodity.tag != null && commodity.tag.id.isNotBlank()) {
tagContainer.visibility = View.VISIBLE
tagTv.visibility = View.VISIBLE
tagTv.text = commodity.tag.name
} else {
tagContainer.visibility = View.GONE
tagTv.visibility = View.GONE
}
originEnergy.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG

4
app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt
View File

@ -12,6 +12,10 @@ import io.reactivex.schedulers.Schedulers
class TaskViewModel(application: Application)
: ListViewModel<TaskEntity, TaskItemData>(application) {
init {
setOverLimitSize(1000) // 该页面不需要分页
}
private val mApi = RetrofitManager.getInstance(getApplication()).api
override fun provideDataObservable(page: Int) = null

2
app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
View File

@ -8,6 +8,7 @@ import android.widget.TextView;
import com.gh.common.DefaultUrlHandler;
import com.gh.common.constant.Config;
import com.gh.common.util.EnergyTaskHelper;
import com.gh.common.util.LogUtils;
import com.gh.common.util.LoginHelper;
import com.gh.common.util.ShareUtils;
@ -75,6 +76,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC
EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success",
ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl());
} else {
if (baseResp instanceof SendAuth.Resp) {
SendAuth.Resp resp = (SendAuth.Resp) baseResp;