添加代理服务与FAQ对接

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -1,6 +1,7 @@
 package com.kfzs.duanduan.fragment;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +16,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
@@ -56,10 +58,13 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     TextView personalcenter_item_price_tv;
     @BindView(R.id.proxy_service_layout)
     View proxy_service_layout;
+    @BindView(R.id.proxy_service_layout_line)
+    View proxy_service_layout_line;
     Unbinder unbinder;
 
     private UserEntity userEntitys;
-
+    private String faqUrl;
+    private String agentUrl;
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_personalcenter_layout);
@@ -82,6 +87,44 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                                 LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                             }
                         });
+        if(TextUtils.isEmpty(faqUrl))
+            SheepApp.getInstance().getNetComponent().getApiService().getFaqUrl()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                Ext ext = baseMessage.getData(Ext.class);
+                                if(ext != null && !TextUtils.isEmpty(ext.getUrl())){
+                                    faqUrl = ext.getUrl();
+                                }
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                            }
+                        });
+        if(TextUtils.isEmpty(agentUrl))
+            SheepApp.getInstance().getNetComponent().getApiService().getAgentUrl()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                Ext ext = baseMessage.getData(Ext.class);
+                                if(ext != null && !TextUtils.isEmpty(ext.getUrl())){
+                                    agentUrl = ext.getUrl();
+                                }
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                            }
+                        });
         getShardData();
     }
 
@@ -105,6 +148,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                 .into(iconImgIv);
         //设置是否显示代理服务
+        proxy_service_layout_line.setVisibility(BuildConfig.DEBUG || userEntitys.getIs_agent() == 1 ? View.VISIBLE : View.GONE);
         proxy_service_layout.setVisibility(BuildConfig.DEBUG || userEntitys.getIs_agent() == 1 ? View.VISIBLE : View.GONE);
     }
 
@@ -121,7 +165,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         super.onDestroyView();
         unbinder.unbind();
     }
-    @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout, R.id.account_safe_layout, R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.tv_submit})
+    @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout, R.id.account_safe_layout, R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.tv_submit, R.id.faq_layout})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.icon_img_iv://图片
@@ -138,7 +182,16 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goTaskList2View(getActivity(), null);
                 break;
             case R.id.proxy_service_layout://代理
-                Jump2View.getInstance().goWeb(getActivity(), "http://10.8.210.172:8080/#/", "代理服务");
+                if(!TextUtils.isEmpty(agentUrl))
+                    Jump2View.getInstance().goWeb(getActivity(), agentUrl, "代理服务");
+                else
+                    G.showToast(R.string.loading_data);
+                break;
+            case R.id.faq_layout://FAQ帮助
+                if(!TextUtils.isEmpty(faqUrl))
+                    Jump2View.getInstance().goWeb(getActivity(), faqUrl, "FAQ帮助");
+                else
+                    G.showToast(R.string.loading_data);
                 break;
             case R.id.abourt_us_layout://关于我们
                 Jump2View.getInstance()

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -463,4 +463,14 @@ public interface ApiService {
      */
     @GET("app/punch/punch_and_sign_count")
     Observable<BaseMessage> getPunchAndSignCount();
+    /**
+     * faq H5地址
+     */
+    @GET("app/url/get_faq")
+    Observable<BaseMessage> getFaqUrl();
+    /**
+     * 代理服务 H5地址
+     */
+    @GET("app/url/get_agent")
+    Observable<BaseMessage> getAgentUrl();
 }

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -56,6 +56,7 @@ import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTaskDetailChildListview;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -502,8 +503,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     }
                     break;
             }
-        } catch (Exception ignore) {
-            G.showToast(R.string.loading_data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            G.showToast(BuildConfig.DEBUG ? e.getMessage() : getString(R.string.loading_data));
         }
     }
 

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

@@ -124,6 +124,7 @@
     </RelativeLayout>
 
     <View
+        android:id="@+id/proxy_service_layout_line"
         android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="@color/white_bg_line"

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

@@ -88,6 +88,47 @@
         />
 
     <RelativeLayout
+        android:id="@+id/faq_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        >
+        <ImageView
+            android:id="@+id/faq_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/faq"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="FAQ帮助"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:layout_alignBottom="@+id/faq_item_icon_iv"
+            android:layout_toEndOf="@+id/faq_item_icon_iv" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
         android:id="@+id/recommend_friend_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"