From 82b6323f721d0c4dbfed450b584ab4e5d269a4e6 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Thu, 31 Oct 2019 11:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4=E9=81=97?=
 =?UTF-8?q?=E6=BC=8F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/gamecenter/WebActivity.java   |  2 +-
 .../gh/gamecenter/personal/PersonalFragment.java   |  7 ++++++-
 .../gh/gamecenter/retrofit/service/ApiService.java | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java
index e0632e64a5..7b11c8e0da 100644
--- a/app/src/main/java/com/gh/gamecenter/WebActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java
@@ -85,7 +85,7 @@ public class WebActivity extends NormalActivity {
     public static Intent getBindWechatIntent(Context context) {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_URL, "http://192.168.4.63:8080/test.html");
-        bundle.putBoolean(WebFragment.KEY_ISTOOLS, true);
+        bundle.putBoolean(WebFragment.KEY_IS_BIND_WECHAT, true);
         return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
index b089bed17d..a8527699e9 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
@@ -38,6 +38,7 @@ import com.gh.gamecenter.SettingActivity;
 import com.gh.gamecenter.ShareGhActivity;
 import com.gh.gamecenter.SuggestSelectActivity;
 import com.gh.gamecenter.UserInfoActivity;
+import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.entity.AppEntity;
 import com.gh.gamecenter.entity.LoginTokenEntity;
 import com.gh.gamecenter.entity.SignEntity;
@@ -300,7 +301,7 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
             R.id.personal_login_qq, R.id.personal_login_weibo, R.id.personal_user_icon,
             R.id.personal_history, R.id.personal_user_name, R.id.personal_game, R.id.personal_share,
             R.id.personal_suggestion, R.id.personal_setting, R.id.personal_ask, R.id.personal_home,
-            R.id.personal_draft, R.id.personal_video_manager})
+            R.id.personal_draft, R.id.personal_video_manager, R.id.personal_bind_wechat})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.personal_login_qq:
@@ -356,6 +357,10 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
                 MtaHelper.onEvent("我的光环", "反馈");
                 startActivity(SuggestSelectActivity.getIntent(getActivity()));
                 break;
+            case R.id.personal_bind_wechat:
+                MtaHelper.onEvent("我的光环", "设置微信提醒");
+                startActivity(WebActivity.getBindWechatIntent(requireContext()));
+                break;
             case R.id.personal_setting:
                 MtaHelper.onEvent("我的光环", "设置图标");
                 DataCollectionUtils.uploadClick(getActivity(), "设置图标", "我的光环");
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
index 6a824f6c61..bca389c652 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
@@ -1,6 +1,7 @@
 package com.gh.gamecenter.retrofit.service;
 
 import com.gh.gamecenter.entity.AliasEntity;
+import com.gh.gamecenter.entity.AmwayEntity;
 import com.gh.gamecenter.entity.AppEntity;
 import com.gh.gamecenter.entity.CategoryEntity;
 import com.gh.gamecenter.entity.CommentEntity;
@@ -2036,6 +2037,19 @@ public interface ApiService {
     @GET("games/servers/filter_tag")
     Single<List<ServersGameCategory>> getServerFilterTag();
     
+    /**
+     * 获取安利墙列表
+     */
+    @GET("amway")
+    Single<List<AmwayEntity>> getAmwayList(@Query("page") int page, @Query("timestamp") long timestamp);
+    
+    /**
+     * 绑定微信
+     */
+    @POST("./wechat:bind")
+    Single<ResponseBody> postBindWechat(@Body RequestBody body);
+    
+    
     /**
      * 获取通知权限引导数据
      */