diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f2ed705..e3ad615 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -157,7 +157,7 @@ android:allowBackup="false" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/AppNotTransparentTheme" > + android:theme="@android:style/Theme.Holo.Light.NoActionBar" > diff --git a/res/drawable/selector_common_back_black_btn.xml b/res/drawable/selector_common_back_black_btn.xml index cde619c..d0a891c 100644 --- a/res/drawable/selector_common_back_black_btn.xml +++ b/res/drawable/selector_common_back_black_btn.xml @@ -1,5 +1,5 @@ - + diff --git a/res/drawable/selector_common_back_white_btn.xml b/res/drawable/selector_common_back_white_btn.xml index 94a1b9a..61622f7 100644 --- a/res/drawable/selector_common_back_white_btn.xml +++ b/res/drawable/selector_common_back_white_btn.xml @@ -1,5 +1,5 @@ - + diff --git a/res/drawable/selector_common_blue_bold_btn.xml b/res/drawable/selector_common_blue_bold_btn.xml index ff1762d..dd68c70 100644 --- a/res/drawable/selector_common_blue_bold_btn.xml +++ b/res/drawable/selector_common_blue_bold_btn.xml @@ -1,4 +1,5 @@ + diff --git a/res/drawable/selector_common_transparent_btn.xml b/res/drawable/selector_common_transparent_btn.xml new file mode 100644 index 0000000..b9ae210 --- /dev/null +++ b/res/drawable/selector_common_transparent_btn.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/activity_base_container.xml b/res/layout/activity_base_container.xml new file mode 100644 index 0000000..f8a5c75 --- /dev/null +++ b/res/layout/activity_base_container.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/activity_common_webpage.xml b/res/layout/activity_common_webpage.xml index 128b36f..1cc86a7 100644 --- a/res/layout/activity_common_webpage.xml +++ b/res/layout/activity_common_webpage.xml @@ -42,27 +42,27 @@ android:background="@android:color/transparent" android:contentDescription="@null" android:src="@drawable/common_share" /> + + + + - - - - + android:layout_below="@+id/rl_webview_title_bar" > + android:orientation="vertical" + android:visibility="gone" > + + + + @@ -38,9 +51,8 @@ android:layout_toRightOf="@+id/ll_left_btns" android:ellipsize="end" android:gravity="left|center_vertical" - android:maxLength="20" android:singleLine="true" - android:text="标题栏" + android:text="" android:textColor="@color/white" android:textSize="20sp" /> @@ -61,7 +73,7 @@ android:layout_width="50dp" android:layout_height="match_parent" android:background="@drawable/selector_common_fav_white_btn" - android:button="@null" + android:button="@drawable/selector_common_transparent_btn" android:checked="false" android:textColor="#666666" android:textSize="16.67sp" @@ -73,7 +85,7 @@ android:layout_width="50dp" android:layout_height="match_parent" android:background="@drawable/selector_common_share_white_btn" - android:button="@null" + android:button="@drawable/selector_common_transparent_btn" android:checked="false" android:textColor="#666666" android:textSize="16.67sp" diff --git a/res/values/colors_common.xml b/res/values/colors_common.xml index 7c90e01..52b61ca 100644 --- a/res/values/colors_common.xml +++ b/res/values/colors_common.xml @@ -148,4 +148,5 @@ #000080 #000000 #70000000 + #0C000000 diff --git a/src/com/zftlive/android/Launcher.java b/src/com/zftlive/android/Launcher.java index 3a20032..bd7fa7a 100644 --- a/src/com/zftlive/android/Launcher.java +++ b/src/com/zftlive/android/Launcher.java @@ -36,6 +36,9 @@ public class Launcher extends BaseActivity { @Override public void initView(View view) { + //隐藏标题栏 + hiddeTitleBar(); + //添加动画效果 AlphaAnimation animation = new AlphaAnimation(0.3f, 1.0f); animation.setDuration(2000); diff --git a/src/com/zftlive/android/common/FeedbackActivity.java b/src/com/zftlive/android/common/FeedbackActivity.java index 14bee9f..31f1a76 100644 --- a/src/com/zftlive/android/common/FeedbackActivity.java +++ b/src/com/zftlive/android/common/FeedbackActivity.java @@ -51,7 +51,8 @@ public class FeedbackActivity extends BaseActivity{ //初始化返回按钮 String strCenterTitle = getResources().getString(R.string.FeedbackActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/common/GuideActivity.java b/src/com/zftlive/android/common/GuideActivity.java index 57dee68..2f38ea1 100644 --- a/src/com/zftlive/android/common/GuideActivity.java +++ b/src/com/zftlive/android/common/GuideActivity.java @@ -47,10 +47,13 @@ public class GuideActivity extends BaseActivity { public void run() { finish(); } - }, 2000); + }, 300); } } }); + + //隐藏标题栏 + hiddeTitleBar(); } @Override diff --git a/src/com/zftlive/android/library/base/BaseActivity.java b/src/com/zftlive/android/library/base/BaseActivity.java index 3520e48..3d63dda 100644 --- a/src/com/zftlive/android/library/base/BaseActivity.java +++ b/src/com/zftlive/android/library/base/BaseActivity.java @@ -9,16 +9,18 @@ import android.content.Context; import android.os.Bundle; import android.support.v4.app.FragmentActivity; import android.util.Log; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewConfiguration; +import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; +import android.widget.TextView; import com.zftlive.android.library.MApplication; -import com.zftlive.android.library.tools.ToolResource; import com.zftlive.android.library.widget.SwipeBackLayout; /** @@ -35,7 +37,7 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi /** 当前Activity的弱引用，防止内存泄露 **/ private WeakReference context = null; /** 当前Activity渲染的视图View **/ - private View mContextView = null; + private ViewGroup mContextView = null; /** 动画类型 **/ private int mAnimationType = NONE; /** 是否运行截屏 **/ @@ -54,7 +56,12 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi // 获取应用Application mApplication = (MApplication) getApplicationContext(); - + + // 设置渲染视图View + int baseLayout = BaseView.gainResId(mApplication, BaseView.LAYOUT, "activity_base_container"); + mContextView = (ViewGroup)LayoutInflater.from(this).inflate(baseLayout, null); + setContentView(mContextView); + // 将当前Activity压入栈 context = new WeakReference(this); mApplication.pushTask(context); @@ -70,15 +77,13 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi bundle = new Bundle(); } initParms(bundle); - - // 设置渲染视图View + View mView = bindView(); if (null == mView) { - mContextView = LayoutInflater.from(this).inflate(bindLayout(), null); - } else { - mContextView = mView; + mView = LayoutInflater.from(this).inflate(bindLayout(), null); } - setContentView(mContextView); + ViewGroup mContent = (ViewGroup) findViewById(BaseView.gainResId(mApplication, BaseView.ID, "fl_content")); + mContent.addView(mView); // 初始化控件 initView(mContextView); @@ -99,7 +104,7 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi public View bindView() { return null; } - + @Override protected void onRestart() { super.onRestart(); @@ -118,6 +123,11 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi Log.d(TAG, "BaseActivity-->onResume()"); resume(); } + + @Override + public void resume() { + + } @Override protected void onPause() { @@ -140,6 +150,11 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi mApplication.removeTask(context); } + @Override + public void destroy() { + + } + /** * 显示Actionbar菜单图标 */ @@ -205,6 +220,76 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi this.isCanScreenshot = isCanScreenshot; } + /** + * 隐藏标题栏 + */ + public void hiddeTitleBar(){ + //标题栏容器 + View mTitleBarContainer = findViewById(BaseView.gainResId(mApplication, BaseView.ID, "ll_title")); + if(null == mTitleBarContainer){ + return; + } + mTitleBarContainer.setVisibility(View.GONE); + } + + /** + * 初始化返回按钮+标题左对齐 + * @param strTitle 标题名称 + * @param mBtnClickListener Home/Menu按钮点击监听事件 + */ + public void initHomeMenuTitleBar(String strTitle,View.OnClickListener mBtnClickListener){ + View mMenuBtn = findViewById(BaseView.gainResId(mApplication, BaseView.ID, "iv_menu")); + mMenuBtn.setVisibility(View.VISIBLE); + if(null != mBtnClickListener){ + mMenuBtn.setOnClickListener(mBtnClickListener); + } + View mBackBtn = findViewById(BaseView.gainResId(mApplication, BaseView.ID, "iv_back")); + mBackBtn.setVisibility(View.GONE); + + //标题 + TextView mTitleText = (TextView)findViewById(BaseView.gainResId(mApplication, BaseView.ID, "tv_title")); + mTitleText.setText(strTitle); + } + + /** + * 初始化返回按钮+标题左对齐 + * @param strTitle 标题名称 + */ + public void initBackTitleBar(String strTitle){ + initBackTitleBar(strTitle,Gravity.LEFT|Gravity.CENTER_VERTICAL); + } + + /** + * 初始化返回按钮+指定标题文本对齐方式 + * @param strTitle 标题名称 + * @param mGravity 标题文本对其方式 Gravity.LEFT|Gravity.CENTER_VERTICAL + */ + public void initBackTitleBar(String strTitle,int mGravity){ + //设置标题 + TextView mTitleText = (TextView)findViewById(BaseView.gainResId(mApplication, BaseView.ID, "tv_title")); + mTitleText.setText(strTitle); + mTitleText.setGravity(mGravity); + + //设置点击事件 + View mBackBtn = findViewById(BaseView.gainResId(mApplication, BaseView.ID, "iv_back")); + mBackBtn.setVisibility(View.VISIBLE); + mBackBtn.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + finish(); + } + }); + } + + /** + * 获取标题栏容器，可以自行控制左右按钮和布局 + * @return + */ + public ViewGroup gainTitleBarVG(){ + return (ViewGroup)findViewById(BaseView.gainResId(mApplication, BaseView.ID, "ll_title")); + } + /** * Actionbar点击返回键关闭事件 */ @@ -227,13 +312,16 @@ public abstract class BaseActivity extends FragmentActivity implements IBaseActi super.finish(); switch (mAnimationType) { case IBaseActivity.LEFT_RIGHT: - overridePendingTransition(0, BaseView.gainResId(mApplication, BaseView.ANIM, "base_slide_right_out")); + overridePendingTransition(0, + BaseView.gainResId(mApplication, BaseView.ANIM, "base_slide_right_out")); break; case IBaseActivity.TOP_BOTTOM: - overridePendingTransition(0, BaseView.gainResId(mApplication, BaseView.ANIM, "base_push_up_out")); + overridePendingTransition(0, + BaseView.gainResId(mApplication, BaseView.ANIM, "base_push_up_out")); break; case IBaseActivity.FADE_IN_OUT: - overridePendingTransition(0, BaseView.gainResId(mApplication, BaseView.ANIM, "base_fade_out")); + overridePendingTransition(0, + BaseView.gainResId(mApplication, BaseView.ANIM, "base_fade_out")); break; default: break; diff --git a/src/com/zftlive/android/library/common/ActionBarManager.java b/src/com/zftlive/android/library/common/ActionBarManager.java index 0034487..7e18d5e 100644 --- a/src/com/zftlive/android/library/common/ActionBarManager.java +++ b/src/com/zftlive/android/library/common/ActionBarManager.java @@ -1,5 +1,7 @@ package com.zftlive.android.library.common; +import com.zftlive.android.R; + import android.app.ActionBar; import android.app.ActionBar.LayoutParams; import android.content.Context; @@ -10,107 +12,121 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import com.zftlive.android.R; /** * ActionBar管理器 + * * @author 曾繁添 * @version 1.0 - * + * */ public class ActionBarManager { - - /** - * 设置居中标题 - * @param mContext 上下文 - * @param actionBar actionbar - * @param strCenterTitle 中间居中显示标题 - */ - public static void initTitleCenterActionBar(Context mContext,ActionBar actionBar,String strCenterTitle){ - LayoutInflater inflator = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View centerTitle = inflator.inflate(R.layout.view_actionbar_title, null); - TextView title = (TextView) centerTitle.findViewById(R.id.actionbar_title); - title.setText(strCenterTitle); - ActionBar.LayoutParams layoutParams = new ActionBar.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - layoutParams.gravity = Gravity.CENTER_HORIZONTAL; - - actionBar.setDisplayShowCustomEnabled(true); - actionBar.setCustomView(centerTitle,layoutParams); - } - - /** - * 更新ActionBar中间标题 - * @param mContext 上下文 - * @param actionBar actionbar - * @param strCenterTitle 中间居中显示标题 - */ - public static void updateActionCenterTitle(Context mContext,ActionBar actionBar,String strCenterTitle){ - ((TextView)actionBar.getCustomView().findViewById(R.id.actionbar_title)).setText(strCenterTitle); - } - - /** - * 订制一个返回+标题的标题栏 - * @param mContext - * @param actionBar - * @param strCenterTitle - */ - public static void initMenuListTitle(Context mContext,ActionBar actionBar,String strCenterTitle){ - actionBar.setDisplayHomeAsUpEnabled(false); - actionBar.setDisplayShowHomeEnabled(true); - actionBar.setDisplayShowTitleEnabled(false); - actionBar.setHomeButtonEnabled(false); - actionBar.setLogo(R.drawable.ic_list_white_48dp); - actionBar.setDisplayUseLogoEnabled(true); - initTitleCenterActionBar(mContext,actionBar,strCenterTitle); - } - - /** - * 订制一个返回+标题的标题栏 - * @param mContext - * @param actionBar - * @param strCenterTitle - */ - public static void initBackTitle(Context mContext,ActionBar actionBar,String strCenterTitle){ - actionBar.setTitle("返回"); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowHomeEnabled(false); - actionBar.setDisplayShowTitleEnabled(true); - initTitleCenterActionBar(mContext,actionBar,strCenterTitle); - } - - /** - * 初始化【提交】右侧按钮菜单 - * @param mOptionsMenu - */ - public static void initActionBarSubmitButton(Menu mOptionsMenu){ - final MenuItem aboutItem = mOptionsMenu.findItem(R.id.action_about); - if(null != aboutItem){ - aboutItem.setVisible(false); - } - - final MenuItem searchItem = mOptionsMenu.findItem(R.id.action_search); - if(null != searchItem){ - searchItem.setVisible(false); - } - - final MenuItem favItem = mOptionsMenu.findItem(R.id.action_fav); - if(null != favItem){ - favItem.setVisible(false); - } - - final MenuItem settingItem = mOptionsMenu.findItem(R.id.action_settings); - if(null != settingItem){ - settingItem.setVisible(false); - } - - final MenuItem shareItem = mOptionsMenu.findItem(R.id.action_share); - if(null != shareItem){ - shareItem.setVisible(false); - } - - final MenuItem submitItem = mOptionsMenu.findItem(R.id.action_submit); - if(null != submitItem){ - submitItem.setVisible(true); - } - } + + /** + * 设置居中标题 + * + * @param mContext 上下文 + * @param actionBar actionbar + * @param strCenterTitle 中间居中显示标题 + */ + public static void initTitleCenterActionBar(Context mContext, ActionBar actionBar, + String strCenterTitle) { + if (null == actionBar) return; + LayoutInflater inflator = + (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View centerTitle = inflator.inflate(R.layout.view_actionbar_title, null); + TextView title = (TextView) centerTitle.findViewById(R.id.actionbar_title); + title.setText(strCenterTitle); + ActionBar.LayoutParams layoutParams = + new ActionBar.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + layoutParams.gravity = Gravity.CENTER_HORIZONTAL; + + actionBar.setDisplayShowCustomEnabled(true); + actionBar.setCustomView(centerTitle, layoutParams); + } + + /** + * 更新ActionBar中间标题 + * + * @param mContext 上下文 + * @param actionBar actionbar + * @param strCenterTitle 中间居中显示标题 + */ + public static void updateActionCenterTitle(Context mContext, ActionBar actionBar, + String strCenterTitle) { + if (null == actionBar) return; + ((TextView) actionBar.getCustomView().findViewById(R.id.actionbar_title)) + .setText(strCenterTitle); + } + + /** + * 订制一个返回+标题的标题栏 + * + * @param mContext + * @param actionBar + * @param strCenterTitle + */ + public static void initMenuListTitle(Context mContext, ActionBar actionBar, String strCenterTitle) { + if (null == actionBar) return; + actionBar.setDisplayHomeAsUpEnabled(false); + actionBar.setDisplayShowHomeEnabled(true); + actionBar.setDisplayShowTitleEnabled(false); + actionBar.setHomeButtonEnabled(false); + actionBar.setLogo(R.drawable.ic_list_white_48dp); + actionBar.setDisplayUseLogoEnabled(true); + initTitleCenterActionBar(mContext, actionBar, strCenterTitle); + } + + /** + * 订制一个返回+标题的标题栏 + * + * @param mContext + * @param actionBar + * @param strCenterTitle + */ + public static void initBackTitle(Context mContext, ActionBar actionBar, String strCenterTitle) { + if (null == actionBar) return; + actionBar.setTitle("返回"); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(false); + actionBar.setDisplayShowTitleEnabled(true); + initTitleCenterActionBar(mContext, actionBar, strCenterTitle); + } + + /** + * 初始化【提交】右侧按钮菜单 + * + * @param mOptionsMenu + */ + public static void initActionBarSubmitButton(Menu mOptionsMenu) { + final MenuItem aboutItem = mOptionsMenu.findItem(R.id.action_about); + if (null != aboutItem) { + aboutItem.setVisible(false); + } + + final MenuItem searchItem = mOptionsMenu.findItem(R.id.action_search); + if (null != searchItem) { + searchItem.setVisible(false); + } + + final MenuItem favItem = mOptionsMenu.findItem(R.id.action_fav); + if (null != favItem) { + favItem.setVisible(false); + } + + final MenuItem settingItem = mOptionsMenu.findItem(R.id.action_settings); + if (null != settingItem) { + settingItem.setVisible(false); + } + + final MenuItem shareItem = mOptionsMenu.findItem(R.id.action_share); + if (null != shareItem) { + shareItem.setVisible(false); + } + + final MenuItem submitItem = mOptionsMenu.findItem(R.id.action_submit); + if (null != submitItem) { + submitItem.setVisible(true); + } + } } diff --git a/src/com/zftlive/android/library/common/WebPageActivity.java b/src/com/zftlive/android/library/common/WebPageActivity.java index 2b6178f..1c58400 100644 --- a/src/com/zftlive/android/library/common/WebPageActivity.java +++ b/src/com/zftlive/android/library/common/WebPageActivity.java @@ -163,6 +163,9 @@ public class WebPageActivity extends BaseActivity implements ll_reload = (LinearLayout) findViewById(R.id.ll_reload); ll_reload.setOnClickListener(this); isError = false; + + //隐藏标题栏 + hiddeTitleBar(); } @Override diff --git a/src/com/zftlive/android/sample/MainActivity.java b/src/com/zftlive/android/sample/MainActivity.java index 5e4de01..df9be11 100644 --- a/src/com/zftlive/android/sample/MainActivity.java +++ b/src/com/zftlive/android/sample/MainActivity.java @@ -84,7 +84,9 @@ public class MainActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.MainActivity); - ActionBarManager.initMenuListTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initMenuListTitle(getContext(), getActionBar(), strCenterTitle); + initHomeMenuTitleBar(strCenterTitle, null); + } @Override diff --git a/src/com/zftlive/android/sample/animation/AnimationInActivity.java b/src/com/zftlive/android/sample/animation/AnimationInActivity.java index 9f32ff5..9f5f4be 100644 --- a/src/com/zftlive/android/sample/animation/AnimationInActivity.java +++ b/src/com/zftlive/android/sample/animation/AnimationInActivity.java @@ -13,7 +13,6 @@ import android.widget.Spinner; import com.zftlive.android.R; import com.zftlive.android.library.base.BaseActivity; -import com.zftlive.android.library.common.ActionBarManager; /** * 动画启动进入界面 @@ -52,7 +51,8 @@ public class AnimationInActivity extends BaseActivity implements View.OnClickLis //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.AnimationInActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/animation/AnimationOutActivity.java b/src/com/zftlive/android/sample/animation/AnimationOutActivity.java index e6e8593..064db47 100644 --- a/src/com/zftlive/android/sample/animation/AnimationOutActivity.java +++ b/src/com/zftlive/android/sample/animation/AnimationOutActivity.java @@ -41,7 +41,8 @@ public class AnimationOutActivity extends BaseActivity { public void initView(View view) { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.AnimationInActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); //追加右滑关闭activity顶层View rootView = (SwipeBackLayout) LayoutInflater.from(this).inflate(R.layout.view_swipeback_root, null); diff --git a/src/com/zftlive/android/sample/animation/AnimationOutPullActivity.java b/src/com/zftlive/android/sample/animation/AnimationOutPullActivity.java index f4e440b..8bf398d 100644 --- a/src/com/zftlive/android/sample/animation/AnimationOutPullActivity.java +++ b/src/com/zftlive/android/sample/animation/AnimationOutPullActivity.java @@ -42,7 +42,8 @@ public class AnimationOutPullActivity extends BaseActivity { public void initView(View view) { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.AnimationInActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); //追加右滑关闭activity顶层View rootView = (PullDownRemoveLayout) LayoutInflater.from(this).inflate(R.layout.view_pullback_root, null); diff --git a/src/com/zftlive/android/sample/animation/DialogEffectActivity.java b/src/com/zftlive/android/sample/animation/DialogEffectActivity.java index 3272257..0c94aff 100644 --- a/src/com/zftlive/android/sample/animation/DialogEffectActivity.java +++ b/src/com/zftlive/android/sample/animation/DialogEffectActivity.java @@ -47,7 +47,8 @@ public class DialogEffectActivity extends BaseActivity { // 初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.DialogEffectActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(),strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } public void dialogShow(View v) { diff --git a/src/com/zftlive/android/sample/basic/BasicTestActivity.java b/src/com/zftlive/android/sample/basic/BasicTestActivity.java index 4683c26..527f311 100644 --- a/src/com/zftlive/android/sample/basic/BasicTestActivity.java +++ b/src/com/zftlive/android/sample/basic/BasicTestActivity.java @@ -68,7 +68,8 @@ public class BasicTestActivity extends BaseActivity implements View.OnClickListe //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.BasicTestActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } diff --git a/src/com/zftlive/android/sample/basic/LoadHTMLActivity.java b/src/com/zftlive/android/sample/basic/LoadHTMLActivity.java index 942b74f..36977a7 100644 --- a/src/com/zftlive/android/sample/basic/LoadHTMLActivity.java +++ b/src/com/zftlive/android/sample/basic/LoadHTMLActivity.java @@ -55,7 +55,8 @@ public class LoadHTMLActivity extends BaseActivity implements View.OnClickListen //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.LoadHTMLActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/camera/CameraPictureActivity.java b/src/com/zftlive/android/sample/camera/CameraPictureActivity.java index 97019d2..e6746dd 100644 --- a/src/com/zftlive/android/sample/camera/CameraPictureActivity.java +++ b/src/com/zftlive/android/sample/camera/CameraPictureActivity.java @@ -83,7 +83,8 @@ public class CameraPictureActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.CameraPictureActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/chart/LineChartActivity.java b/src/com/zftlive/android/sample/chart/LineChartActivity.java index 92771a8..47a162b 100644 --- a/src/com/zftlive/android/sample/chart/LineChartActivity.java +++ b/src/com/zftlive/android/sample/chart/LineChartActivity.java @@ -131,7 +131,8 @@ public class LineChartActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.LineChartActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/data/AutoGainFormActivity.java b/src/com/zftlive/android/sample/data/AutoGainFormActivity.java index adab7b9..012641b 100644 --- a/src/com/zftlive/android/sample/data/AutoGainFormActivity.java +++ b/src/com/zftlive/android/sample/data/AutoGainFormActivity.java @@ -73,7 +73,8 @@ public class AutoGainFormActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.AutoGainFormActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } diff --git a/src/com/zftlive/android/sample/db/DBDemoActivity.java b/src/com/zftlive/android/sample/db/DBDemoActivity.java index e05a6ee..7d6d511 100644 --- a/src/com/zftlive/android/sample/db/DBDemoActivity.java +++ b/src/com/zftlive/android/sample/db/DBDemoActivity.java @@ -84,7 +84,8 @@ public class DBDemoActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.DBDemoActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/fixed/HVScorllListviewActivity.java b/src/com/zftlive/android/sample/fixed/HVScorllListviewActivity.java index aec0dac..bf57efe 100644 --- a/src/com/zftlive/android/sample/fixed/HVScorllListviewActivity.java +++ b/src/com/zftlive/android/sample/fixed/HVScorllListviewActivity.java @@ -128,7 +128,8 @@ public class HVScorllListviewActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.HVScorllListviewActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/gridview/SquareAutoFitGridviewActivity.java b/src/com/zftlive/android/sample/gridview/SquareAutoFitGridviewActivity.java index 9dac8c9..b24a664 100644 --- a/src/com/zftlive/android/sample/gridview/SquareAutoFitGridviewActivity.java +++ b/src/com/zftlive/android/sample/gridview/SquareAutoFitGridviewActivity.java @@ -109,7 +109,8 @@ public class SquareAutoFitGridviewActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.SquareAutoFitGridviewActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/http/FileDownloadUploadActivity.java b/src/com/zftlive/android/sample/http/FileDownloadUploadActivity.java index 77c634e..806dfe1 100644 --- a/src/com/zftlive/android/sample/http/FileDownloadUploadActivity.java +++ b/src/com/zftlive/android/sample/http/FileDownloadUploadActivity.java @@ -77,7 +77,8 @@ public class FileDownloadUploadActivity extends BaseActivity implements OnClickL public void doBusiness(Context mContext) { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.FileDownloadUploadActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/image/ImageListviewActivity.java b/src/com/zftlive/android/sample/image/ImageListviewActivity.java index d48f9d3..1292a3d 100644 --- a/src/com/zftlive/android/sample/image/ImageListviewActivity.java +++ b/src/com/zftlive/android/sample/image/ImageListviewActivity.java @@ -97,8 +97,8 @@ public class ImageListviewActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.ImageListviewActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); - +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/map/location/BaiduLocationActivity.java b/src/com/zftlive/android/sample/map/location/BaiduLocationActivity.java index d1548ce..c6a2f40 100644 --- a/src/com/zftlive/android/sample/map/location/BaiduLocationActivity.java +++ b/src/com/zftlive/android/sample/map/location/BaiduLocationActivity.java @@ -55,7 +55,8 @@ public class BaiduLocationActivity extends BaseActivity implements public void doBusiness(Context mContext) { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.SquareAutoFitGridviewActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); //请求定位 ToolLocation.requestLocation(this, true); diff --git a/src/com/zftlive/android/sample/menu/DrawerLayoutActivity.java b/src/com/zftlive/android/sample/menu/DrawerLayoutActivity.java index 25ca283..9233989 100644 --- a/src/com/zftlive/android/sample/menu/DrawerLayoutActivity.java +++ b/src/com/zftlive/android/sample/menu/DrawerLayoutActivity.java @@ -74,7 +74,8 @@ public class DrawerLayoutActivity extends BaseActivity { actionBar.setLogo(R.drawable.ic_list_white_48dp); actionBar.setDisplayUseLogoEnabled(true); String strCenterTitle = getResources().getString(R.string.DrawerLayoutActivity); - ActionBarManager.initTitleCenterActionBar(mContext,actionBar,strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } diff --git a/src/com/zftlive/android/sample/popupwindow/PopDialogMenuActivity.java b/src/com/zftlive/android/sample/popupwindow/PopDialogMenuActivity.java index 5ae5f2a..38e687d 100644 --- a/src/com/zftlive/android/sample/popupwindow/PopDialogMenuActivity.java +++ b/src/com/zftlive/android/sample/popupwindow/PopDialogMenuActivity.java @@ -61,7 +61,8 @@ public class PopDialogMenuActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.PopDialogMenuActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/progressbar/NumberPbActivity.java b/src/com/zftlive/android/sample/progressbar/NumberPbActivity.java index e9a1186..12e0455 100644 --- a/src/com/zftlive/android/sample/progressbar/NumberPbActivity.java +++ b/src/com/zftlive/android/sample/progressbar/NumberPbActivity.java @@ -63,7 +63,8 @@ public class NumberPbActivity extends BaseActivity implements OnProgressBarListe //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.NumberPbActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/progressbar/ProgressBarActivity.java b/src/com/zftlive/android/sample/progressbar/ProgressBarActivity.java index 44da18c..d23c534 100644 --- a/src/com/zftlive/android/sample/progressbar/ProgressBarActivity.java +++ b/src/com/zftlive/android/sample/progressbar/ProgressBarActivity.java @@ -60,7 +60,8 @@ public class ProgressBarActivity extends BaseActivity implements OnClickListener //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.ProgressBarActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/scrollview/StretchViewActivity.java b/src/com/zftlive/android/sample/scrollview/StretchViewActivity.java index ac42565..b6382a3 100644 --- a/src/com/zftlive/android/sample/scrollview/StretchViewActivity.java +++ b/src/com/zftlive/android/sample/scrollview/StretchViewActivity.java @@ -44,7 +44,8 @@ public class StretchViewActivity extends BaseActivity { public void initView(View view) { mMainLayout = (TableLayout) findViewById(R.id.table_layout); //初始化带返回按钮的标题栏 - ActionBarManager.initBackTitle(this, getActionBar(), this.getClass().getSimpleName()); +// ActionBarManager.initBackTitle(this, getActionBar(), this.getClass().getSimpleName()); + initBackTitleBar(this.getClass().getSimpleName()); } @Override diff --git a/src/com/zftlive/android/sample/sms/PhoneValidateCodeActivity.java b/src/com/zftlive/android/sample/sms/PhoneValidateCodeActivity.java index f459b9a..8dc9cbc 100644 --- a/src/com/zftlive/android/sample/sms/PhoneValidateCodeActivity.java +++ b/src/com/zftlive/android/sample/sms/PhoneValidateCodeActivity.java @@ -68,7 +68,8 @@ public class PhoneValidateCodeActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.PhoneValidateCodeActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/sms/SMSOperationActivity.java b/src/com/zftlive/android/sample/sms/SMSOperationActivity.java index f5d2a27..00b1a40 100644 --- a/src/com/zftlive/android/sample/sms/SMSOperationActivity.java +++ b/src/com/zftlive/android/sample/sms/SMSOperationActivity.java @@ -58,8 +58,8 @@ public class SMSOperationActivity extends BaseActivity implements //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.SMSOperationActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); - +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/soap/CityActivity.java b/src/com/zftlive/android/sample/soap/CityActivity.java index 076a844..f88be7e 100644 --- a/src/com/zftlive/android/sample/soap/CityActivity.java +++ b/src/com/zftlive/android/sample/soap/CityActivity.java @@ -63,7 +63,8 @@ public class CityActivity extends BaseActivity { }); //初始化带返回按钮的标题栏 - ActionBarManager.initBackTitle(getContext(), getActionBar(), "城市列表"); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), "城市列表"); + initBackTitleBar("城市列表"); } @Override diff --git a/src/com/zftlive/android/sample/soap/ProviceActivity.java b/src/com/zftlive/android/sample/soap/ProviceActivity.java index 79c4fcf..c50e43f 100644 --- a/src/com/zftlive/android/sample/soap/ProviceActivity.java +++ b/src/com/zftlive/android/sample/soap/ProviceActivity.java @@ -67,7 +67,8 @@ public class ProviceActivity extends BaseActivity { }); //初始化带返回按钮的标题栏 - ActionBarManager.initBackTitle(getContext(), getActionBar(), "省份列表"); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), "省份列表"); + initBackTitleBar("省份列表"); } @Override diff --git a/src/com/zftlive/android/sample/soap/WeatherActivity.java b/src/com/zftlive/android/sample/soap/WeatherActivity.java index 7753713..d369f53 100644 --- a/src/com/zftlive/android/sample/soap/WeatherActivity.java +++ b/src/com/zftlive/android/sample/soap/WeatherActivity.java @@ -46,7 +46,8 @@ public class WeatherActivity extends BaseActivity{ public void initView(View view) { mTextWeather = (TextView) findViewById(R.id.weather); //初始化带返回按钮的标题栏 - ActionBarManager.initBackTitle(getContext(), getActionBar(), "天气信息"); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), "天气信息"); + initBackTitleBar("天气信息"); } @Override diff --git a/src/com/zftlive/android/sample/zxing/ZxingGenBinActivity.java b/src/com/zftlive/android/sample/zxing/ZxingGenBinActivity.java index f99052e..9e020b1 100644 --- a/src/com/zftlive/android/sample/zxing/ZxingGenBinActivity.java +++ b/src/com/zftlive/android/sample/zxing/ZxingGenBinActivity.java @@ -58,7 +58,8 @@ public class ZxingGenBinActivity extends BaseActivity { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.ZxingGenBinActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override diff --git a/src/com/zftlive/android/sample/zxing/ZxingSacnnerActivity.java b/src/com/zftlive/android/sample/zxing/ZxingSacnnerActivity.java index ccfcba0..1833166 100644 --- a/src/com/zftlive/android/sample/zxing/ZxingSacnnerActivity.java +++ b/src/com/zftlive/android/sample/zxing/ZxingSacnnerActivity.java @@ -39,7 +39,8 @@ public class ZxingSacnnerActivity extends BaseActivity { public void initView(View view) { //初始化带返回按钮的标题栏 String strCenterTitle = getResources().getString(R.string.ZxingSacnnerActivity); - ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); +// ActionBarManager.initBackTitle(getContext(), getActionBar(), strCenterTitle); + initBackTitleBar(strCenterTitle); } @Override