upgrade ad sdk

app/src/main/AndroidManifest.xml

@@ -1017,27 +1017,27 @@
             android:theme="@android:style/Theme.Dialog" />
 
         <!-- =================点客广告SDK================== -->
-        <activity
-            android:name="com.tencent.tmsecure.dksdk.ad.TxRewardVideoActivity"
-            android:configChanges="keyboardHidden|navigation|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
-        <activity
-            android:name="com.tencent.tmsecure.dksdk.ad.TxDownCoinActivity"
-            android:configChanges="keyboardHidden|navigation|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
-        <activity
-            android:name="com.tencent.tmsecure.dksdk.ad.PlayGiveCoinActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/dk_dialogstyle" />
-        <activity
-            android:name="com.tencent.tmsecure.dksdk.ad.WebViewActivity"
-            android:configChanges="keyboardHidden|navigation|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:hardwareAccelerated="true"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+        <!--<activity-->
+            <!--android:name="com.tencent.tmsecure.dksdk.ad.TxRewardVideoActivity"-->
+            <!--android:configChanges="keyboardHidden|navigation|orientation|screenSize"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />-->
+        <!--<activity-->
+            <!--android:name="com.tencent.tmsecure.dksdk.ad.TxDownCoinActivity"-->
+            <!--android:configChanges="keyboardHidden|navigation|orientation|screenSize"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />-->
+        <!--<activity-->
+            <!--android:name="com.tencent.tmsecure.dksdk.ad.PlayGiveCoinActivity"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:configChanges="keyboardHidden|orientation|screenSize"-->
+            <!--android:theme="@style/dk_dialogstyle" />-->
+        <!--<activity-->
+            <!--android:name="com.tencent.tmsecure.dksdk.ad.WebViewActivity"-->
+            <!--android:configChanges="keyboardHidden|navigation|orientation|screenSize"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:hardwareAccelerated="true"-->
+            <!--android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />-->
     </application>
 
 </manifest>

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

@@ -22,7 +22,6 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
         SdkLoginUserDao.createTable(db, ifNotExists);
-        SheepAdDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
         AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
@@ -30,12 +29,12 @@ public class DaoMaster extends AbstractDaoMaster {
         ProcessRecordDao.createTable(db, ifNotExists);
         AccountDao.createTable(db, ifNotExists);
         ScreenShotRecordDao.createTable(db, ifNotExists);
+        SheepAdDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
         SdkLoginUserDao.dropTable(db, ifExists);
-        SheepAdDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
         AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
@@ -43,6 +42,7 @@ public class DaoMaster extends AbstractDaoMaster {
         ProcessRecordDao.dropTable(db, ifExists);
         AccountDao.dropTable(db, ifExists);
         ScreenShotRecordDao.dropTable(db, ifExists);
+        SheepAdDao.dropTable(db, ifExists);
     }
 
     /**
@@ -62,7 +62,6 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
         registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(SheepAdDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
@@ -70,6 +69,7 @@ public class DaoMaster extends AbstractDaoMaster {
         registerDaoClass(ProcessRecordDao.class);
         registerDaoClass(AccountDao.class);
         registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SheepAdDao.class);
     }
 
     public DaoSession newSession() {

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

@@ -9,7 +9,6 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
 import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.SheepAd;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
@@ -17,9 +16,9 @@ import com.sheep.gamegroup.greendao.download.SearchRecord;
 import com.sheep.gamegroup.greendao.download.ProcessRecord;
 import com.sheep.gamegroup.greendao.download.Account;
 import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.SheepAd;
 
 import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.SheepAdDao;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
@@ -27,6 +26,7 @@ import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
 import com.sheep.gamegroup.greendao.download.AccountDao;
 import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.SheepAdDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -38,7 +38,6 @@ import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
 public class DaoSession extends AbstractDaoSession {
 
     private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig sheepAdDaoConfig;
     private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
@@ -46,9 +45,9 @@ public class DaoSession extends AbstractDaoSession {
     private final DaoConfig processRecordDaoConfig;
     private final DaoConfig accountDaoConfig;
     private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sheepAdDaoConfig;
 
     private final SdkLoginUserDao sdkLoginUserDao;
-    private final SheepAdDao sheepAdDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
@@ -56,6 +55,7 @@ public class DaoSession extends AbstractDaoSession {
     private final ProcessRecordDao processRecordDao;
     private final AccountDao accountDao;
     private final ScreenShotRecordDao screenShotRecordDao;
+    private final SheepAdDao sheepAdDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
@@ -64,9 +64,6 @@ public class DaoSession extends AbstractDaoSession {
         sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
         sdkLoginUserDaoConfig.initIdentityScope(type);
 
-        sheepAdDaoConfig = daoConfigMap.get(SheepAdDao.class).clone();
-        sheepAdDaoConfig.initIdentityScope(type);
-
         acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
         acceptTaskRecordDaoConfig.initIdentityScope(type);
 
@@ -88,8 +85,10 @@ public class DaoSession extends AbstractDaoSession {
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
+        sheepAdDaoConfig = daoConfigMap.get(SheepAdDao.class).clone();
+        sheepAdDaoConfig.initIdentityScope(type);
+
         sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        sheepAdDao = new SheepAdDao(sheepAdDaoConfig, this);
         acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
@@ -97,9 +96,9 @@ public class DaoSession extends AbstractDaoSession {
         processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
         accountDao = new AccountDao(accountDaoConfig, this);
         screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sheepAdDao = new SheepAdDao(sheepAdDaoConfig, this);
 
         registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(SheepAd.class, sheepAdDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
@@ -107,11 +106,11 @@ public class DaoSession extends AbstractDaoSession {
         registerDao(ProcessRecord.class, processRecordDao);
         registerDao(Account.class, accountDao);
         registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SheepAd.class, sheepAdDao);
     }
     
     public void clear() {
         sdkLoginUserDaoConfig.clearIdentityScope();
-        sheepAdDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
         appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
@@ -119,16 +118,13 @@ public class DaoSession extends AbstractDaoSession {
         processRecordDaoConfig.clearIdentityScope();
         accountDaoConfig.clearIdentityScope();
         screenShotRecordDaoConfig.clearIdentityScope();
+        sheepAdDaoConfig.clearIdentityScope();
     }
 
     public SdkLoginUserDao getSdkLoginUserDao() {
         return sdkLoginUserDao;
     }
 
-    public SheepAdDao getSheepAdDao() {
-        return sheepAdDao;
-    }
-
     public AcceptTaskRecordDao getAcceptTaskRecordDao() {
         return acceptTaskRecordDao;
     }
@@ -157,4 +153,8 @@ public class DaoSession extends AbstractDaoSession {
         return screenShotRecordDao;
     }
 
+    public SheepAdDao getSheepAdDao() {
+        return sheepAdDao;
+    }
+
 }

app/src/main/java/com/sheep/gamegroup/module/task/fragments/FgtVideoTaskDK.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.module.task.fragments;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.stmsdk.module.ad.StyleAdEntity;
 import com.tencent.tmsecure.dksdk.ad.DkAdManage;
 import com.tencent.tmsecure.dksdk.util.DkAppDownloadListener;
 
@@ -71,7 +72,8 @@ public class FgtVideoTaskDK extends FgtVideoTaskBase implements DkAppDownloadLis
     }
 
     @Override
-    public void onAwakened(int i) {
+    public void onAwakened(StyleAdEntity styleAdEntity, int i) {
         LogUtil.logI("Video task onAwakened(" + i + ")");
     }
+
 }