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

1、修复AppController push被禁用的问题

Browse Source 
2、修复deprecated api call, Resources.getColor()
This commit is contained in:
CsHeng
2017-05-08 17:41:58 +08:00
parent 375f538bc1
commit 0ec14da2ac
41 changed files with 378 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
View File

@ -4,8 +4,9 @@ import android.app.ActionBar;
import android.app.ActionBar.LayoutParams;
import android.content.*;
import android.content.SharedPreferences.Editor;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.view.*;
@ -28,8 +29,7 @@ import rx.schedulers.Schedulers;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.*;
import static com.gh.common.util.EntranceUtils.KEY_DATA;
@ -45,6 +45,20 @@ public class SplashScreenActivity extends BaseActivity {
private boolean isFirst;
private boolean isNewFirstLaunch;
public static Intent[] getRedirectIntents(Context context, Uri uri) {
List<Intent> intentList = new ArrayList<>();
if (AppManager.getInstance().isEmpty()) {
intentList.add(BaseActivity.getReorderToFrontIntent(context, SplashScreenActivity.class));
intentList.add(BaseActivity.getReorderToFrontIntent(context, MainActivity.class));
}
// if (uri != null && !TextUtils.isEmpty(uri.toString())) {
// intentList.add(NavigationActivity.getNavigateUriIntent(context, uri));
// }
return intentList.toArray(new Intent[intentList.size()]);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -53,6 +67,11 @@ public class SplashScreenActivity extends BaseActivity {
super.onCreate(savedInstanceState);
// if (!AppManager.getInstance().isEmpty()) {
// redirectAndFinish(getRedirectIntents(this, getIntent().getData()));
// return;
// }
// 处理助手已经在后台运行导致的再次启动助手
if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
finish();
@ -70,14 +89,13 @@ public class SplashScreenActivity extends BaseActivity {
} else {
setTheme(R.style.AppFullScreenTheme);
// 自定义ActionBar
ActionBar mActionBar = getActionBar();
if (mActionBar != null) {
mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
RelativeLayout relativeLayout = new RelativeLayout(this);
relativeLayout.setBackgroundResource(R.color.theme);
LayoutParams params = new LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
mActionBar.setCustomView(relativeLayout, params);// 自定义ActionBar布局
LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
actionBar.setCustomView(relativeLayout, params);// 自定义ActionBar布局
}
}
@ -85,11 +103,18 @@ public class SplashScreenActivity extends BaseActivity {
ViewPager guideLayout = (ViewPager) findViewById(R.id.splash_intro_vp_guide);
guideLayout.setAdapter(new GuidePagerAdapter());
} else {
getTintManager().setStatusBarTintColor(getResources().getColor(R.color.theme));
getTintManager().setStatusBarTintColor(ContextCompat.getColor(getApplicationContext(), R.color.theme));
}
}
private void redirectAndFinish(final Intent... intent) {
if (intent != null && intent.length > 0) {
ContextCompat.startActivities(this, intent);
}
finish();
}
@Override
protected int getLayoutId() {