Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/build.gradle

@@ -461,7 +461,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.0.1'
 
     //鸿途信达 广告sdk
-    implementation(name: 'ad-htxd-201901071720', ext: 'aar')
+//    implementation(name: 'ad-htxd-201901071720', ext: 'aar')
 
     //切换皮肤框架 https://github.com/ximsfei/Android-skin-support
 

app/src/main/java/com/sheep/gamegroup/module/ad_htxd/model/ArticleAd.java

@@ -1,88 +0,0 @@
-package com.sheep.gamegroup.module.ad_htxd.model;
-
-import com.hoc.hoclib.adlib.HNativeListener;
-import com.hoc.hoclib.adlib.NativeADDataInfo;
-import com.hoc.hoclib.adlib.PNative;
-import com.sheep.gamegroup.model.entity.Article;
-import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import rx.functions.Action1;
-
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.HTXD_AD;
-
-/**
- * Created by realicing on 2019/1/7.
- * realicing@sina.com
- * 鸿途信达 广告
- */
-public class ArticleAd extends Article {
-
-    public static final String FEED = "1D0JLRMA102V277730B60000552042FE";
-    public static final int INDEX = 4;//放在position为4的位置，即第5个
-    public static final boolean showAd = false;//TestUtil.isSheep();//是否显示广告
-
-    private NativeADDataInfo nativeADDataInfo;
-    private PNative pNative;
-
-    public static int ID = -99;
-    public ArticleAd(NativeADDataInfo nativeADDataInfo, PNative pNative) {
-        this.nativeADDataInfo = nativeADDataInfo;
-        this.pNative = pNative;
-        setType(2);//资讯
-        setId(ID--);
-        setTitle(nativeADDataInfo.getTitle());
-        setCreated_at((int) (System.currentTimeMillis() / 1000L));
-        setPictures(nativeADDataInfo.getMainImg());
-    }
-
-    public NativeADDataInfo getNativeADDataInfo() {
-        return nativeADDataInfo;
-    }
-
-    public PNative getpNative() {
-        return pNative;
-    }
-
-    //初始化广告
-    public static void fetchNativeData(ListUtil.CallBack<ArticleAd, Boolean> adAction1, Action1<Boolean> callBack) {
-        final PNative pNative = new PNative(SheepApp.getInstance());
-        pNative.setHTNativeListener(new HNativeListener() {
-            @Override
-            public void onNativeAdIsReady(NativeADDataInfo nativeAdData) {
-                ArticleAd articleAd = new ArticleAd(nativeAdData, pNative);
-                boolean success = adAction1.call(articleAd);
-                LogUtil.println("ArticleAd", "fetchNativeData", "onNativeAdIsReady", success);
-                pNative.handleImp();
-                callBack.call(success);
-            }
-
-            @Override
-            public void onLoadNativeAdFail() {
-                LogUtil.println("ArticleAd", "fetchNativeData", "onLoadNativeAdFail");
-                callBack.call(false);
-            }
-        })
-                .setADId(FEED)
-                .fetch();
-    }
-
-    //检查是否是广告
-    public static boolean checkAd(Article item) {
-        if(item instanceof ArticleAd){
-            return true;
-        }
-        return false;
-    }
-    //检查是否是广告 并点击
-    public static boolean checkAdAndClick(Article item) {
-        if(item instanceof ArticleAd){
-            HTXD_AD.onEvent("title", ((ArticleAd) item).getNativeADDataInfo().getTitle());
-            ((ArticleAd) item).getpNative().handleClickToWeb();
-            return true;
-        }
-        return false;
-    }
-}

app/src/main/java/com/sheep/gamegroup/module/home/api/MainAction.java

@@ -0,0 +1,11 @@
+package com.sheep.gamegroup.module.home.api;
+
+/**
+ * Created by realicing on 2019/2/26.
+ * realicing@sina.com
+ */
+public enum MainAction {
+    CHECK_COPY,//检查粘贴板
+    CHECK_SCHEME,//检查启动项
+    ;
+}

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

@@ -2653,11 +2653,8 @@ public class CommonUtil {
         }
         if (TestUtil.isTest()) {//下面的功能暂不提供给用户
             dialogConfig.setMsg("已经复制如下内容：\n" + textString + "\n，是否访问该链接？")
-                    .setBtnLeftText("确定").setBtnLeftOnClickListener(view -> Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url))
-                    .setBtnRightText("仅一次").setBtnRightOnClickListener(view -> {
-                closeListener.onClick(view);
-                Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url);
-            });
+                    .setBtnLeftText("外部h5").setBtnLeftOnClickListener(view -> Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url))
+                    .setBtnRightText("内部h5").setBtnRightOnClickListener(view -> Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url, "测试内部h5"));
             ViewUtil.showMsgDialog(SheepApp.getInstance().getCurrentActivity(), dialogConfig);
         }
     }
@@ -2665,6 +2662,7 @@ public class CommonUtil {
     //检查是否是小绵羊分享页面，如果是且获取到了game_id，返回true并调用接口获取对应的applications，然后尝试显示游戏对话框，提示用户是否查看游戏详情
     private boolean checkShouYouShare(View.OnClickListener closeListener, String url) {
         if (url.contains("/shou_you_share/index.html")) {
+            closeListener.onClick(null);
             String gameId = StringUtils.getQueryParameter(url, "game_id");
             if (!TextUtils.isEmpty(gameId)) {
                 SheepApp.getInstance().getNetComponent().getApiService().getAppId(gameId)//http://10.8.220.229:8800/shou_you_share/index.html?invitation_code=12799442&game_id=1553

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

@@ -52,7 +52,6 @@ import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.ad_htxd.model.ArticleAd;
 import com.sheep.gamegroup.module.find.activity.ActMediaChoose;
 import com.sheep.gamegroup.module.game.activity.ActDownloadManager;
 import com.sheep.gamegroup.module.game.activity.ActGameCenterType;
@@ -2236,9 +2235,6 @@ public class Jump2View {
 
     //打开一个发现
     public void goFindItem(Context context, Article item) {
-        if (ArticleAd.showAd && ArticleAd.checkAdAndClick(item)) {//检查点击的是否是 广告
-            return;
-        }
         switch (item.getType()) {//类型 1：游戏 2：咨询 3：转跳 4：任务 5：栏目
             case 1:
                 Jump2View.getInstance().goEntity(item);

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

@@ -262,7 +262,7 @@ public class TestUtil {
      */
     public static void test(final Activity activity) {
         final String[] items = {"复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
-                "跳转QQ", "跳转QQ群", "分享我的签名的小绵羊apk", "分享当前小绵羊apk",
+                "跳转QQ", "跳转QQ群","爱奇艺VIP会员", "分享我的签名的小绵羊apk", "分享当前小绵羊apk",
                 "测试升级对话框","少数民族姓名", "开启皮肤", "不开启皮肤", "我的游戏", "优惠券弹窗", "填写收件地址弹窗",
                 "朗读文字", "游戏搜索", "测试插件","测试bitmap", "剪切视频", "我的关注", "足迹",
                 "测试联通卡", "测试联通卡2", "测试签名1", "测试签名2", "测试孔剑秋faq正式服",
@@ -287,6 +287,9 @@ public class TestUtil {
             return;
         }
         switch (item) {
+            case "爱奇艺VIP会员":
+                Jump2View.getInstance().goWeb(activity, "http://smallstation.kfzs.com/iqiyi_vip_member/#/home-page", item);
+                break;
             case "分享当前小绵羊apk":
                 PackageInfo packageInfo = ApkUtils.getPackageInfo(SheepApp.getInstance().getPackageName());
                 if (packageInfo != null && packageInfo.applicationInfo != null && !TextUtils.isEmpty(packageInfo.applicationInfo.sourceDir)) {

app/src/main/java/com/sheep/gamegroup/util/js/BaseActWeb.java

@@ -114,7 +114,7 @@ public abstract class BaseActWeb extends BaseUMActivity {
     protected void webViewLoadUrl(com.tencent.smtt.sdk.WebView webView, String url){
         if(addSheepUserAgent){
             Map<String, String> extraHeaders = new HashMap<>();
-            extraHeaders.put("User-Agent", BuildConfig.APPLICATION_ID + "/" + SysAppUtil.getUserAgent());
+            extraHeaders.put("User-Agent", getSheepUserAgent());
             webViewLoadUrl(webView, extraHeaders, url);
         } else {
             webView.loadUrl(url);
@@ -124,6 +124,11 @@ public abstract class BaseActWeb extends BaseUMActivity {
             WebViewCacheInterceptorInst.getInstance().loadUrl(url, webView.getSettings().getUserAgentString());
         }
     }
+
+    public static String getSheepUserAgent(){
+        return BuildConfig.APPLICATION_ID + "/" + SysAppUtil.getUserAgent();
+    }
+
     protected void webViewLoadUrl(com.tencent.smtt.sdk.WebView webView, Map<String, String> map, String url){
         webView.loadUrl(url, map);
         if(TestUtil.isDev()){

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -22,6 +23,7 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.helper.DownloadHelper;
 import com.sheep.gamegroup.model.entity.Container;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.module.home.api.MainAction;
 import com.sheep.gamegroup.util.ActionUtil;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -360,6 +362,12 @@ public class ActMain extends BaseActYmPermissionCheck {
             } else {
                 new DialogGameOrTaskOrGift(this, game_id).showDialog();
             }
+        } else if (action instanceof Uri) {
+            MiddleSchemeAct.parseAndJumpUri(this, (Uri) action);
+        } else if (action instanceof MainAction) {
+            if(action == MainAction.CHECK_COPY){
+                CommonUtil.getInstance().checkCopyText();
+            }
         } else if (action instanceof MainTab) {
             switchFragment(((MainTab) action).ordinal());
         }

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

@@ -170,7 +170,7 @@ public class ActSearchApp extends BaseActivity {
     private void toSearchApp() {
         search_app_list.setVisibility(View.INVISIBLE);
         frame_container.setVisibility(View.VISIBLE);
-        String inputText = TitleBarUtils.getInstance().getSearchText(this).toString();
+        String inputText = TitleBarUtils.getInstance().getSearchText(this).trim();
         if (!TextUtils.isEmpty(inputText)) {
             //保存搜索到数据库
             SearchAppRecord searchRecord = searchRecordMap.get(inputText);

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

@@ -224,7 +224,7 @@ public class ActSearchAppOrTask extends BaseActivity {
         }
         recyclerView.setVisibility(View.INVISIBLE);
         frame_container.setVisibility(View.VISIBLE);
-        String inputText = TitleBarUtils.getInstance().getSearchText(this);
+        String inputText = TitleBarUtils.getInstance().getSearchText(this).trim();
         if (!TextUtils.isEmpty(inputText)) {
             //保存搜索到数据库
             SearchRecord searchRecord = new SearchRecord();

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

@@ -306,7 +306,7 @@ public class ActSearchGame extends BaseActivity {
     }
 
     private void toSearchGame() {
-        String inputText = search_game_input.getText().toString();
+        String inputText = search_game_input.getText().toString().trim();
         if (TextUtils.isEmpty(inputText)) {
             list.clear();
             notifyDataSetChanged();

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

@@ -165,6 +165,7 @@ public class ActWebX5 extends BaseActWeb {
 
         // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
         // settings 的设计
+        webSetting.setUserAgentString(getSheepUserAgent());
     }
 
     @Override

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -11,11 +12,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.SlideshowEty;
+import com.sheep.gamegroup.module.home.api.MainAction;
 import com.sheep.gamegroup.util.ActionUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.bean.UserCenterModule;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
@@ -44,14 +48,20 @@ public class MiddleSchemeAct extends Activity {
             return;
         switch (action) {
             case Intent.ACTION_VIEW:
+                finish();
                 Uri uri = intent.getData();
                 if (uri != null) {
                     // 完整的url信息
-                    if (TestUtil.isTest())
-                        G.showToast(uri.toString());
-                    parseAndJumpUri(this, uri);
+//                    if (TestUtil.isTest())
+//                        G.showToast(uri.toString());
+                    LogUtil.println("SheepApp mActivityCount" + SheepApp.getInstance().mActivityCount);
+                    if(SheepApp.getInstance().mActivityCount == 0) {
+                        ActionUtil.getInstance().addNextAction(ActMain.class.getSimpleName(), uri);
+                        tryGoSplashAct(SheepApp.getInstance(), uri);
+                    } else {
+                        parseAndJumpUri(SheepApp.getInstance().getCurrentActivity(), uri);
+                    }
                 }
-                finish();
                 break;
         }
     }
@@ -125,6 +135,13 @@ public class MiddleSchemeAct extends Activity {
                     runApp(activity, packageName, className);
                 }
                 break;
+            //sheep://small.kfzs.com/xmy?type=cc
+            case "check_copy":
+            case "cc":
+//                ActionUtil.getInstance().addNextAction(ActMain.class.getSimpleName(), MainAction.CHECK_COPY);
+//                tryGoSplashAct(activity, uri);
+                CommonUtil.getInstance().checkCopyText();
+                break;
         }
 //                    LogUtil.println("ActMain", "checkScheme","url: " + url);
 //                    // scheme部分
@@ -173,12 +190,11 @@ public class MiddleSchemeAct extends Activity {
      * ActMain checkScheme query: code=976873
      * ActMain checkScheme code: 976873
      */
-    public static void tryGoSplashAct(Activity activity, Uri uri) {
+    public static void tryGoSplashAct(Context context, Uri uri) {
         String game_id = uri.getQueryParameter("game_id");
         if(!TextUtils.isEmpty(game_id))//有game_id时设置game_id的回调到主页，用于展示会长推广弹出框
             ActionUtil.getInstance().addNextAction(SHOW_DIALOG_GAME_OR_GIFT_TASK, game_id);
-        Jump2View.getInstance().newTaskTopStartAct(activity, SplashAct.class, null);
-
+        Jump2View.getInstance().newTaskTopStartAct(context, SplashAct.class, null);
     }
 
     //展示会长推广弹出框的key

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

@@ -18,7 +18,9 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
@@ -62,6 +64,10 @@ public class FgtAskGetMoneyNewYear extends BaseFragment {
     View new_year_ask_start_view;
     @BindView(R.id.new_year_ask_end_view)
     View new_year_ask_end_view;
+    @BindView(R.id.new_year_ask_tv1)
+    View new_year_ask_tv1;
+    @BindView(R.id.new_year_ask_tv2)
+    View new_year_ask_tv2;
     @BindView(R.id.ask_scroll_view)
     NestedScrollView scrollView;
     @BindView(R.id.pager)
@@ -84,13 +90,33 @@ public class FgtAskGetMoneyNewYear extends BaseFragment {
 
     //在viewPager的第一个位置或者在activity中通过transaction.replace(R.id.frame_container, fragment);方式加载的话，需要设置为true
     private boolean isFirstFgt;
+    private int start = 44;
+    private int end = 40;
     @Override
     public void onViewCreated() {
         activity = getActivity();
         isFirstFgt = activity instanceof AskGetMoneyAct;
         float n = G.WIDTH / 1088.0f;
-        LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(55));
-        LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(54));
+        LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(start));
+        LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(end));
+        if(TestUtil.isDev()){
+            new_year_ask_start_view.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(++start));
+                LogUtil.println(String.format(Locale.CHINA, "test start %d", start));
+            });
+            new_year_ask_end_view.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(++end));
+                LogUtil.println(String.format(Locale.CHINA, "test end %d", end));
+            });
+            new_year_ask_tv1.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(--start));
+                LogUtil.println(String.format(Locale.CHINA, "test start %d", start));
+            });
+            new_year_ask_tv2.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(--end));
+                LogUtil.println(String.format(Locale.CHINA, "test end %d", end));
+            });
+        }
         ViewUtil.setDefaultText(tvSize);
         ViewUtil.setDefaultText(tvMoney);
         ViewUtil.setDefaultText(my_invitation_tv);
@@ -166,10 +192,11 @@ public class FgtAskGetMoneyNewYear extends BaseFragment {
                                 mEntity = baseMessage.getData(FriendAndAwardEntity.class);
                                 if (mEntity != null) {
                                     int friendCount = mEntity.getFriend_count();
-                                    ViewUtil.setText(tvSize, String.valueOf(friendCount));
+                                    ViewUtil.setText(tvSize, TestUtil.isDev() ? "0000" : String.valueOf(friendCount));
                                     if(friendCount > 0)
                                         ViewUtil.setText(new_year_tab_2, String.format(Locale.CHINA, "好友列表 (%d)", friendCount));
-                                    ViewUtil.setText(tvMoney, String.valueOf(mEntity.getAward()));
+                                    else
+                                    ViewUtil.setText(tvMoney, TestUtil.isDev() ? "0000" : String.valueOf(mEntity.getAward()));
                                 }
                             }
                         }

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

@@ -21,7 +21,6 @@ import com.sheep.gamegroup.model.entity.Article;
 import com.sheep.gamegroup.model.entity.ArticleTag;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Lp;
-import com.sheep.gamegroup.module.ad_htxd.model.ArticleAd;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
@@ -41,7 +40,6 @@ import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -59,7 +57,6 @@ import static android.content.Intent.ACTION_PACKAGE_REMOVED;
 public class FgtFindChild extends BaseListFragment5<Article> {
 
     private int type;
-    private boolean showAd;
 
     @Override
     public void initView() {
@@ -69,7 +66,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
 
     @Override
     protected RecyclerView.Adapter getAdapter() {
-        return new CommonRecycler(showAd ? allList : list);
+        return new CommonRecycler(list);
     }
 
     @Override
@@ -87,33 +84,6 @@ public class FgtFindChild extends BaseListFragment5<Article> {
         return Article.class;
     }
 
-    private List<Article> allList = new ArrayList<>();//显示广告时使用allList，否则使用list
-
-    @Override
-    protected void loadList(List<Article> addList) {
-        if (showAd) {
-            ListUtil.addAll(allList, addList);
-//            if (1 == page) {
-                int index = (page - 1) * (per_page + 1) + ArticleAd.INDEX;
-                Article item = ListUtil.getItem(allList, index);
-                if (!(item instanceof ArticleAd)) {//倒数第几个不是广告的情况下才添加
-                    ArticleAd.fetchNativeData(articleAd -> ListUtil.insertIndex(allList, articleAd, index), ok -> {
-                        if (ok) {
-                            notifyDataSetChanged();
-                        }
-                    });
-                }
-//            }
-        }
-        super.loadList(addList);
-    }
-
-    @Override
-    public void clear() {
-        if (showAd)
-            allList.clear();
-        super.clear();
-    }
 
     public static FgtFindChild newInstance(ArticleTag articleTag) {
         FgtFindChild fgt = new FgtFindChild();
@@ -269,7 +239,6 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             ArticleTag articleTag = DataUtil.getObject(bundle, ArticleTag.class);
             if (articleTag != null) {
                 type = articleTag.getId();
-                showAd = ArticleAd.showAd;//修改回之前的所有栏目都展示 && TextUtils.equals(articleTag.getName(), "资讯");//只有资讯才显示
             }
         }
         EventBus.getDefault().register(this);
@@ -336,7 +305,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
 
         @Override
         public int getItemViewType(int position) {
-            Article article = (showAd ? allList : list).get(position);
+            Article article = list.get(position);
             return article.getType();
         }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -18,14 +18,12 @@ import com.baidu.location.LocationClientOption;
 import com.bumptech.glide.Glide;
 import com.danikula.videocache.HttpProxyCacheServer;
 import com.didi.virtualapk.PluginManager;
-import com.hoc.hoclib.PManager;
 import com.kfzs.cfyl.share_library.util.ContextHolder;
 import com.liulishuo.okdownload.OkDownload;
 import com.liulishuo.okdownload.core.dispatcher.DownloadDispatcher;
 import com.sheep.gamegroup.di.components.DaggerNetComponent;
 import com.sheep.gamegroup.di.components.NetComponent;
 import com.sheep.gamegroup.di.modules.NetModule;
-import com.sheep.gamegroup.module.ad_htxd.model.ArticleAd;
 import com.sheep.gamegroup.module.login.LoginAct;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.usage.AppUsageManager;
@@ -323,11 +321,6 @@ public class SheepApp extends MultiDexApplication {
 //        CacheFactory.setCacheManager(ExoPlayerCacheManager.class);//exo缓存模式，支持m3u8，只支持exo
 //        CacheFactory.setCacheManager(ProxyCacheManager.class);//代理缓存模式，支持所有模式，不支持m3u8等
 
-        //鸿途信达 广告 需要添加 两行代码顺序不能变
-        if (ArticleAd.showAd) {
-            PManager.getInstance().setChannel(this, 18122801);
-            PManager.getInstance().onCreate(this);
-        }
         //初始化换肤框架
         SkinUtil.init();
         //注册微信支付
@@ -523,8 +516,11 @@ public class SheepApp extends MultiDexApplication {
             if (activityRef != null) activityRef.clear();
             activityRef = new WeakReference<>(activity);
             if (mActivityCount == 1) { // 应用回到前台
-                if (getCurrentActivity() != null && !(getCurrentActivity() instanceof SplashAct)) { // 当前activity存在
-                    CommonUtil.getInstance().checkCopyText();
+                if (activity != null) {
+                    if (getCurrentActivity() instanceof SplashAct) { // 启动页面
+                    } else {
+                        CommonUtil.getInstance().checkCopyText();
+                    }
                 }
             }
         }
@@ -625,10 +621,6 @@ public class SheepApp extends MultiDexApplication {
         super.attachBaseContext(base);
         MultiDex.install(this);
         PluginManager.getInstance(base).init();//插件化框架
-        //鸿途信达 广告 需要添加
-        if (ArticleAd.showAd) {
-            PManager.getInstance().attachBaseContext(base);
-        }
     }
 
     //应用退出的回调(模拟器才会回调)

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

@@ -31,14 +31,14 @@
 
         <ImageView
             android:id="@+id/add_article_iv"
-            android:layout_width="120dp"
-            android:layout_height="120dp"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:src="@drawable/icon" />
 
         <ImageView
             android:id="@+id/add_article_expand"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:layout_alignTop="@id/add_article_iv"
             android:layout_alignEnd="@id/add_article_iv"
             android:src="@drawable/icon" />

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

@@ -22,8 +22,9 @@
             android:gravity="center"
             android:lineSpacingExtra="7dp"
             android:text="@string/audit_activity"
-            android:textColor="#333333"
-            android:textSize="15sp"
+            android:textColor="@color/black_444444"
+            android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -33,6 +34,7 @@
             android:layout_height="8dp"
             android:background="@drawable/shape_oval_red"
             android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/audit_activity" />
     </android.support.constraint.ConstraintLayout>
 
@@ -56,8 +58,9 @@
             android:gravity="center"
             android:lineSpacingExtra="7dp"
             android:text="@string/audit_success"
-            android:textColor="#333333"
-            android:textSize="15sp"
+            android:textColor="@color/black_444444"
+            android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -66,6 +69,7 @@
             android:layout_width="8dp"
             android:layout_height="8dp"
             android:background="@drawable/shape_oval_red"
+            app:layout_constraintTop_toTopOf="parent"
             android:visibility="gone"
             app:layout_constraintStart_toEndOf="@+id/audit_success" />
     </android.support.constraint.ConstraintLayout>
@@ -90,8 +94,9 @@
             android:gravity="center"
             android:lineSpacingExtra="7dp"
             android:text="@string/audit_failed"
-            android:textColor="#333333"
-            android:textSize="15sp"
+            android:textColor="@color/black_444444"
+            android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -101,6 +106,7 @@
             android:layout_height="8dp"
             android:background="@drawable/shape_oval_red"
             android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/audit_failed" />
     </android.support.constraint.ConstraintLayout>
 </LinearLayout>

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

@@ -136,7 +136,7 @@
                     android:layout_marginTop="30dp"
                     android:background="@drawable/new_year_drawable_selector_ask_tab_bg"
                     android:gravity="center"
-                    android:paddingBottom="4dp"
+                    android:paddingBottom="5dp"
                     android:text="邀请好友"
                     android:textColor="@color/new_year_selector_color_main_tab"
                     android:textSize="15sp"
@@ -152,7 +152,7 @@
                     android:layout_marginTop="30dp"
                     android:background="@drawable/new_year_drawable_selector_ask_tab_bg"
                     android:gravity="center"
-                    android:paddingBottom="4dp"
+                    android:paddingBottom="5dp"
                     android:text="好友列表"
                     android:textColor="@color/new_year_selector_color_main_tab"
                     android:textSize="15sp"

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

@@ -58,7 +58,7 @@
             android:gravity="start"
             android:singleLine="true"
             android:text="排行奖励"
-            android:textColor="#ffffff"
+            android:textColor="#80ffffff"
             android:textSize="12sp" />
 
     </LinearLayout>

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

@@ -235,7 +235,7 @@
 
     <style name="style_ash_line_tv">
         <item name="android:layout_width">18dp</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:background">@color/txt_gray_e6e4e4</item>
         <item name="android:layout_gravity">center_vertical</item>
     </style>
@@ -340,7 +340,7 @@
 
     <style name="style_item_line">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:layout_marginEnd">@dimen/content_padding</item>
         <item name="android:layout_marginStart">@dimen/content_padding</item>
         <item name="android:background">@color/white_bg_line</item>
@@ -348,14 +348,14 @@
 
     <style name="style_item_line_3_0">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:layout_marginStart">20dp</item>
         <item name="android:background">@color/white_bg_line</item>
     </style>
 
     <style name="style_item_line_new">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:layout_marginEnd">@dimen/content_padding</item>
         <item name="android:layout_marginStart">@dimen/content_padding_left_new</item>
         <item name="android:background">@color/white_bg_line</item>
@@ -363,7 +363,7 @@
 
     <style name="style_item_line_full">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:background">@color/white_bg_line</item>
     </style>
 

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

@@ -8,7 +8,7 @@
     <color name="black_191919">#191919</color>
     <color name="black_444444">#444444</color>
     <color name="black_666666">#666666</color>
-    <color name="white_bg_line">#dfdfdf</color>
+    <color name="white_bg_line">#e5e5e5</color>
     <color name="txt_red">#ff2d4b</color>
     <color name="txt_bule">#4889ff</color>
     <color name="bg_gray">#F9F9F9</color>

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.4.11
-VERSION_CODE=3004011
+VERSION_NAME=3.5.0
+VERSION_CODE=3005000
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_MIN_SDK_VERSION=17
 ANDORID_TARGET_SDK_VERSION=28