[修改]替换优投广告SDK

app/src/main/AndroidManifest.xml

@@ -458,7 +458,6 @@
                 android:configChanges="orientation|screenSize"
                 android:exported="true"
                 android:screenOrientation="portrait"
-                android:process=":webProcess"
                 android:theme="@style/AppActionTheme"/>
         <activity
                 android:name="com.sheep.gamegroup.view.activity.ActWebX5YF"

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

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

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

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

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

@@ -22,14 +22,11 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
 import org.greenrobot.eventbus.EventBus;
-
 import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.functions.Action1;
+
 
 /**
  * 绑定微信或更改微信

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

@@ -203,7 +203,7 @@ public class SheepApp extends MultiDexApplication {
     public void onCreate() {
 //        configStrictMode();
         super.onCreate();
-        initWebViewDataDirectory(this);
+        //initWebViewDataDirectory(this);
         if (AppUtil.isMainProcess(this) || AppUtil.isWebProcess(this)) {
             boolean isNotSupport = Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR1;
             ContextHolder.setContext(this);

gradle.properties

@@ -19,9 +19,9 @@
 
 VERSION_NAME=3.8.3
 VERSION_CODE=3008003
-ANDROID_COMPILE_SDK_VERSION=28
+ANDROID_COMPILE_SDK_VERSION=30
 ANDROID_MIN_SDK_VERSION=18
-ANDORID_TARGET_SDK_VERSION=28
+ANDORID_TARGET_SDK_VERSION=30
 
 POM_DESCRIPTION=Android Library for cropping images
 POM_URL=https://github.com/Yalantis/uCrop