Merge branch 'refs/heads/master' into v681小游戏
# Conflicts: # live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java # main/src/main/java/com/yunbao/main/activity/MainActivity.java
This commit is contained in:
@@ -2,6 +2,7 @@ package com.yunbao.main.activity;
|
||||
|
||||
import static com.yunbao.common.CommonAppContext.isReady;
|
||||
import static com.yunbao.common.manager.imrongcloud.RongcloudIMManager.connectIM;
|
||||
import static com.yunbao.common.server.DownloadService.DOWNLOAD_TAG;
|
||||
|
||||
import android.Manifest;
|
||||
import android.animation.Animator;
|
||||
@@ -913,6 +914,8 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
|
||||
}
|
||||
})
|
||||
).show();
|
||||
}else{
|
||||
SpUtil.setLongValue(DOWNLOAD_TAG, 0);
|
||||
}
|
||||
} else {
|
||||
requestBonus();
|
||||
@@ -927,9 +930,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
|
||||
}
|
||||
|
||||
DownloadService.ServiceBinder binder = null;
|
||||
|
||||
ServiceConnection connection=null;
|
||||
private void connectionInstallApkService() {
|
||||
ServiceConnection connection = new ServiceConnection() {
|
||||
connection = new ServiceConnection() {
|
||||
|
||||
@Override
|
||||
public void onServiceConnected(ComponentName name, IBinder service) {
|
||||
@@ -1170,6 +1173,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
|
||||
LiveStorge.getInstance().clear();
|
||||
VideoStorge.getInstance().clear();
|
||||
floatBanner.release();
|
||||
if(connection!=null){
|
||||
mContext.unbindService(connection);
|
||||
}
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user