Pārlūkot izejas kodu

接口好像正常了

zengjiebin 8 gadi atpakaļ
vecāks
revīzija
cea465feb2

+ 0 - 3
app/src/main/java/com/kfzs/duanduan/fragment/FgtBorrowPlay.java

@@ -13,13 +13,10 @@ import com.sheep.jiuyan.samllsheep.R;
  */
 public class FgtBorrowPlay extends BaseCompatFragment{
 
-    private WebView fgt_bp_webview;
 
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_bp);
-        fgt_bp_webview = getViewById(R.id.fgt_bp_webview);
-        fgt_bp_webview.loadUrl("http://www.baidu.com");
     }
 
 }

+ 0 - 4
app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCard.java

@@ -13,13 +13,9 @@ import com.sheep.jiuyan.samllsheep.R;
  */
 public class FgtCreditCard extends BaseCompatFragment{
 
-    private WebView fgt_bp_webview;
-
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_bp);
-        fgt_bp_webview = getViewById(R.id.fgt_bp_webview);
-        fgt_bp_webview.loadUrl("http://www.baidu.com");
     }
 
 }

+ 16 - 24
app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -1,11 +1,8 @@
 package com.kfzs.duanduan.react;
 
-import android.app.Activity;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -14,8 +11,6 @@ import com.kf.utils.ToastBuilder;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.adp.ViewPagerFragmentAdapter;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.ArrayList;
@@ -98,25 +93,22 @@ public class TabsHelper {
     private void checkViewState(int position) {
         int top;
         int bottom;
-        switch (position) {
-            case 1:
-                top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
-                bottom = 0;
-                layout_main_activity_toolbar.setVisibility(View.VISIBLE);
-                if(!isGetAdvertisementDialogData) {
-                    isGetAdvertisementDialogData = true;
-                    activity.getAdvertisementDialogData();//获取广告弹窗信息
-                }
-                break;
-            case 2:
-                top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
-                bottom = activity.getResources().getDimensionPixelSize(R.dimen.tab_height);
-                layout_main_activity_toolbar.setVisibility(View.VISIBLE);
-                break;
-            default:
-                top = 0;
-                bottom = 0;
-                layout_main_activity_toolbar.setVisibility(View.GONE);
+       if(position == MainTab.FgtMainGame.getPosition()) {
+           top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
+           bottom = 0;
+           layout_main_activity_toolbar.setVisibility(View.VISIBLE);
+           if (!isGetAdvertisementDialogData) {
+               isGetAdvertisementDialogData = true;
+               activity.getAdvertisementDialogData();//获取广告弹窗信息
+           }
+       }else if(position == MainTab.FgtMainCategory.getPosition()) {
+           top = activity.getResources().getDimensionPixelSize(R.dimen.app_nav_toolbar_height);
+           bottom = activity.getResources().getDimensionPixelSize(R.dimen.tab_height);
+           layout_main_activity_toolbar.setVisibility(View.VISIBLE);
+       } else {
+            top = 0;
+            bottom = 0;
+            layout_main_activity_toolbar.setVisibility(View.GONE);
         }
         RelativeLayout.LayoutParams layout = (RelativeLayout.LayoutParams) other_container
                 .getLayoutParams();

+ 7 - 5
app/src/main/java/com/sheep/gamegroup/model/api/BaseMessageConverter.java

@@ -1,11 +1,14 @@
 package com.sheep.gamegroup.model.api;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.appstore.utils.string.HexUtils;
 import com.kfzs.duanduan.proto.ApiResponseOuterClass;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import go.kfzssafe.Kfzssafe;
 import okhttp3.ResponseBody;
@@ -50,13 +53,12 @@ public class BaseMessageConverter implements Converter<ResponseBody, BaseMessage
         try {
             byte[] bytes = HexUtils.hexStr2Bytes(respenseJson);
             byte[] byteDecode = Kfzssafe.XByteDecode(bytes);
-//            ApiResponseOuterClass.ApiResponse apiResponse = ApiResponseOuterClass.ApiResponse.parseFrom(byteDecode);
-            String string = new String(byteDecode);
-
-            return string;
+            return new String(byteDecode);
         } catch (Exception e) {
             e.printStackTrace();
-            return respenseJson;
+            Map<String,String> map = new HashMap<>();
+            map.put("msg",respenseJson);
+            return JSON.toJSONString(map);
         }
     }
 }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java

@@ -72,7 +72,7 @@ public class AddPuplicParameIntercept implements Interceptor {
         }
         String id = SpUtils.getOpenId(SheepApp.mContext);
         Request r = oldRequest.newBuilder()
-                .addHeader("Authorization", TextUtils.isEmpty(id) ? "" : BaseMessageConverter.encrypt(id))//header 会覆盖以前的  header
+                .addHeader("Authorization", TextUtils.isEmpty(id) ? "" : id)//header 会覆盖以前的  header
                 .method(method, body)
                 .url(b.build())
                 .build();

+ 4 - 3
app/src/main/res/layout/fgt_bp.xml

@@ -3,8 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <WebView
-        android:id="@+id/fgt_bp_webview"
+    <ImageView
+        android:id="@+id/fgt_bp_iv"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:src="@mipmap/icon"/>
 </LinearLayout>