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 acace014b5..0ade757c83 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -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) { diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 3b14f7b740..98de9e0aad 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -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"; diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index 12064e71bc..87b2e39e73 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -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(); } diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt index 064f528cf6..24c3f7dbdd 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt @@ -64,10 +64,10 @@ class CommodityAdapter(context: Context, val entrance: String): ListAdapter(application) { + init { + setOverLimitSize(1000) // 该页面不需要分页 + } + private val mApi = RetrofitManager.getInstance(getApplication()).api override fun provideDataObservable(page: Int) = null diff --git a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java index 83dd66911a..cbf327d454 100644 --- a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java +++ b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java @@ -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; diff --git a/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.9.png b/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.9.png new file mode 100644 index 0000000000..12dd6bfc0f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.9.png differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.png b/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.png deleted file mode 100755 index d839a1a7b1..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_commodity_tag.png b/app/src/main/res/drawable-xxxhdpi/bg_commodity_tag.png deleted file mode 100755 index 5946b055ec..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/bg_commodity_tag.png and /dev/null differ diff --git a/app/src/main/res/layout/commodity_item.xml b/app/src/main/res/layout/commodity_item.xml index 745f7d3599..5a3cd708ba 100644 --- a/app/src/main/res/layout/commodity_item.xml +++ b/app/src/main/res/layout/commodity_item.xml @@ -123,28 +123,19 @@ android:text="@{`剩` + entity.offShelveTimerBeforeDays + `天`}" tools:text="剩7天" /> - - - - - - + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_commodity_list.xml b/app/src/main/res/layout/fragment_commodity_list.xml index 2be4604a2c..4acb6b9214 100644 --- a/app/src/main/res/layout/fragment_commodity_list.xml +++ b/app/src/main/res/layout/fragment_commodity_list.xml @@ -78,6 +78,29 @@ - + + + + + \ No newline at end of file