|
@@ -120,12 +120,12 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
|
|
|
@Override
|
|
@Override
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
|
|
|
|
|
|
- if (ApexDriverApplication.sharedApplication().isLogin()) {
|
|
|
|
|
- setTheme(R.style.ApexDriverTheme);
|
|
|
|
|
- } else {
|
|
|
|
|
- setTheme(R.style.ApexDriverThemeWhite);
|
|
|
|
|
- autoSetupStatusBar = false;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (ApexDriverApplication.sharedApplication().isLogin()) {
|
|
|
|
|
+// setTheme(R.style.ApexDriverTheme);
|
|
|
|
|
+// } else {
|
|
|
|
|
+// setTheme(R.style.ApexDriverThemeWhite);
|
|
|
|
|
+// autoSetupStatusBar = false;
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
super.onCreate(savedInstanceState);
|
|
super.onCreate(savedInstanceState);
|
|
|
setContentView(R.layout.activity_main);
|
|
setContentView(R.layout.activity_main);
|
|
@@ -181,15 +181,15 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
|
|
|
|
|
|
|
|
private void setupLoginAppearance() {
|
|
private void setupLoginAppearance() {
|
|
|
|
|
|
|
|
- changeStatusBarGradient();
|
|
|
|
|
|
|
+// changeStatusBarGradient();
|
|
|
|
|
|
|
|
android.support.v7.app.ActionBar actionBar = getSupportActionBar();
|
|
android.support.v7.app.ActionBar actionBar = getSupportActionBar();
|
|
|
if(actionBar != null){
|
|
if(actionBar != null){
|
|
|
actionBar.setElevation(0); // 5.0以上隐藏分割线
|
|
actionBar.setElevation(0); // 5.0以上隐藏分割线
|
|
|
|
|
|
|
|
// 将图像渲染成白色
|
|
// 将图像渲染成白色
|
|
|
- Drawable drawable = getResources().getDrawable(R.drawable.apexlogo_large);
|
|
|
|
|
- ImageUtil.renderingDrawable(drawable,getResources(),R.color.ApexDriverWhite);
|
|
|
|
|
|
|
+ Drawable drawable = getResources().getDrawable(R.drawable.apex_logo);
|
|
|
|
|
+// ImageUtil.renderingDrawable(drawable,getResources(),R.color.ApexDriverWhite);
|
|
|
|
|
|
|
|
actionBar.setHomeAsUpIndicator(drawable);
|
|
actionBar.setHomeAsUpIndicator(drawable);
|
|
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
|
@@ -205,14 +205,14 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
|
|
|
|
|
|
|
|
private void setupLogoutAppearance() {
|
|
private void setupLogoutAppearance() {
|
|
|
|
|
|
|
|
- changeStatusBarNormal();
|
|
|
|
|
|
|
+// changeStatusBarNormal();
|
|
|
|
|
|
|
|
android.support.v7.app.ActionBar actionBar = getSupportActionBar();
|
|
android.support.v7.app.ActionBar actionBar = getSupportActionBar();
|
|
|
if(actionBar != null){
|
|
if(actionBar != null){
|
|
|
actionBar.setElevation(1); // 5.0以上隐藏分割线
|
|
actionBar.setElevation(1); // 5.0以上隐藏分割线
|
|
|
|
|
|
|
|
- Drawable drawable = getResources().getDrawable(R.drawable.apexlogo_large);
|
|
|
|
|
- ImageUtil.clearDrawableRendering(drawable);
|
|
|
|
|
|
|
+ Drawable drawable = getResources().getDrawable(R.drawable.apex_logo);
|
|
|
|
|
+// ImageUtil.clearDrawableRendering(drawable);
|
|
|
|
|
|
|
|
actionBar.setHomeAsUpIndicator(drawable);
|
|
actionBar.setHomeAsUpIndicator(drawable);
|
|
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
|
@@ -271,7 +271,7 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
|
|
|
|
|
|
|
|
setupLoginAppearance();
|
|
setupLoginAppearance();
|
|
|
|
|
|
|
|
- restart();
|
|
|
|
|
|
|
+// restart();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -289,7 +289,7 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
|
|
|
|
|
|
|
|
setupLogoutAppearance();
|
|
setupLogoutAppearance();
|
|
|
|
|
|
|
|
- restart();
|
|
|
|
|
|
|
+// restart();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|