Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3

Browse Source 
Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java
This commit is contained in:
huangzhuanghua
2016-12-21 17:20:23 +08:00
parent 627f513da0 df1eec07e5
commit 46668e32f6
27 changed files with 919 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -31,7 +31,9 @@ import com.gh.common.util.DataLogUtils;
import com.gh.common.util.DataUtils;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.FileUtils;
import com.gh.common.util.GameUtils;
import com.gh.common.util.GiftUtils;
import com.gh.common.util.MD5Utils;
import com.gh.common.util.NetworkUtils;
import com.gh.common.util.PackageUtils;
import com.gh.common.util.PlatformUtils;
import com.gh.common.util.RandomUtils;
@ -41,6 +43,7 @@ import com.gh.download.DataWatcher;
import com.gh.download.DownloadEntity;
import com.gh.download.DownloadManager;
import com.gh.download.DownloadStatus;
import com.gh.gamecenter.db.GiftDao;
import com.gh.gamecenter.db.info.ConcernInfo;
import com.gh.gamecenter.db.info.GameInfo;
import com.gh.gamecenter.entity.ApkEntity;
@ -362,6 +365,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
UpdateManager.getInstance(this).checkUpdate(true);
}
if (isNewFirstLaunch) {
initCunHaoXiang();
getPluginUpdate();
// sp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getVersion(getApplicationContext()), false).apply();
}
@ -395,6 +399,11 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
Log.e("TD_CHANNEL_ID", (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID"));
}
private void initCunHaoXiang() {
GiftDao giftDao = new GiftDao(this);
GiftUtils.getCunHaoXiang(this, giftDao);
}
// 初始化关注
private void initConcern() {
RetrofitManager.getApi().getConcern(TokenUtils.getDeviceId(MainActivity.this))