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

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,26 +21,26 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        ProcessRecordDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
         AccountDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
+        ProcessRecordDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
+        SearchRecordDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        ProcessRecordDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
         AccountDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
+        ProcessRecordDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
+        SearchRecordDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AccountDao.class);
-        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(SearchRecordDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.Account;
-import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AccountDao;
-import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
     private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig accountDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
 
-    private final ProcessRecordDao processRecordDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AccountDao accountDao;
-    private final SearchRecordDao searchRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
+    private final ProcessRecordDao processRecordDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
+    private final SearchRecordDao searchRecordDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
         acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         accountDao = new AccountDao(accountDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
 
-        registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(Account.class, accountDao);
-        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(SearchRecord.class, searchRecordDao);
     }
     
     public void clear() {
-        processRecordDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
         accountDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
+        processRecordDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
 }

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

@@ -771,7 +771,7 @@ public interface ApiService {
     /**
      * 获取标签列表
      */
-    @GET("app/find/articles_tags/list")
+    @GET(ApiKey.articles_tags)
     Observable<BaseMessage> getFindTagList();
 
     /**

app/src/main/java/com/sheep/gamegroup/model/entity/DiscoveryVideo.java

@@ -1,8 +1,13 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.net.Uri;
 import android.support.annotation.Nullable;
 
+import com.kfzs.duanduan.utils.NumberFormatUtils;
+
 import java.io.Serializable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Created by realicing on 2018/11/27.
@@ -230,6 +235,42 @@ public class DiscoveryVideo implements Serializable {
         return obj instanceof DiscoveryVideo && ((DiscoveryVideo) obj).getId() == id;
     }
 
+
+
+    private int width;
+    private int height;
+    private int orientation;
+
+    private void initVideoInfo(){
+        if(width == 0 || height == 0 || orientation == 0 && cover != null){
+            Uri uri = Uri.parse(cover);
+            width = (int) NumberFormatUtils.parseFloat(uri.getQueryParameter("w"));
+            height = (int) NumberFormatUtils.parseFloat(uri.getQueryParameter("h"));
+            Pattern p = Pattern.compile("/rotate/(.*?)\\&");
+            Matcher m = p.matcher(cover);
+            if(m.find()) {
+                String result = m.group(1);
+                orientation = (int) NumberFormatUtils.parseFloat(result);
+//                String result = m.group(0);
+//                orientation = (int) NumberFormatUtils.parseFloat(result.substring("/rotate/".length(), result.length() - 1));
+            }
+        }
+    }
+    public int getWidth() {
+        initVideoInfo();
+        return width;
+    }
+
+    public int getHeight() {
+        initVideoInfo();
+        return height;
+    }
+
+    public int getOrientation() {
+        initVideoInfo();
+        return orientation;
+    }
+
     //非通过状态
     public boolean isInAudit() {
         return status != 1;

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

@@ -970,6 +970,7 @@ public class Jump2View {
         Intent intent = new Intent(context, ActWebX5.class);
         intent.putExtra(IJumpWeb.KEY_URL, url);
         intent.putExtra(IJumpWeb.KEY_TITLE, TextUtils.isEmpty(title) ? "加载中..." : title);
+        intent.putExtra(IJumpWeb.KEY_NEEDJSINTERACT, true);
         context.startActivity(intent);
     }
 
@@ -1135,7 +1136,7 @@ public class Jump2View {
     /**
      * 显示多张图片
      *
-     * @param context
+     * @param activity
      * @param position
      * @param imgList
      */

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

@@ -56,7 +56,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.Call;
-import okhttp3.Response;
 import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.UPGRADE_DIALOG_BT;
@@ -262,32 +261,23 @@ public class SysAppUtil {
     }
 
     public static void checkNet(AbsObserver<Integer> action1) {
-        Observable.just(1)
-                .map(new Function<Integer, Integer>() {
-                    @Override
-                    public Integer apply(Integer integer) throws Exception {
-                        int result;
-                        try {
-                            Response response = OkHttpUtils.get().url("http://www.baidu.com").build().execute();
-                            result = response.isSuccessful() ? 0 : -1;
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                            result = -2;
-                        }
-                        switch (result){
-                            case 0://有网
-                                NetUtil.CAN_CONNECT_SERVICE = true;
-                                break;
-                            default://无网
-                                NetUtil.CAN_CONNECT_SERVICE = false;
-                                break;
-                        }
-                        return result;
-                    }
-                })
+        //发现中获取该接口有个bug，如果一开始有数据，等到服务器数据发生变化时，就会始终使用老的数据，除非有缓存时长限制，但是这样又导致数据不是最新的，所以在SysAppUtil中的checkNet方法直接更新该列表。
+        SheepApp.getInstance().getNetComponent().getApiService().getFindTagList()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(action1);
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        NetUtil.CAN_CONNECT_SERVICE = true;
+                        action1.onNext(0);
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        NetUtil.CAN_CONNECT_SERVICE = false;
+                        action1.onNext(-1);
+                    }
+                });
     }
 
     public static List<AppInfo> getAppInfos(){

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

@@ -139,7 +139,8 @@ public class ActMain extends BaseActYmPermissionCheck {
 //        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && G.checkDeviceHasNavigationBar(this)) {
 //            main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(this) - G.getNoHasVirtualKey(this));
 //        }
-        CommonUtil.getInstance().initMiDong(this, DataUtil.getInstance().getUserId());
+        if(!TestUtil.isDev())
+            CommonUtil.getInstance().initMiDong(this, DataUtil.getInstance().getUserId());
     }
 
     @Override

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

@@ -209,7 +209,8 @@ public class ActPublishArticle extends BaseActivity {
                             b = video.getWidth();
                             break;
                     }
-                    jsonObject.put("cover", String.format(Locale.CHINA, "%s?vframe/jpg/offset/0&w=%d&h=%d", url, a, b));
+                    int rotate = 360 - Math.max(0, video.getOrientation());
+                    jsonObject.put("cover", String.format(Locale.CHINA, "%s?vframe/jpg/offset/0/rotate/%d&w=%d&h=%d", url, rotate, a, b));
                     publishArticle(dialogProgress);
                 } else {
                     ViewUtil.setText(dialogProgress.getTextView(), "上传失败");

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

@@ -94,6 +94,7 @@ public class ActVideoDetail extends BaseUMActivity implements MediaPlayer.OnInfo
     private int video_id;
     private int user_id;
     private String video_url;
+    private int orientation = 0;
     private DiscoveryVideo newVideo;
     private ArrayList<DiscoveryVideo> videoList;
     private int position;
@@ -117,6 +118,7 @@ public class ActVideoDetail extends BaseUMActivity implements MediaPlayer.OnInfo
         video_id = lastVideo.getId();
         user_id = lastVideo.getUser_id();
         video_url = lastVideo.getResource();
+        orientation = lastVideo.getOrientation();
         loadVideoData(lastVideo);
     }
 
@@ -144,6 +146,12 @@ public class ActVideoDetail extends BaseUMActivity implements MediaPlayer.OnInfo
         videoView.setOnCompletionListener(this);
 //        videoView.setMediaController(new MediaController(this));
         videoView.setVideoURI(getUri());
+        resetVideoOrientation();
+    }
+    //重新设置视频的方向,videoView没法设置方向
+    private void resetVideoOrientation(){
+//        if(orientation > 0 && orientation < 360)
+//            videoView.setRotation(orientation);
     }
     //转化地址
     private Uri getUri(){
@@ -311,7 +319,11 @@ public class ActVideoDetail extends BaseUMActivity implements MediaPlayer.OnInfo
     @Override
     protected void onResume() {
         super.onResume();
-        //更新评论数量
+        updateVideoCommentNo();
+    }
+
+    //更新评论数量
+    private void updateVideoCommentNo() {
         SheepApp.getInstance().getNetComponent().getApiService().getGameUserAppCommentList(1,1, video_id, ApiJSONUtil.COMMENT_TYPE_VIDEO)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -471,6 +483,7 @@ public class ActVideoDetail extends BaseUMActivity implements MediaPlayer.OnInfo
                     videoView.setVideoURI(getUri());
                     videoView.requestFocus();
                     updateVideo();
+                    updateVideoCommentNo();
                 }
             } else if (event2.getX() - event1.getX() > FLING_MIN_DISTANCE
                     && Math.abs(velocityX) > FLING_MIN_VELOCITY) {
@@ -488,6 +501,7 @@ public class ActVideoDetail extends BaseUMActivity implements MediaPlayer.OnInfo
                     videoView.setVideoURI(getUri());
                     videoView.requestFocus();
                     updateVideo();
+                    updateVideoCommentNo();
                 }
             } else if (event2.getY() - event1.getY() > FLING_MIN_DISTANCE
                     && Math.abs(velocityY) > FLING_MIN_VELOCITY) {

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

@@ -126,7 +126,7 @@ public class FgtFind extends BaseFragment {
     private void initData() {
         //尝试获取缓存数据
         List<ArticleTag> newList = DataUtil.getInstance().getCacheList(ApiKey.articles_tags, ArticleTag.class);
-        if (ListUtil.isEmpty(newList)) {
+        if (ListUtil.isEmpty(newList)) {//这里有个bug，如果一开始有数据，等到服务器数据发生变化时，就会始终使用老的数据，除非有缓存时长限制，但是这样又导致数据不是最新的，所以在SysAppUtil中的checkNet方法直接更新该列表。
             initNetData(true);
         } else {
             list.addAll(newList);

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

@@ -18,6 +18,5 @@
         android:textSize="13sp"
         android:text="@string/sign_active_rule_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sign_rule_title_bar" />
+        app:layout_constraintStart_toStartOf="parent" />
 </android.support.constraint.ConstraintLayout>

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

@@ -16,7 +16,7 @@
             android:id="@+id/credit_card_task_list_tip_tv_1"
             style="@style/style_circle_main_tv"
             android:text="申请办卡"
-            app:layout_constraintStart_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/credit_card_task_list_tip_tv_2"
             app:layout_constraintBottom_toBottomOf="parent"/>
         <TextView

media/app/build.gradle

@@ -14,8 +14,8 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         ndk {
-//            abiFilters "armeabi-v7a"
-            abiFilters 'x86'
+            abiFilters "armeabi-v7a"
+//            abiFilters 'x86'
 //            abiFilters "armeabi-v7a"//, 'x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
     }