From 8a7fa127ba49b1813e23c0ced67bc64b037f9bc7 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Tue, 10 Jul 2018 18:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=B2=BE=E9=80=89(=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B5=81)=E5=88=B7=E6=96=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A0=BC=E5=BC=8F=E6=9B=B4=E6=94=B9(?=
 =?UTF-8?q?=E8=A1=A5=E9=94=85=20http://gitlab.ghzhushou.com/pm/halo-app-is?=
 =?UTF-8?q?sues/issues/260#note=5F6952)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/util/AskLogUtils.java | 11 ++++++++++-
 .../qa/recommends/AskQuestionsRecommendsFragment.java |  8 +++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/AskLogUtils.java b/app/src/main/java/com/gh/common/util/AskLogUtils.java
index 6ee01d74e1..35b4e647de 100644
--- a/app/src/main/java/com/gh/common/util/AskLogUtils.java
+++ b/app/src/main/java/com/gh/common/util/AskLogUtils.java
@@ -73,16 +73,25 @@ public class AskLogUtils {
     }
 
 
-    public static void communityRefresh(Context context, int dataCount) {
+    public static void communityRefresh(Context context, int dataCount, boolean manualRefresh) {
         if (context == null) return;
         JSONObject object = new JSONObject();
         try {
             object.put("subject", "community_refresh");
             object.put("community_id", UserManager.getInstance().getCommunity().getId());
             object.put("refresh_type", "recommend");
+            object.put("refresh_way", manualRefresh ? "manual" : "auto");
             object.put("data_count", dataCount);
             object.put("user_id", UserManager.getInstance().getUserId());
             object.put("network", DeviceUtils.getNetwork(context));
+            object.put("version", PackageUtils.getPatchVersionName());
+            object.put("channel", HaloApp.getInstance().getChannel());
+            object.put("android_id", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID));
+            object.put("imei", Util_System_Phone_State.getDeviceId(context));
+            object.put("device_system", android.os.Build.VERSION.RELEASE);
+            object.put("device_model", android.os.Build.MODEL);
+            object.put("time", Utils.getTime(context));
+
         } catch (JSONException e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
index a3e804bcbe..63a84bd1ac 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
@@ -60,6 +60,7 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
     private Fragment mParentFragment;
 
     private boolean mInitRefresh = false;
+    private boolean mManualRefresh = false;
 
     @Override
     protected void handleMessage(Message msg) {
@@ -83,7 +84,7 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
                 switch (integer) {
                     case 0:
                         swipeRefreshHeader.setFinishText("已经没有新内容咯，请稍后再试");
-                        AskLogUtils.communityRefresh(getContext(), integer);
+                        AskLogUtils.communityRefresh(getContext(), integer, mManualRefresh);
                         mInitRefresh = false;
                         refreshLayout.finishRefresh();
                         break;
@@ -101,11 +102,11 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
                         swipeRefreshHeader.setFinishText("成功获取" + integer + "条内容");
                         mInitRefresh = false;
                         refreshLayout.finishRefresh();
-                        AskLogUtils.communityRefresh(getContext(), integer);
+                        AskLogUtils.communityRefresh(getContext(), integer, mManualRefresh);
                         break;
                 }
             }
-
+            mManualRefresh = false;
             if (mListLoading.getVisibility() == View.VISIBLE) mListLoading.setVisibility(View.GONE);
             if (mListRv.getVisibility() == View.GONE) mListRv.setVisibility(View.VISIBLE);
         });
@@ -221,6 +222,7 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
     @Override
     public void onRefresh() {
         mBaseHandler.postDelayed(() -> {
+            mManualRefresh = true;
             mListViewModel.load(LoadType.REFRESH);
         }, 500);
     }