Merge remote-tracking branch 'origin/sheep_develop' into sheep_tinker

app/src/main/AndroidManifest.xml

@@ -156,6 +156,7 @@
         <!--2.0-->
         <activity
             android:name="com.sheep.gamegroup.view.activity.LoginAct"
+            android:configChanges="keyboardHidden|screenSize|orientation"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/FullScreenTheme">
@@ -174,6 +175,7 @@
         </activity>
 
         <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"
+            android:configChanges="keyboardHidden|screenSize|orientation"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.PersonalCenterAct"
             android:screenOrientation="portrait"/>

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

@@ -243,22 +243,6 @@ public class FgtAskgetmoney extends BaseCompatFragment {
         pager.setOffscreenPageLimit(2);
         pager.setAdapter(mAdapter);
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
-        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int i, float v, int i1) {
-
-            }
-
-            @Override
-            public void onPageSelected(int i) {
-                pager.reSetHeight();
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int i) {
-
-            }
-        });
 
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, activity);

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

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FindTag;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -53,8 +54,6 @@ public class FgtFind extends BaseCompatFragment {
     @BindView(R.id.pager)
     ViewPager pager;
 
-    private int awaken_on;//1显示
-
     private GiftpackListAdapter mAdapter;
 
     private void initView() {
@@ -138,11 +137,7 @@ public class FgtFind extends BaseCompatFragment {
         CommonUtil.getInstance().initUrlConfigByNet("awaken_on", new Action1<String>() {
             @Override
             public void call(String url) {
-                try {
-                    awaken_on = Integer.valueOf(url);
-                } catch (NumberFormatException e) {
-                    e.printStackTrace();
-                }
+                int awaken_on = NumberFormatUtils.parseInteger(url);
 
                 if (awaken_on == 1) {
                     mAdapter.add(new FgtRouser(), "看点");

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

@@ -221,7 +221,7 @@ public class FgtRouser extends BaseCompatFragment {
                             intent.setComponent(null);
                             startActivity(intent);
                             CommonUtil.getInstance().awakenDetail(item);
-                        } catch (URISyntaxException e) {
+                        } catch (Exception e) {
                             e.printStackTrace();
                         }
                     }

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

@@ -241,7 +241,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     }
                     int count = item.getDataCount();
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                    params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
+                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
                     mViewPager.setLayoutParams(params);
                     break;
                 case 7:
@@ -263,6 +263,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
             showRedPackage(obj);
         }
+
     }
 
     /**

app/src/main/java/com/sheep/gamegroup/util/AppUtil.java

@@ -10,36 +10,11 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.WindowManager;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Locale;
-
 /**
  * Created by ljy on 2018/3/8.
  */
 public class AppUtil {
-    public static final String BASE_QR = "http://qr.liantu.com/api.php?text=";
-
-    public static String getQRLink(String share_link) {
-        return BASE_QR + share_link;
-    }
-
-    public static String getQRLink(String share_link,int w) {
-        try {
-            share_link = URLEncoder.encode(share_link,"GBK");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-//        String link = BASE_QR + share_link +"&w="+w;
-//        LogUtil.println("link", link);
-        return getQRLink(share_link, w, w);
-    }
 
-    private static final String BASE_QR_2 = "https://api.qrserver.com/v1/create-qr-code/";
-
-    public static String getQRLink(String share_link,int width, int height) {
-        return String.format(Locale.CHINA, "%s?size=%dx%d&data=%s", BASE_QR_2, width, height, share_link);
-    }
     /**
      * 获取app版本名
      */

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -7,7 +7,6 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 
@@ -255,7 +254,7 @@ public class Jump2View {
             public void call(UserEntity userEntity) {
                 if(userEntity != null && !TextUtils.isEmpty(userEntity.getShare_link())) {
                     //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
-                    GlideImageLoader.saveAndSetRqImage(null, AppUtil.getQRLink(userEntity.getShareLink(DialogShare.FACE_TO_FACE), 800), 800);
+                    GlideImageLoader.saveAndSetRqImage(null, userEntity.getShareLink(DialogShare.FACE_TO_FACE), 800);
                 }
 
                 if(userEntity != null && userEntity.canBindMobile()
@@ -281,7 +280,7 @@ public class Jump2View {
             public void call(UserEntity userEntity) {
                 if(userEntity != null && !TextUtils.isEmpty(userEntity.getShare_link())) {
                     //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
-                    GlideImageLoader.saveAndSetRqImage(null, AppUtil.getQRLink(userEntity.getShareLink(DialogShare.FACE_TO_FACE), 800), 800);
+                    GlideImageLoader.saveAndSetRqImage(null, userEntity.getShareLink(DialogShare.FACE_TO_FACE), 800);
                 }
 
                 if(userEntity != null && userEntity.canBindMobile()

app/src/main/java/com/sheep/gamegroup/util/SysAppUtil.java

@@ -458,7 +458,7 @@ public class SysAppUtil {
             return;
         }
         boolean isNewApp;
-        if(TextUtils.equals("sheep", BuildConfig.FLAVOR)) {
+        if(TestUtil.isSheep()) {
             if(ignoreMd5 != null && TextUtils.equals(ignoreMd5, version.getVersion_number()+"") && !version.isForceUpdate()){
                 LogUtil.println("showVersionInfo", "忽略", ignoreMd5, version.getVersion_name());
                 if(action1 != null)
@@ -550,7 +550,7 @@ public class SysAppUtil {
                     }
                 }
             });
-            if(version.isForceUpdate()){//强更
+            if(version.isForceUpdate() && TestUtil.isSheep()){//强更
                 dialogConfig.setCancelable(false);
             } else {
                 dialogConfig.setBtnRightText("下次更新").setBtnRightOnClickListener(new View.OnClickListener() {

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -22,16 +22,13 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.util.DisplayMetrics;
-import android.util.TypedValue;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-
-import com.tencent.smtt.sdk.WebView;
-
+import android.webkit.WebView;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
@@ -48,7 +45,6 @@ import com.google.gson.Gson;
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.dateview.DatePickerDialog;
 import com.sheep.gamegroup.dateview.DateUtil;
-import com.sheep.gamegroup.model.api.RedPackageMoney;
 import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Container;
@@ -57,9 +53,6 @@ import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.PayEntity;
 import com.sheep.gamegroup.model.entity.RobTask;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.glide.RoundedCornersTransformation;
 import com.sheep.gamegroup.view.activity.PersonalInfoAct;
@@ -132,7 +125,7 @@ public class ViewUtil {
         View save_pic = view.findViewById(R.id.save_pic);
         ImageView iv_qr_small = view.findViewById(R.id.iv_qr_small);
 
-        GlideImageLoader.saveAndSetRqImage(iv_qr, AppUtil.getQRLink(link, 800), 800);
+        GlideImageLoader.saveAndSetRqImage(iv_qr, link, 800);
         Glide.with(activity)
                 .load(R.drawable.icon)
                 .apply(new RequestOptions().override(G.WIDTH / 8))
@@ -501,7 +494,7 @@ public class ViewUtil {
         if (!TextUtils.isEmpty(link))
             tv_link.setText(link);
 
-        GlideImageLoader.saveAndSetRqImage(iv_qr, AppUtil.getQRLink(link, 800), 800);
+        GlideImageLoader.saveAndSetRqImage(iv_qr, link, 800);
         dialog_close.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -591,7 +584,7 @@ public class ViewUtil {
         return null;
     }
 
-    public static void setH5Text(TextView textView, WebView webView, String content) {
+    public static void setH5Text(TextView textView, com.tencent.smtt.sdk.WebView webView, String content) {
         if (textView == null || webView == null) {
             return;
         }
@@ -626,9 +619,14 @@ public class ViewUtil {
         }
     }
 
+    public static void loadDataWithBaseURL(com.tencent.smtt.sdk.WebView webView, String content) {
+        webView.loadDataWithBaseURL(null,
+                new StringBuilder("<html><head><meta name=\"viewport\" content=\"width=device-width,height=auto, initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" /><style>img{max-width:100% !important;height:auto !important;}</style><style>body{max-width:100% !important;}</style></head><body>").append(content).append("</body></html>").toString()
+                , "text/html", "utf-8", null);
+    }
     public static void loadDataWithBaseURL(WebView webView, String content) {
         webView.loadDataWithBaseURL(null,
-                new StringBuilder("<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" /><style>img{max-width:100% !important;height:auto !important;}</style><style>body{max-width:100% !important;}</style></head><body>").append(content).append("</body></html>").toString()
+                new StringBuilder("<html><head><meta name=\"viewport\" content=\"width=device-width,height=auto, initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" /><style>img{max-width:100% !important;height:auto !important;}</style><style>body{max-width:100% !important;}</style></head><body>").append(content).append("</body></html>").toString()
                 , "text/html", "utf-8", null);
     }
 
@@ -680,7 +678,7 @@ public class ViewUtil {
         }
         View dialog_close = dialog_parent.findViewById(R.id.dialog_close);
         LinearLayout dialog_center_ll = dialog_parent.findViewById(R.id.dialog_center_ll);
-        View view = LayoutInflater.from(mContext).inflate(dialogConfig.getLayoutId(), dialog_center_ll, true);
+        final View view = LayoutInflater.from(mContext).inflate(dialogConfig.getLayoutId(), dialog_center_ll, true);
         if (!TextUtils.isEmpty(title))
             dialog_title.setText(title);
 

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

@@ -83,8 +83,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     private int id;
 
-    private int k;
-    int width;
     /**
      * 视频全屏参数
      */
@@ -109,10 +107,9 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     @Override
     public void initView() {
         id = getIntent().getIntExtra("id", 0);
-        String title = getIntent().getStringExtra("title");
 
         TitleBarUtils.getInstance()
-                .setTitle(this, /*TextUtils.isEmpty(title) ? "详情" : title*/"详情")
+                .setTitle(this,"详情")
                 .setTitleFinish(this)
                 .setRightImgBotton(this, R.mipmap.share, new View.OnClickListener() {
                     @Override

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

@@ -56,7 +56,6 @@ public class ActNewAboutUs extends BaseActivity {
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, HelperUtils.BAR_HEIGH);
         status_height_view.setLayoutParams(params);
         GlideImageLoader.centerImage(about_us_iv, "http://cdngame.kuaifazs.com/icon_phone.png");
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar_act_game_details));
         /*
           标题显示和隐藏的监听
          */

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.activity;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -9,6 +10,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
 import com.tencent.smtt.sdk.DownloadListener;
@@ -230,23 +232,38 @@ public class ActWeb extends BaseCompatActivity {
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                try {
-                    //微信H5支付核心代码
-                    if (url.startsWith("weixin://wap/pay?")) {
-                        Intent intent = new Intent();
-                        intent.setAction(Intent.ACTION_VIEW);
-                        intent.setData(Uri.parse(url));
-                        startActivity(intent);
-                        return true;
-                    } else {
-                        Map<String, String> extraHeaders = new HashMap<>();
-                        extraHeaders.put("Referer", "http://17xmy.com");
-                        view.loadUrl(url, extraHeaders);
+                //微信H5支付核心代码
+                if (url.startsWith("weixin://wap/pay?")) {
+                    try {
+                    Intent intent = new Intent();
+                    intent.setAction(Intent.ACTION_VIEW);
+                    intent.setData(Uri.parse(url));
+                    startActivity(intent);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return true;
+                } else if(url.startsWith("alipays:") || url.startsWith("alipay")) {
+                    try {
+                        startActivity(new Intent("android.intent.action.VIEW", Uri.parse(url)));
+                    } catch (Exception e) {
+                        new AlertDialog.Builder(ActWeb.this)
+                                .setMessage("未检测到支付宝客户端，请安装后重试。")
+                                .setPositiveButton("立即安装", new DialogInterface.OnClickListener() {
+
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Uri alipayUrl = Uri.parse("https://d.alipay.com");
+                                        startActivity(new Intent("android.intent.action.VIEW", alipayUrl));
+                                    }
+                                }).setNegativeButton("取消", null).show();
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    return true;
+                } else {
+                    Map<String, String> extraHeaders = new HashMap<>();
+                    extraHeaders.put("Referer", "http://17xmy.com");
+                    view.loadUrl(url, extraHeaders);
                 }
-
                 return true;
             }
 

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

@@ -13,7 +13,6 @@ import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
@@ -25,7 +24,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -279,7 +277,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
         personal_info_name.setText(userEntity.getNickname());
         personal_info_code.setText(userEntity.getInvitation_code());
 
-        GlideImageLoader.saveAndSetRqImage(personal_info_qr, AppUtil.getQRLink(userEntity.getShareLink(DialogShare.FACE_TO_FACE), 90), 90);
+        GlideImageLoader.saveAndSetRqImage(personal_info_qr, userEntity.getShareLink(DialogShare.FACE_TO_FACE), 90);
         GlideImageLoader.setAvatar(personal_info_avatar, userEntity.getAvatar());
         //账号与安全
 

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

@@ -5,15 +5,8 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.RequiresApi;
-import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
-
-import com.sheep.gamegroup.util.TestUtil;
-import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
-import com.tencent.smtt.sdk.WebChromeClient;
-import com.tencent.smtt.sdk.WebView;
-import com.tencent.smtt.sdk.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -61,6 +54,7 @@ import com.sheep.gamegroup.util.LocationUtils;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -71,6 +65,10 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
@@ -337,13 +335,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     break;
                 default://试玩任务直接设置下载状态
                     setFirstBtnState();
-                    if (type == DownloadTaskService.STATUS_INSTALLED && gettaskAcceptedEty != null) {//已经安装并且有任务记录的情况下
+                    if (type == DownloadTaskService.STATUS_INSTALLED && gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() != 3) {//已经安装并且有任务未完成的情况下
                         if (TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0) {//没有提交过截图或者已经提交过一次 下线失败后提交
                         } else {//提交过一次，但是审核失败或者没有审核就下线了
-                            String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";
-                            btnUpImag.setText(Html.fromHtml(sr));
+                            btnUpImag.setText("重新提交");
                             btnUpImag.setVisibility(View.VISIBLE);
-                            btnTaskItem.setVisibility(View.GONE);
                         }
                     }
                     break;

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -66,9 +66,14 @@ public class TaskListItemAdp extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        if(position == getCount()-1){
+        final Object object = getItem(position);
+        if(!(object instanceof TaskAcceptedEty)){
             return LayoutInflater.from(context).inflate(R.layout.find_item_bottom, null);
         }
+        final TaskAcceptedEty ety = (TaskAcceptedEty) object;
+        if(ety.getRelease_task() == null || ety.getRelease_task().getTask() == null){
+            return convertView;
+        }
         Object tag = convertView == null ? null : convertView.getTag();
         ViewHolder holder;
         if(tag instanceof ViewHolder){
@@ -85,10 +90,6 @@ public class TaskListItemAdp extends BaseAdapter {
             convertView.setTag(holder);
         }
 
-        final TaskAcceptedEty ety = (TaskAcceptedEty) getItem(position);
-        if(ety == null || ety.getRelease_task() == null || ety.getRelease_task().getTask() == null){
-            return convertView;
-        }
         ViewUtil.setText(holder.name_tv, ety.getRelease_task().getName());
         ViewUtil.setText(holder.date_tv, TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
         String stateStr = "";

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java

@@ -114,9 +114,12 @@ public class FgtAudit extends BaseFragment {
             CommonUtil.getInstance().getAudit(new Action1<BaseMessage>() {
                 @Override
                 public void call(BaseMessage baseMessage) {
+                    int count = 0;
                     if(baseMessage != null){
                         List<TaskAcceptedEty> releaseEtyList = baseMessage.getDataList(TaskAcceptedEty.class);
-                        ListUtil.addAll(etyList, releaseEtyList);
+                        count = ListUtil.addAll(etyList, releaseEtyList);
+                    }
+                    if(count < per_page){//添加最后一条底线
                         if(!etyList.isEmpty())
                             etyList.add(null);
                     }

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

@@ -17,8 +17,8 @@
 
         <ImageView
             android:id="@+id/gridview_item_icon_iv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:adjustViewBounds="true"
             android:src="@mipmap/home_try_play_circle_bg"/>
 

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

@@ -79,8 +79,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:paddingLeft="@dimen/content_padding_10"
-                    android:paddingRight="@dimen/content_padding_10" />
+                    android:paddingLeft="3dp"
+                    android:paddingRight="3dp" />
 
                 <View
                     android:id="@+id/recyclerview_line"

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

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_light"
     android:orientation="vertical">
 
     <FrameLayout

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

@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/title"
-        android:layout_marginTop="100dp" />
+        android:layout_marginTop="50dp" />
 
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="26dp"
+    android:layout_height="43dp"
     android:gravity="center_vertical"
     android:orientation="horizontal">
     <TextView

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.tencent.smtt.sdk.WebView
+    <WebView
         android:id="@+id/dialog_msg_wv"
         android:layout_width="match_parent"
         android:layout_marginLeft="10dp"

app/src/main/res/values/dimens.xml

@@ -20,5 +20,5 @@
     <dimen name="textSize3">18sp</dimen>
     <dimen name="textSize4">21sp</dimen>
 
-    <dimen name="ask_friend_list_h">245dp</dimen>
+    <dimen name="ask_friend_list_h">320dp</dimen>
 </resources>