浏览代码

添加跳转简单奖励和高额任务页面deeplink

huangxi 5 年之前
父节点
当前提交
84ed451422

+ 12 - 12
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) {
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        SheepAdDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
+        AccountDao.createTable(db, ifNotExists);
         AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
         ProcessRecordDao.createTable(db, ifNotExists);
-        AccountDao.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) {
-        SdkLoginUserDao.dropTable(db, ifExists);
-        SheepAdDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
+        AccountDao.dropTable(db, ifExists);
         AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
         ProcessRecordDao.dropTable(db, ifExists);
-        AccountDao.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(SdkLoginUserDao.class);
-        registerDaoClass(SheepAdDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
+        registerDaoClass(AccountDao.class);
         registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
-        registerDaoClass(SearchRecordDao.class);
         registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(AccountDao.class);
         registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(SheepAdDao.class);
     }
 
     public DaoSession newSession() {

+ 56 - 56
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.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.SheepAd;
 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.DownLoadInfo;
-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.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
+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.AccountDao;
 import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
-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.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,102 +37,98 @@ 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 accountDaoConfig;
     private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
     private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig accountDaoConfig;
     private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig sheepAdDaoConfig;
 
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final SheepAdDao sheepAdDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
+    private final AccountDao accountDao;
     private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
-    private final SearchRecordDao searchRecordDao;
     private final ProcessRecordDao processRecordDao;
-    private final AccountDao accountDao;
     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);
 
-        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);
 
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
+
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.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);
 
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        sheepAdDao = new SheepAdDao(sheepAdDaoConfig, this);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
+
+        searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
+        searchRecordDaoConfig.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);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
         processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        accountDao = new AccountDao(accountDaoConfig, this);
         screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        sheepAdDao = new SheepAdDao(sheepAdDaoConfig, this);
 
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(SheepAd.class, sheepAdDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
+        registerDao(Account.class, accountDao);
         registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
-        registerDao(SearchRecord.class, searchRecordDao);
         registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(Account.class, accountDao);
         registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(SheepAd.class, sheepAdDao);
     }
     
     public void clear() {
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        sheepAdDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
+        accountDaoConfig.clearIdentityScope();
         appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
         processRecordDaoConfig.clearIdentityScope();
-        accountDaoConfig.clearIdentityScope();
         screenShotRecordDaoConfig.clearIdentityScope();
-    }
-
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
-    }
-
-    public SheepAdDao getSheepAdDao() {
-        return sheepAdDao;
+        sdkLoginUserDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
+        sheepAdDaoConfig.clearIdentityScope();
     }
 
     public AcceptTaskRecordDao getAcceptTaskRecordDao() {
         return acceptTaskRecordDao;
     }
 
+    public AccountDao getAccountDao() {
+        return accountDao;
+    }
+
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
@@ -141,20 +137,24 @@ public class DaoSession extends AbstractDaoSession {
         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 SearchRecordDao getSearchRecordDao() {
+        return searchRecordDao;
+    }
+
+    public SheepAdDao getSheepAdDao() {
+        return sheepAdDao;
+    }
+
 }

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -448,6 +448,9 @@ public class CommonUtil {
 
     public static final int JUMP_NEW_USER_TASK = -1;//新手任务
     public static final int JUMP_TRY_PLAY = 1;//试玩赚钱
+    public static final int GO_SIMPLE_GIFT = 23;//简单奖励
+    public static final int GO_HIGH_TASK = 24;//高额任务
+
     public static final int JUMP_ASK_FRIEND = 2;//邀请赚钱
     public static final int JUMP_LIE_MAKE = 3;//躺着赚钱
     public static final int JUMP_CREDIT_CARD = 4;//办卡赚钱
@@ -2627,6 +2630,12 @@ public class CommonUtil {
             case 1: // 跳转试玩赚钱
                 Jump2View.getInstance().goTryplayView(activity, null);
                 break;
+            case GO_SIMPLE_GIFT:
+                Jump2View.getInstance().goSimpleGift(activity, null);
+                break;
+            case GO_HIGH_TASK:
+                Jump2View.getInstance().goXianWanWeb(activity,null);
+                break;
             case 2: // 单个任务详情
                 ext = EntityUtils.getExtInfo(extString);
                 if (ext == null) {

+ 25 - 0
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -527,6 +527,29 @@ public class Jump2View {
         context.startActivity(intent);
         UMConfigUtils.Event.SHEEP_TASK_TRY.onEvent();
     }
+    /**
+     * 跳到简单奖励
+     *
+     * @param context
+     * @param o
+     */
+    public void goSimpleGift(Context context, Object o) {
+        Intent intent = new Intent(context, ActMiDong.class);
+        context.startActivity(intent);
+//        UMConfigUtils.Event.SHEEP_TASK_TRY.onEvent();
+    }
+
+    /**
+     * 跳到简单奖励
+     *
+     * @param context
+     * @param o
+     */
+    public void goHighTask(Context context, Object o) {
+        Intent intent = new Intent(context, ActMiDong.class);
+        context.startActivity(intent);
+//        UMConfigUtils.Event.SHEEP_TASK_TRY.onEvent();
+    }
 
     /**
      * 跳到试玩界面
@@ -3294,4 +3317,6 @@ public class Jump2View {
         intent.putExtra("appname", appName);
         activity.startActivity(intent);
     }
+
+
 }

+ 11 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/MiddleSchemeAct.java

@@ -189,6 +189,10 @@ public class MiddleSchemeAct extends Activity {
                 break;
             //跳转试玩赚钱
             //sheep://small.kfzs.com/xmy?type=jss&data={"Type":1}
+            //跳转简单奖励
+            //sheep://small.kfzs.com/xmy?type=jss&data={"Type":23}
+            //跳转高额任务
+            //sheep://small.kfzs.com/xmy?type=jss&data={"Type":24}
             //跳转连续任务
             //sheep://small.kfzs.com/xmy?type=jss&data={"Type":6}
             //跳转办卡赚钱
@@ -198,6 +202,13 @@ public class MiddleSchemeAct extends Activity {
             case "jump_slide_show"://跳转banner(主页banner或者游戏banner)
             case "jss":
                 try {
+                    LogUtil.logE(json);
+                    String try_play = BaseMessageConverter.encrypt("{\"Type\":1}");
+                    String simple_gift = BaseMessageConverter.encrypt("{\"Type\":23}");
+                    String high_task = BaseMessageConverter.encrypt("{\"Type\":24}");
+                    LogUtil.logE(try_play);
+                    LogUtil.logE(simple_gift);
+                    LogUtil.logE(high_task);
                     SlideshowEty item = JSONObject.parseObject(json, SlideshowEty.class);
                     CommonUtil.getInstance().clickBanner(context, item);
                 } catch (Exception e) {

+ 1 - 1
small_sheep_android.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="small_sheep_android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="small_sheep_android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>