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

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) {

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";

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();
     }
 

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

@@ -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

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

@@ -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

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;

app/src/main/res/layout/commodity_item.xml

@@ -123,28 +123,19 @@
                 android:text="@{`剩` + entity.offShelveTimerBeforeDays + `天`}"
                 tools:text="剩7天" />
 
-            <RelativeLayout
-                android:visibility="gone"
-                android:id="@+id/tagContainer"
+            <TextView
+                android:id="@+id/tagTv"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="18dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:gravity="center"
+                android:background="@drawable/bg_commodity_tag"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                tools:text="限时限量"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:layout_width="56dp"
-                    android:layout_height="18dp"
-                    android:src="@drawable/bg_commodity_tag" />
-
-                <TextView
-                    android:id="@+id/tagTv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:textColor="@color/white"
-                    android:textSize="10sp"
-                    tools:text="限时限量" />
-            </RelativeLayout>
+                app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </RelativeLayout>
 </layout>

app/src/main/res/layout/fragment_commodity_list.xml

@@ -78,6 +78,29 @@
 
     <include layout="@layout/reuse_no_connection" />
 
-    <include layout="@layout/reuse_none_data" />
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/reuse_none_data"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
 
+        <ImageView
+            android:id="@+id/reuseNoneDataIv"
+            android:layout_width="148dp"
+            android:layout_height="140dp"
+            android:src="@drawable/pic_no_data" />
+
+        <TextView
+            android:id="@+id/reuse_tv_none_data"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/no_data"
+            android:textColor="@color/text_cccccc"
+            android:textSize="15sp" />
+    </LinearLayout>
 </RelativeLayout >