Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop_jenkins

# Conflicts:
#	app/build.gradle

app/build.gradle

@@ -443,6 +443,9 @@ android.applicationVariants.all {
     variant ->
         variant.outputs.all {
             output ->
+//                if (buildType.name == "release") {
                     outputFileName = "${productFlavors[0].name}_${buildType.name}_v${versionName}_${versionCode}-${releaseTime()}.apk"
+//                }
+
         }
 }

app/src/main/java/com/sheep/gamegroup/greendao/DDProviderHelper.java

@@ -14,8 +14,8 @@ import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
 import com.sheep.gamegroup.greendao.download.SearchRecord;
 import com.sheep.gamegroup.greendao.download.SearchRecordDao;
-import com.sheep.gamegroup.module.login.model.Account;
-import com.sheep.gamegroup.module.login.model.AccountDao;
+import com.sheep.gamegroup.greendao.download.Account;
+import com.sheep.gamegroup.greendao.download.AccountDao;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;

app/src/main/java/com/sheep/gamegroup/module/login/model/Account.java

@@ -1,10 +1,9 @@
-package com.sheep.gamegroup.module.login.model;
+package com.sheep.gamegroup.greendao.download;
 
 import com.sheep.gamegroup.model.entity.UserEntity;
 
 import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Id;
-import org.greenrobot.greendao.annotation.Keep;
 import org.greenrobot.greendao.annotation.Property;
 import org.greenrobot.greendao.annotation.Generated;
 

app/src/main/java/com/sheep/gamegroup/module/login/model/AccountDao.java

@@ -1,4 +1,4 @@
-package com.sheep.gamegroup.module.login.model;
+package com.sheep.gamegroup.greendao.download;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteStatement;
@@ -9,8 +9,6 @@ import org.greenrobot.greendao.internal.DaoConfig;
 import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.database.DatabaseStatement;
 
-import com.sheep.gamegroup.greendao.download.DaoSession;
-
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /** 
  * DAO for table "ACCOUNT".

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

@@ -11,7 +11,6 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.database.DatabaseOpenHelper;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 
-import com.sheep.gamegroup.module.login.model.AccountDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**

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

@@ -15,7 +15,7 @@ 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.module.login.model.Account;
+import com.sheep.gamegroup.greendao.download.Account;
 
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
@@ -24,7 +24,7 @@ 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;
-import com.sheep.gamegroup.module.login.model.AccountDao;
+import com.sheep.gamegroup.greendao.download.AccountDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 

app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -15,7 +15,7 @@ import com.sheep.gamegroup.module.login.fragments.FindAccountFgt;
 import com.sheep.gamegroup.module.login.fragments.SignInFgt;
 import com.sheep.gamegroup.module.login.fragments.SignUpFgt;
 import com.sheep.gamegroup.module.login.fragments.ValidCaptchaFgt;
-import com.sheep.gamegroup.module.login.model.Account;
+import com.sheep.gamegroup.greendao.download.Account;
 import com.sheep.gamegroup.util.CertificationUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TestUtil;
@@ -86,7 +86,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
         }
     }
 
-    private void getUserInfo(int platform, LoginEntity entity) {
+    private void getUserInfo(int platform, final LoginEntity entity) {
         if (platform == LoginController.PLATFORM_QQ || platform == LoginController.PLATFORM_WX) {
             UMShareAPI.get(SheepApp.getInstance()).getPlatformInfo(this,
                     platform == LoginController.PLATFORM_QQ ? SHARE_MEDIA.QQ : SHARE_MEDIA.WEIXIN,

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -22,7 +22,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.login.controller.LoginController;
-import com.sheep.gamegroup.module.login.model.Account;
+import com.sheep.gamegroup.greendao.download.Account;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;