zengjiebin лет назад: 7
Родитель
Сommit
d63a6ea47b

+ 7 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java

@@ -13,6 +13,7 @@ import android.view.View;
 import com.kfzs.duanduan.ActMain;
 import com.tencent.smtt.sdk.WebView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
@@ -61,6 +62,8 @@ public class FgtAskgetmoney extends BaseCompatFragment {
     View ask_top_1;
     @BindView(R.id.ask_top_2)
     View ask_top_2;
+    @BindView(R.id.ask_top_3)
+    View ask_top_3;
     @BindView(R.id.ask_award_info)
     MarqueeView ask_award_info;
     @BindView(R.id.ask_scroll_view)
@@ -119,11 +122,14 @@ public class FgtAskgetmoney extends BaseCompatFragment {
         ask_bg.loadData(content, "text/html", "UTF-8");
 //                16,18,19
         LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
-        layoutParams1.height = G.WIDTH * 690 / 625;
+        layoutParams1.height = G.WIDTH * 660 / 625;
         ask_top_1.setLayoutParams(layoutParams1);
         LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) ask_top_2.getLayoutParams();
         layoutParams2.height = G.WIDTH * 112 / 625;
         ask_top_2.setLayoutParams(layoutParams2);
+        RelativeLayout.LayoutParams layoutParams3 = (RelativeLayout.LayoutParams) ask_top_3.getLayoutParams();
+        layoutParams3.topMargin = G.WIDTH * 1442 / 1080;
+        ask_top_3.setLayoutParams(layoutParams3);
 
         showViewpage();
 

+ 2 - 2
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -301,7 +301,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
         isShowRedPackage();
-        bottom_line_text.setText("我是有底线的,双我回到顶部");
+        bottom_line_text.setText("我是有底线的,双我回到顶部");
     }
 
 
@@ -654,7 +654,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.view_rob_duty://抢任务弹框
                 ViewUtil.showRobDutyDialog(getActivity(), getView());
                 break;
-            case R.id.bottom_line://我是有底线的,双我回到顶部
+            case R.id.bottom_line://我是有底线的,双我回到顶部
                 scrollView.fullScroll(NestedScrollView.FOCUS_UP);
                 break;
         }

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -167,7 +167,11 @@ public class DataUtil {
             if (BuildConfig.XXTEA_ENCRYPT) {
                 cacheData = BaseMessageConverter.decrypt(cacheData);
             }
-            return JSON.parseObject(cacheData, BaseMessage.class).getData(classT);
+            try {
+                return JSON.parseObject(cacheData, BaseMessage.class).getData(classT);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return null;
     }

+ 3 - 1
app/src/main/res/layout/x_ask_getmoney_act_layout.xml

@@ -24,14 +24,16 @@
 
             <com.tencent.smtt.sdk.WebView
                 android:id="@+id/ask_bg"
+                android:layout_marginTop="?attr/actionBarSize"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
             <!--底部有白条,用这一层覆盖-->
             <View
+                android:id="@+id/ask_top_3"
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
-                android:layout_alignParentBottom="true"
+                android:layout_marginTop="300dp"
                 android:background="#FFD269"/>
             <!--内容   注:layout_marginBottom 为底部添加一点空间-->
             <LinearLayout