提交类型 新功能修改

提交内容  修改提示在左边问题

WeiChat/src/main/AndroidManifest.xml

@@ -115,7 +115,7 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:persistent="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/MainBaseTheme">
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" />
@@ -292,8 +292,7 @@
             </intent-filter>
         </activity>
         <!-- 消息模块 -->
-        <activity android:name=".ui.message.ChatActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+        <activity android:name=".ui.message.ChatActivity">
             <intent-filter>
                 <action android:name="com.modular.message.ChatActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -372,8 +371,7 @@
 
         <activity android:name=".video.VideoRecordActivity" />
         <activity
-            android:name="com.uas.appme.other.activity.CardcastActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:name="com.uas.appme.other.activity.CardcastActivity"/>
         <activity
             android:name="com.uas.appme.other.activity.BasicInfoEditActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
@@ -441,8 +439,7 @@
             android:name="com.ipaulpro.afilechooser.FileChooserActivity"
             android:exported="true"
             android:icon="@drawable/ic_chooser"
-            android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme">
+            android:label="@string/choose_file">
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -555,8 +552,7 @@
         </receiver>
 
         <activity
-            android:name=".video.VideoActivity"
-            android:theme="@style/Theme.AppCompat.NoActionBar" />
+            android:name=".video.VideoActivity" />
         <activity
             android:name=".ui.erp.activity.CompanyActivity"
             android:hardwareAccelerated="true" />
@@ -578,7 +574,6 @@
             android:name=".ui.erp.activity.oa.OutofficeActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/oaoutplan_title"
-            android:theme="@style/OAThemeOutOffice"
             android:windowSoftInputMode="adjustUnspecified|stateHidden">
             <intent-filter>
                 <action android:name="com.modualr.appworks.OutofficeActivity" />
@@ -588,8 +583,7 @@
 
         <activity
             android:name=".ui.erp.activity.oa.OARegisterActivity"
-            android:label="@string/meet_signin"
-            android:theme="@style/OAThemeMeet">
+            android:label="@string/meet_signin">
             <intent-filter>
                 <action android:name="com.modular.metting.appworks.OARegisterActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -599,7 +593,6 @@
         <activity
             android:name=".ui.erp.activity.crm.VisitReportAddActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeTask"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.erp.activity.crm.TaskAddActivity"
@@ -613,7 +606,6 @@
         <activity
             android:name=".ui.erp.activity.crm.VisitReportPlanActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeTask"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
 
         <!--
@@ -628,21 +620,18 @@
             android:label="@string/unoffice" />
         <activity
             android:name=".ui.erp.activity.oa.AlarmaActivity"
-            android:label="@string/signin_setting"
-            android:theme="@style/OAThemeSignin" />
+            android:label="@string/signin_setting" />
 
         <activity
             android:name=".ui.message.SubscripSetActivity"
             android:label="申请订阅" />
         <activity
             android:name=".ui.erp.activity.oa.OutofficeSetActivity"
-            android:label="@string/signin_setting"
-            android:theme="@style/OAThemeOutOffice" />
+            android:label="@string/signin_setting"/>
         <activity android:name=".ui.erp.activity.oa.TestActivity" />
         <activity
             android:name=".ui.erp.activity.oa.OutSigninOKActivity"
-            android:label="@string/signin_detail"
-            android:theme="@style/OAThemeOutOffice" />
+            android:label="@string/signin_detail" />
         <activity
             android:name=".ui.erp.activity.crm.ContactManAddActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -650,8 +639,7 @@
 
         <activity
             android:name=".ui.erp.activity.oa.OutLogListActivity"
-            android:label="@string/my_mission"
-            android:theme="@style/OAThemeOutOffice" />
+            android:label="@string/my_mission" />
         <activity android:name=".ui.erp.activity.crm.SubsActivity" />
         <activity android:name="com.uas.appme.other.activity.UpdateSingleTextActivity" />
         <activity android:name="com.uas.appme.other.activity.UpdateSexActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -213,6 +213,11 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         }
     };
 
+    @Override
+    public boolean needCommonToolBar() {
+        return false;
+    }
+
     /**
      * 启动返回
      * by gongpm

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/UserCheckedActivity.java

@@ -8,19 +8,19 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.core.base.ActivityStack;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.core.base.ActivityStack;
+import com.core.base.BaseActivity;
+import com.core.utils.helper.LoginHelper;
 import com.core.utils.sp.UserSp;
 import com.modular.login.activity.LoginActivity;
-import com.core.app.ActionBackActivity;
-import com.core.utils.helper.LoginHelper;
+import com.xzjmyk.pm.activity.R;
 
 
 /**
  * 进入到此界面的Activity只可能是4中用户状态 STATUS_USER_TOKEN_OVERDUE //本地Token过期 STATUS_USER_NO_UPDATE //数据不完整
  */
-public class UserCheckedActivity extends ActionBackActivity {
+public class UserCheckedActivity extends BaseActivity {
 
 	private TextView mTitleTv;
 	private TextView mDesTv;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -1,199 +0,0 @@
-package com.xzjmyk.pm.activity.ui.base;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.android.volley.Request;
-import com.android.volley.RetryPolicy;
-import com.common.preferences.PreferenceUtils;
-import com.core.app.MyApplication;
-import com.core.net.http.ViewUtil;
-import com.core.net.volley.FastVolley;
-import com.umeng.analytics.MobclickAgent;
-import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.util.im.Constants;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-
-import java.lang.reflect.Field;
-import java.util.Locale;
-
-/**
- * 带网络请求的Activity继承
- *
- * @author Dean Tao
- */ 
-public abstract class BaseActivity extends ActionBackActivity {
-
-    private FastVolley mFastVolley;
-    private String HASHCODE;
-    public CustomProgressDialog progressDialog;
-    public Context ct;
-    public Activity activity;
-
-    public void preOnCreacte() {
-    }
-
-    public BaseActivity() {
-        super();
-        HASHCODE = Integer.toHexString(this.hashCode()) + "@";// 加上@符号，将拼在一起的两个HashCode分开
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        MobclickAgent.onResume(this);
-        // getRootView().setFitsSystemWindows(true);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        MobclickAgent.onPause(this);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        initStyle();
-        super.onCreate(savedInstanceState);
-        if (android.os.Build.VERSION.SDK_INT > 108) {
-            Window window = getWindow();
-            window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
-                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,
-                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            //设置根布局的内边距
-//            RelativeLayout relativeLayout = (RelativeLayout)
-//                    findViewById(R.id.layout);
-//            relativeLayout.setPadding(0, getActionBarHeight() + getStatusBarHeight(), 0,
-//                    0);
-        }
-        preOnCreacte();
-        ct = this;
-        activity = this;
-        setNotTouchEvent(true);
-        mFastVolley = MyApplication.getInstance().getFastVolley();
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
-        progressDialog = CustomProgressDialog.createDialog(this);
-        //重启之后恢复到之前的语言
-        switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
-        // SystemUtil.setSystemBarTint(this);
-    }
-
-    private void initStyle() {
-        if (getIntent() == null || getIntent().getIntExtra("style", -1) == -1) return;
-        try {
-            int theme = getSharedPreferences("cons", MODE_PRIVATE).
-                    getInt("theme", getIntent().getIntExtra("style", -1));
-            setTheme(theme);
-        } catch (Exception e) {
-        }
-    }
-
-    public View getRootView() {
-        return ((ViewGroup) findViewById(android.R.id.content)).getChildAt(0);
-    }
-
-    public int getStatusBarHeight() {
-        Class c = null;
-        Object obj = null;
-        Field field = null;
-        int x = 0, statusBarHeight = 0;
-        try {
-            c = Class.forName("com.android.internal.R$dimen");
-            obj = c.newInstance();
-            field = c.getField("status_bar_height");
-            x = Integer.parseInt(field.get(obj).toString());
-            statusBarHeight = getResources().getDimensionPixelSize(x);
-        } catch (Exception e1) {
-            e1.printStackTrace();
-        }
-        return statusBarHeight;
-    }
-
-    public int getActionBarHeight() {
-        TypedValue tv = new TypedValue();
-        int actionBarHeight = 0;
-        if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))// 如果资源是存在的、有效的
-        {
-            actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
-        }
-        return actionBarHeight;
-    }
-
-    public void setTouch(boolean b) {
-        setNotTouchEvent(b);
-    }
-
-    @Override
-    protected void onDestroy() {
-        mFastVolley.cancelAll(HASHCODE);
-        Crouton.cancelAllCroutons();
-        super.onDestroy();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, false);//不进行通知
-    }
-
-    public void addDefaultRequest(Request<?> request) {
-        mFastVolley.addDefaultRequest(HASHCODE, request);
-    }
-
-    public void addShortRequest(Request<?> request) {
-        mFastVolley.addShortRequest(HASHCODE, request);
-    }
-
-    public void addRequest(Request<?> request, RetryPolicy retryPolicy) {
-        mFastVolley.addRequest(HASHCODE, request, retryPolicy);
-    }
-
-    public void cancelAll(Object tag) {
-        mFastVolley.cancelAll(HASHCODE, tag);
-    }
-
-    public void cancelAll() {
-        mFastVolley.cancelAll(HASHCODE);
-    }
-
-    public boolean isNetworkActive() {
-        return MyApplication.getInstance().isNetworkActive();
-    }
-
-    public void ToastMessage(String message) {
-        ViewUtil.ToastMessage(this, message);
-    }
-
-    protected void switchLanguage(String language) {
-        Resources resources = getResources();
-        Configuration config = resources.getConfiguration();
-        DisplayMetrics dm = resources.getDisplayMetrics();
-        if (language.equals("en")) {
-            config.locale = Locale.ENGLISH;
-        } else if (language.equals("rCN")) {
-            config.locale = Locale.SIMPLIFIED_CHINESE;
-        } else if (language.equals("rTW")) {
-            config.locale = Locale.TRADITIONAL_CHINESE;
-        } else if (language.equals("sys")) {
-            config.locale = Locale.getDefault();
-        }
-        resources.updateConfiguration(config, dm);
-        PreferenceUtils.putString("language", language);
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PMsgDetailActivity.java

@@ -21,6 +21,8 @@ import android.widget.TextView;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
 import com.core.model.Friend;
 import com.core.model.User;
 import com.core.net.volley.ArrayResult;
@@ -34,11 +36,9 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.FriendDao;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.DMsgVideoHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgAudioHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgDetailHeaderView;

WeiChat/src/main/res/layout/fragment_me.xml

@@ -1,572 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="170dp">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="130dp"
-                android:background="@drawable/bg_me_top" />
-
-
-            <ImageView
-                android:id="@+id/avatar_img"
-                android:layout_width="86dp"
-                android:layout_height="86dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="8dp"
-                android:contentDescription="@string/app_name"
-                android:padding="1dp"
-                android:background="@drawable/radian_hollow_white_bg"
-                android:scaleType="fitXY"                 />
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_above="@id/avatar_img"
-                android:layout_marginBottom="20dp"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/nick_name_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:maxWidth="200dp"
-                    android:lines="1"
-                    android:ellipsize="end"
-                    android:layout_marginRight="@dimen/padding"
-                    android:textColor="@color/white"
-                    android:textSize="20sp" />
-
-                <TextView
-                    android:id="@+id/phone_number_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="@dimen/padding"
-                    android:text="13545678764"
-                    android:textColor="@color/white"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:id="@+id/editInfoIv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/paddingMin"
-                    android:src="@drawable/ic_me_info_edit" />
-            </LinearLayout>
-
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/my_data_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_inf"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/my_data"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/my_space_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/set_fans_u"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/my_space"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:id="@+id/imageView"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/local_video_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_video"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/local_video"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/app_friend_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/friend_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_circle"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="朋友圈"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                android:id="@+id/tv_friend_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/friend_arrow_img"
-                android:layout_toRightOf="@+id/friend_text"
-                android:text="未登录"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine"
-                android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/friend_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name"
-                android:visibility="gone" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/my_friend_rl"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/selector_item_white_pass"
-            android:paddingLeft="@dimen/padding"
-            android:paddingTop="@dimen/padding"
-            android:paddingBottom="@dimen/padding">
-
-            <TextView
-                android:id="@+id/tv_zone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/set_fans_u"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/user_firend_cirle"
-                android:textColor="#333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:id="@+id/iv_remain"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/tv_zone"
-                android:src="@drawable/tab_unread_bg"
-                android:visibility="gone" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:layout_marginLeft="10dp"
-            android:background="@color/item_line" />
-
-        <!--公司-->
-        <!--账套-->
-        <RelativeLayout
-            android:id="@+id/rl_company_change"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/selector_item_white_pass"
-            android:paddingLeft="@dimen/padding"
-            android:paddingTop="@dimen/padding">
-
-            <View
-                android:id="@+id/view"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_alignParentBottom="true"
-                android:background="@color/item_line" />
-
-            <TextView
-                android:id="@+id/company_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_company"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/user_company"
-                android:textColor="#333333"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/company_tv"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/company_arrow_img"
-                android:layout_toRightOf="@+id/company_text"
-                android:textColor="#999999"
-                android:textSize="12sp" />
-
-            <ImageView
-                android:id="@+id/company_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/rl_master_change"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/selector_item_white_pass"
-            android:paddingLeft="@dimen/padding"
-            android:paddingTop="@dimen/padding">
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_alignParentBottom="true"
-                android:background="@color/item_line" />
-
-            <TextView
-                android:id="@+id/master_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_master"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/user_account"
-                android:textColor="#333333"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/master_tv"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/master_arrow_img"
-                android:layout_toRightOf="@+id/master_text"
-                android:textColor="#999999"
-                android:textSize="12sp" />
-
-            <ImageView
-                android:id="@+id/master_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-
-
-
-        <RelativeLayout
-            android:id="@+id/app_drafts_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:background="#faf9f9"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/drafts_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_draft"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="草稿箱"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                android:id="@+id/tv_drafts_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/drafts_arrow_img"
-                android:layout_toRightOf="@+id/drafts_text"
-                android:text="未登录"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine"
-                android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/drafts_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name"
-                android:visibility="gone" />
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/my_b2b_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp"
-            android:background="#faf9f9"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/b2b_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/my_b2b"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                android:id="@+id/tv_b2b_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/b2b_arrow_img"
-                android:layout_toRightOf="@+id/b2b_text"
-                android:text="未登录"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/b2b_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/setting_rl"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/selector_item_white_pass"
-            android:paddingLeft="@dimen/padding"
-            android:paddingTop="@dimen/padding">
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_alignParentBottom="true"
-                android:background="@color/item_line" />
-
-            <TextView
-                android:id="@+id/tv_menu_setting"
-                android:layout_width="10dp"
-                android:layout_height="10dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerInParent="true"
-                android:layout_marginRight="23dp"
-                android:layout_marginTop="12dp"
-                android:layout_toLeftOf="@+id/iv_arrow"
-                android:background="@drawable/hongdian"
-                android:textColor="@android:color/white"
-                android:textSize="10.0dip" />
-
-            <ImageView
-                android:id="@+id/iv_desc_oa"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignBottom="@+id/oa_next"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/tv_menu_setting"
-                android:src="@drawable/kaoqintongji"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/tv_oa_desc"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_margin="3dp"
-                android:layout_toLeftOf="@+id/iv_desc_oa"
-                android:text="@string/set_sport"
-                android:visibility="gone" />
-
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_setting"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="@string/user_setting"
-                android:textColor="#333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:id="@+id/iv_arrow"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-
-
-        </RelativeLayout>
-
-
-
-
-        <RelativeLayout
-            android:id="@+id/time_statistics_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp"
-            android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_setting"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="UU登入、登出、被杀死时间统计"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/my_qr_code_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp"
-            android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_setting"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="QR Code And FaceR"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/picture_selector_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp"
-            android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/icon_uu_setting"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="支付中心"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</ScrollView>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon May 21 17:37:04 CST 2018
-debugName=301
+#Tue May 22 11:48:18 CST 2018
+debugName=303
 versionName=630
-debugCode=301
+debugCode=303
 versionCode=170

app_core/common/src/main/java/com/core/app/ActionBackActivity.java

@@ -2,33 +2,16 @@ package com.core.app;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-
 
 import com.core.base.StackActivity;
 
 
 public class ActionBackActivity extends StackActivity {
 
-    //手指上下滑动时的最小速度
-    private static final int YSPEED_MIN = 200;
-    //手指向右滑动时的最小距离
-    private static final int XDISTANCE_MIN = 200;
-
-    private float downX, downY;//按下的坐标
-    //记录手指移动时的坐标。
-    private float moveX;
-    //用于计算手指滑动的速度。
-    private VelocityTracker speed;
-
-
     protected Context mContext;
     public AppConfig mConfig;
     private boolean isDestroyed = false;
@@ -43,35 +26,14 @@ public class ActionBackActivity extends StackActivity {
         super.onResume();
     }
 
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (!b) {
-            createVelocityTracker(ev);
-            switch (ev.getAction()) {
-                case MotionEvent.ACTION_DOWN:
-                    downX = ev.getX();
-                    downY = ev.getY();
-                    break;
-                case MotionEvent.ACTION_MOVE:
-                    //滑动的距离
-                    moveX = ev.getRawX() - downX;
-                    break;
-                case MotionEvent.ACTION_UP:
-                    touchUp();
-                    break;
-            }
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayShowHomeEnabled(true);
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
+//        ActionBar actionBar = getSupportActionBar();
+//        if (actionBar != null) {
+//            actionBar.setDisplayShowHomeEnabled(true);
+//            actionBar.setDisplayHomeAsUpEnabled(true);
+//        }
         mConfig = MyApplication.getInstance().getConfig();
         mContext = this;
         if (AppConfig.DEBUG) {
@@ -79,34 +41,7 @@ public class ActionBackActivity extends StackActivity {
         }
     }
 
-    /**
-     * 创建VelocityTracker对象，并将触摸界面的滑动事件加入到VelocityTracker当中。
-     *
-     * @param event
-     */
-    private void createVelocityTracker(MotionEvent event) {
-        if (speed == null) {
-            speed = VelocityTracker.obtain();
-        }
-        speed.addMovement(event);
-    }
 
-    /**
-     * 回收VelocityTracker对象。
-     */
-    private void recycleVelocityTracker() {
-        speed.recycle();
-        speed = null;
-    }
-
-    /**
-     * @return 滑动速度，以每秒钟移动了多少像素值为单位。
-     */
-    private int getScrollVelocity() {
-        speed.computeCurrentVelocity(1000);
-        int velocity = (int) speed.getYVelocity();
-        return Math.abs(velocity);
-    }
 
     @Override
     public boolean isDestroyed() {
@@ -119,7 +54,6 @@ public class ActionBackActivity extends StackActivity {
     @Override
     protected void onDestroy() {
         isDestroyed = true;
-//        mConfig = null;
         mContext = null;
         if (AppConfig.DEBUG) {
             Log.e(AppConfig.TAG, TAG + " onDestroy");
@@ -141,27 +75,7 @@ public class ActionBackActivity extends StackActivity {
         return true;
     }
 
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-
-        return super.onTouchEvent(event);
-    }
-
-    private void touchUp() {
-        if (getScrollVelocity() > YSPEED_MIN && moveX > XDISTANCE_MIN) {
-            recycleVelocityTracker();
-//            finish();
-        } else {
-            recycleVelocityTracker();
-        }
-
-    }
-
-    private boolean b;
 
-    protected void setNotTouchEvent(boolean b) {
-        this.b = b;
-    }
 
 
     @Override

app_core/common/src/main/java/com/core/base/BaseActivity.java

@@ -89,7 +89,6 @@ public abstract class BaseActivity extends ActionBackActivity {
         preOnCreacte();
         ct = this;
         activity = this;
-        setNotTouchEvent(true);
         mFastVolley = MyApplication.getInstance().getFastVolley();
         Intent intent = getIntent();
         if (intent == null || intent.getBooleanExtra("ORIENTATION_PORTRAIT", true)) {
@@ -105,19 +104,8 @@ public abstract class BaseActivity extends ActionBackActivity {
 
     }
 
-    @Override
-    public void setTitle(int titleId) {
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setTitle(titleId);
-        }
-    }
 
-    @Override
-    public void setTitle(CharSequence title) {
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setTitle(title);
-        }
-    }
+
 
     private void initStyle() {
         if (getIntent() == null || getIntent().getIntExtra("style", -1) == -1) return;
@@ -162,9 +150,6 @@ public abstract class BaseActivity extends ActionBackActivity {
         return actionBarHeight;
     }
 
-    public void setTouch(boolean b) {
-        setNotTouchEvent(b);
-    }
 
     @Override
     protected void onDestroy() {

app_core/common/src/main/java/com/core/base/BaseToolBarActivity.java

@@ -0,0 +1,286 @@
+package com.core.base;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewStub;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.common.LogUtil;
+import com.core.app.R;
+import com.core.utils.StatusBarUtil;
+import com.core.utils.ToastUtil;
+
+/**
+ * Created by Bitlike on 2018/5/3.
+ */
+public class BaseToolBarActivity extends AppCompatActivity {
+    private FrameLayout contentFl;
+    private Toolbar commonToolBar;
+    private TextView commonTitleTv;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        super.onCreate(savedInstanceState);
+        super.setContentView(R.layout.base_bar_layout);
+        contentFl = findViewById(R.id.contentFl);
+        int rceId = getLayoutRes();
+        if (rceId > 0) {
+            setContentView(rceId);
+        }
+        if (needCommonToolBar()) {
+            initCommonToolbar(getToolBarId());
+        }
+    }
+
+    public int getToolBarId() {
+        return R.id.toolbarVs;
+    }
+
+    public void setCommonToolBar(Toolbar commonToolBar) {
+        this.commonToolBar = commonToolBar;
+    }
+
+    public void initCommonToolbar(int toolBarId) {
+        if (commonToolBar != null || toolBarId != R.id.toolbarVs) {
+            if (commonToolBar == null) {
+                commonToolBar = findViewById(toolBarId);
+            }
+            initCommonToolbar();
+        } else {
+            ViewStub stub = findViewById(R.id.toolbarVs);
+            stub.inflate();
+            commonToolBar = findViewById(R.id.commonToolBar);
+            commonTitleTv = findViewById(R.id.commonTitleTv);
+            initCommonToolbar();
+            if (needNavigation()) {
+                setNavigation(0, null, null);
+            }
+            if (commonTitleTv != null) {
+                commonTitleTv.setText(getTitle());
+            }
+        }
+    }
+
+    public void initCommonToolbar() {
+        LogUtil.i("gong", "initCommonToolbar");
+        if (commonToolBar != null) {
+            LogUtil.i("gong", "commonToolBar != null");
+            StatusBarUtil.immersive(this, 0x00000000, 0.0f);
+            setSupportActionBar(commonToolBar);
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+            StatusBarUtil.setPaddingSmart(this, commonToolBar);
+            commonToolBar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
+                @Override
+                public boolean onMenuItemClick(MenuItem menuItem) {
+                    onOptionsItemSelected(menuItem);
+                    return false;
+                }
+            });
+        }
+    }
+
+    /**
+     * 初始化导航键
+     *
+     * @param iconId          返回图标（优先）
+     * @param icon            返回图标（当iconId小于0时）
+     * @param onClickListener 导航键监听事件
+     */
+    public final void setNavigation(int iconId, Drawable icon, View.OnClickListener onClickListener) {
+        if (iconId > 0) {
+            commonToolBar.setNavigationIcon(iconId);
+        } else if (icon != null) {
+            commonToolBar.setNavigationIcon(icon);
+        } else {
+            commonToolBar.setNavigationIcon(R.drawable.ic_baseutil_back);
+        }
+        if (onClickListener == null) {
+            onClickListener = new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    onBackPressed();
+                }
+            };
+        }
+        //设置返回按钮的点击事件
+        commonToolBar.setNavigationOnClickListener(onClickListener);
+        setToolBarMenuClickListener(null);
+    }
+
+    //是否需要返回键
+    public boolean needNavigation() {
+        return true;
+    }
+
+    //是否需要通用的toolbar
+    public boolean needCommonToolBar() {
+        return true;
+    }
+
+    /*隐藏toolbar*/
+    protected final void hideToolBar() {
+        if (commonToolBar != null) {
+            commonToolBar.setVisibility(View.GONE);
+        }
+    }
+
+    /*显示toolbar*/
+    public final void showToolBar() {
+        if (commonToolBar != null && commonToolBar.getVisibility() == View.GONE) {
+            commonToolBar.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /*设置toolbar的点击监听器*/
+    public final void setToolBarMenuClickListener(Toolbar.OnMenuItemClickListener onclick) {
+        if (commonToolBar != null) {
+            if (onclick == null) {
+                onclick = new Toolbar.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem item) {
+                        onOptionsItemSelected(item);
+                        return false;
+                    }
+                };
+            }
+            commonToolBar.setOnMenuItemClickListener(onclick);
+        }
+    }
+
+    public final void setTitle(int titleId) {
+        super.setTitle(titleId);
+        if (titleId > 0) {
+            if (commonTitleTv != null) {
+                commonTitleTv.setText(titleId);
+            }
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().setTitle(titleId);
+            }
+        }
+
+    }
+
+    /*设置标题*/
+    public final void setTitle(CharSequence title) {
+        super.setTitle(title);
+        if (title!=null) {
+            if (commonTitleTv != null) {
+                commonTitleTv.setText(title);
+            }
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().setTitle(title);
+            }
+        }
+    }
+
+    /**
+     * 更改为自定义的ToolBar，此时默认的Toobar将会制空
+     * TODO 存在问题：前面如果设置的返回键监听事件会失效，发现该方法没用
+     *
+     * @param toolBarId 当前布局里toolbar的资源id
+     * @return 返回新的Toobar
+     */
+    @Deprecated
+    public Toolbar updataToolBar(int toolBarId) {
+        Drawable navigationIcon = null;
+        if (commonToolBar != null) {
+            if (needNavigation()) {
+                navigationIcon = commonToolBar.getNavigationIcon();
+            }
+        }
+        commonToolBar = contentFl.findViewById(toolBarId);
+        if (commonToolBar != null) {
+            setSupportActionBar(commonToolBar);
+            //设置actionBar的标题是否显示，对应ActionBar.DISPLAY_SHOW_TITLE。
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+            if (needNavigation()) {
+                setNavigation(0, navigationIcon, null);
+            }
+        }
+        return commonToolBar;
+    }
+
+    public int getLayoutRes() {
+        return 0;
+    }
+
+    @Override
+    public void setContentView(View contentView) {
+        setContentView(contentView, null);
+    }
+
+    @SuppressLint("ResourceType")
+    @Override
+    public void setContentView(@LayoutRes int layoutId) {
+        if (layoutId > 0) {
+            if (contentFl != null) {
+                LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                inflater.inflate(layoutId, contentFl);
+            } else {
+                super.setContentView(layoutId);
+            }
+        }
+    }
+
+    @Override
+    public void setContentView(View contentView, ViewGroup.LayoutParams params) {
+        if (contentView != null) {
+            if (contentFl != null) {
+                contentFl.removeAllViews();
+                if (params == null) {
+                    params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT);
+                }
+                contentFl.addView(contentView, params);
+            } else {
+                super.setContentView(contentView);
+            }
+        }
+    }
+
+
+    public void showToast(CharSequence message) {
+        LogUtil.i("gong", "showToast=" + message);
+        LogUtil.i("gong", "contentFl=" + (contentFl != null));
+        if (contentFl != null && !TextUtils.isEmpty(message)) {
+            ToastUtil.showToast(this, message, contentFl);
+        } else {
+            ToastUtil.showToast(this, message);
+        }
+    }
+
+    public void showToast(int messageId) {
+        if (contentFl != null && messageId != 0) {
+            ToastUtil.showToast(this, messageId, contentFl);
+        } else {
+            ToastUtil.showToast(this, messageId);
+        }
+    }
+
+    public FrameLayout getContentFl() {
+        return contentFl;
+    }
+
+    public Toolbar getCommonToolBar() {
+        return commonToolBar;
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+}

app_core/common/src/main/java/com/core/base/DefaultResourceActivity.java

@@ -1,12 +1,11 @@
 package com.core.base;
 
 import android.content.res.Configuration;
-import android.support.v7.app.AppCompatActivity;
 
 /**
  * Created by Arison on 2017/8/25.
  */
-public class DefaultResourceActivity extends AppCompatActivity {
+public class DefaultResourceActivity extends BaseToolBarActivity {
     /* System default config */
     private static Configuration config = new Configuration();
 

app_core/common/src/main/java/com/core/base/HttpImp.java

@@ -18,7 +18,7 @@ public interface HttpImp {
 
     void showToast(int reId);//显示提交的返回提示
 
-    void setTitle(String title);//设置标题栏
+    void setTitle(CharSequence title);//设置标题栏
 
     void setTitleStyles(int styles);//设置主题
 

app_core/common/src/main/java/com/core/base/OABaseActivity.java

@@ -51,10 +51,7 @@ public class OABaseActivity extends BaseActivity implements HttpImp {
         ToastUtil.showToast(ct, reId);
     }
 
-    @Override
-    public void setTitle(String title) {
-        getSupportActionBar().setTitle(title);
-    }
+
 
     @Override
     public void setTitleStyles(int reid) {

app_core/common/src/main/java/com/core/base/OABaseActivity.java~HEAD

@@ -1,73 +0,0 @@
-package com.core.base;
-
-import android.os.Bundle;
-
-import com.common.data.StringUtil;
-import com.core.app.R;
-import com.core.utils.ToastUtil;
-import com.core.widget.view.imp.HttpImp;
-
-/**
- * Created by Bitliker on 2017/1/17.
- */
-
-public class OABaseActivity extends BaseActivity implements HttpImp {
-    @Override
-    public void showLoading() {
-        try {
-            progressDialog.show();
-        } catch (Exception e) {
-
-        }
-    }
-
-    @Override
-    public void dimssLoading() {
-        try {
-            if (progressDialog.isShowing())
-                progressDialog.dismiss();
-        } catch (Exception e) {
-
-        }
-    }
-
-    @Override
-    public void showToast(String message, int colorId) {
-        ToastUtil.showToast(ct, message);
-    }
-
-    @Override
-    public void showToast(String message) {
-        ToastUtil.showToast(ct, message);
-    }
-
-    @Override
-    public void showToast(int reId, int colorId) {
-        ToastUtil.showToast(ct, reId);
-
-    }
-
-    @Override
-    public void showToast(int reId) {
-        ToastUtil.showToast(ct, reId);
-    }
-
-    @Override
-    public void setTitle(String title) {
-        getSupportActionBar().setTitle(title);
-    }
-
-    @Override
-    public void setTitleStyles(int reid) {
-        int theme = getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", reid);
-        setTheme(theme);
-    }
-
-    public void error(int what, int statuCode, String message, Bundle bundle) {
-        if (!StringUtil.isEmpty(message)) {
-            showToast(message, R.color.load_error);
-            dimssLoading();
-        }
-    }
-
-}

app_core/common/src/main/java/com/core/base/SupportToolBarActivity.java

@@ -1,271 +1,11 @@
 package com.core.base;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewStub;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.TextView;
 
-import com.common.LogUtil;
-import com.core.app.R;
-import com.core.utils.StatusBarUtil;
-import com.core.utils.ToastUtil;
 
 /**
  * Created by Bitlike on 2018/5/3.
  */
-
+@Deprecated (/*在BaseActivity中使用BaseToolBarActivity，这个基类不再使用*/)
 public class SupportToolBarActivity extends BaseActivity {
-    private FrameLayout contentFl;
-    private Toolbar commonToolBar;
-    private TextView commonTitleTv;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-       getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        super.onCreate(savedInstanceState);
-        super.setContentView(R.layout.base_bar_layout);
-        contentFl = findViewById(R.id.contentFl);
-        int rceId = getLayoutRes();
-        if (rceId > 0) {
-            setContentView(rceId);
-        }
-        if (needCommonToolBar()) {
-            initCommonToolbar(getToolBarId());
-        }
-    }
-
-    public int getToolBarId() {
-        return R.id.toolbarVs;
-    }
-
-    public void setCommonToolBar(Toolbar commonToolBar) {
-        this.commonToolBar = commonToolBar;
-    }
-
-    public void initCommonToolbar(int toolBarId) {
-        if (commonToolBar != null || toolBarId != R.id.toolbarVs) {
-            if (commonToolBar == null) {
-                commonToolBar = findViewById(toolBarId);
-            }
-            initCommonToolbar();
-        } else {
-            ViewStub stub = findViewById(R.id.toolbarVs);
-            stub.inflate();
-            commonToolBar = findViewById(R.id.commonToolBar);
-            commonTitleTv = findViewById(R.id.commonTitleTv);
-            initCommonToolbar();
-            if (needNavigation()) {
-                setNavigation(0, null, null);
-            }
-            if (commonTitleTv != null) {
-                commonTitleTv.setText(getTitle());
-            }
-        }
-    }
-
-    public void initCommonToolbar() {
-        LogUtil.i("gong", "initCommonToolbar");
-        if (commonToolBar != null) {
-            LogUtil.i("gong", "commonToolBar != null");
-            StatusBarUtil.immersive(this, 0x00000000, 0.0f);
-            setSupportActionBar(commonToolBar);
-            getSupportActionBar().setDisplayShowTitleEnabled(false);
-            StatusBarUtil.setPaddingSmart(this, commonToolBar);
-            commonToolBar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
-                @Override
-                public boolean onMenuItemClick(MenuItem menuItem) {
-                    onOptionsItemSelected(menuItem);
-                    return false;
-                }
-            });
-        }
-    }
-
-    /**
-     * 初始化导航键
-     *
-     * @param iconId          返回图标（优先）
-     * @param icon            返回图标（当iconId小于0时）
-     * @param onClickListener 导航键监听事件
-     */
-    public final void setNavigation(int iconId, Drawable icon, View.OnClickListener onClickListener) {
-        if (iconId > 0) {
-            commonToolBar.setNavigationIcon(iconId);
-        } else if (icon != null) {
-            commonToolBar.setNavigationIcon(icon);
-        } else {
-            commonToolBar.setNavigationIcon(R.drawable.ic_baseutil_back);
-        }
-        if (onClickListener == null) {
-            onClickListener = new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    onBackPressed();
-                }
-            };
-        }
-        //设置返回按钮的点击事件
-        commonToolBar.setNavigationOnClickListener(onClickListener);
-        setToolBarMenuClickListener(null);
-    }
-
-    //是否需要返回键
-    public boolean needNavigation() {
-        return true;
-    }
-
-    //是否需要通用的toolbar
-    public boolean needCommonToolBar() {
-        return true;
-    }
-
-    /*隐藏toolbar*/
-    protected final void hideToolBar() {
-        if (commonToolBar != null) {
-            commonToolBar.setVisibility(View.GONE);
-        }
-    }
-
-    /*显示toolbar*/
-    public final void showToolBar() {
-        if (commonToolBar != null && commonToolBar.getVisibility() == View.GONE) {
-            commonToolBar.setVisibility(View.VISIBLE);
-        }
-    }
-
-    /*设置toolbar的点击监听器*/
-    public final void setToolBarMenuClickListener(Toolbar.OnMenuItemClickListener onclick) {
-        if (commonToolBar != null) {
-            if (onclick == null) {
-                onclick = new Toolbar.OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
-                        onOptionsItemSelected(item);
-                        return false;
-                    }
-                };
-            }
-            commonToolBar.setOnMenuItemClickListener(onclick);
-        }
-    }
-
-    /*设置标题*/
-    public final void setTitle(CharSequence title) {
-        super.setTitle(title);
-        if (!TextUtils.isEmpty(title)) {
-            if (commonTitleTv != null) {
-                commonTitleTv.setText(title);
-            }
-            getSupportActionBar().setTitle(title);
-        }
-    }
-
-    /**
-     * 更改为自定义的ToolBar，此时默认的Toobar将会制空
-     * TODO 存在问题：前面如果设置的返回键监听事件会失效，发现该方法没用
-     *
-     * @param toolBarId 当前布局里toolbar的资源id
-     * @return 返回新的Toobar
-     */
-    @Deprecated
-    public Toolbar updataToolBar(int toolBarId) {
-        Drawable navigationIcon = null;
-        if (commonToolBar != null) {
-            if (needNavigation()) {
-                navigationIcon = commonToolBar.getNavigationIcon();
-            }
-        }
-        commonToolBar = contentFl.findViewById(toolBarId);
-        if (commonToolBar != null) {
-            setSupportActionBar(commonToolBar);
-            //设置actionBar的标题是否显示，对应ActionBar.DISPLAY_SHOW_TITLE。
-            getSupportActionBar().setDisplayShowTitleEnabled(false);
-            if (needNavigation()) {
-                setNavigation(0, navigationIcon, null);
-            }
-        }
-        return commonToolBar;
-    }
-
-    public int getLayoutRes() {
-        return 0;
-    }
-
-    @Override
-    public void setContentView(View contentView) {
-        setContentView(contentView, null);
-    }
-
-    @SuppressLint("ResourceType")
-    @Override
-    public void setContentView(@LayoutRes int layoutId) {
-        if (layoutId > 0) {
-            if (contentFl != null) {
-                LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                inflater.inflate(layoutId, contentFl);
-            } else {
-                super.setContentView(layoutId);
-            }
-        }
-    }
-
-    @Override
-    public void setContentView(View contentView, ViewGroup.LayoutParams params) {
-        if (contentView != null) {
-            if (contentFl != null) {
-                contentFl.removeAllViews();
-                if (params == null) {
-                    params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                            ViewGroup.LayoutParams.MATCH_PARENT);
-                }
-                contentFl.addView(contentView, params);
-            } else {
-                super.setContentView(contentView);
-            }
-        }
-    }
-
-
-    public void showToast(CharSequence message) {
-        LogUtil.i("gong", "showToast=" + message);
-        LogUtil.i("gong", "contentFl=" + (contentFl != null));
-        if (contentFl != null && !TextUtils.isEmpty(message)) {
-            ToastUtil.showToast(this, message, contentFl);
-        } else {
-            ToastUtil.showToast(this, message);
-        }
-    }
-
-    public void showToast(int messageId) {
-        if (contentFl != null && messageId != 0) {
-            ToastUtil.showToast(this, messageId, contentFl);
-        } else {
-            ToastUtil.showToast(this, messageId);
-        }
-    }
-
-    public FrameLayout getContentFl() {
-        return contentFl;
-    }
-
-    public Toolbar getCommonToolBar() {
-        return commonToolBar;
-    }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-    }
 }

app_core/common/src/main/java/com/core/utils/NotifyUtils.java

@@ -6,7 +6,6 @@ import android.widget.Toast;
 
 import com.common.data.StringUtil;
 import com.core.widget.crouton.Crouton;
-import com.core.widget.crouton.Style;
 
 /**
  * Created by Arison on 2017/8/28.
@@ -28,15 +27,16 @@ public class NotifyUtils {
     public static void ToastMessage(Context cont, String msg) {
         if (StringUtil.isEmpty(msg)) return;
         if (cont instanceof Activity) {
-            if (crouton != null) {
-                crouton.cancel();
-
-                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 1000);
-                crouton.show();
-            } else {
-                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 1000);
-                crouton.show();
-            }
+            ToastUtil.showToast(cont,msg);
+
+//            if (crouton != null) {
+//                crouton.cancel();
+//                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 1000,);
+//                crouton.show();
+//            } else {
+//                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 1000);
+//                crouton.show();
+//            }
         } else {
             Toast.makeText(cont, msg, Toast.LENGTH_SHORT).show();
         }

app_core/common/src/main/java/com/core/utils/ToastUtil.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.core.app.R;
+import com.core.base.BaseToolBarActivity;
 import com.core.base.SupportToolBarActivity;
 import com.core.widget.crouton.Crouton;
 import com.core.widget.crouton.Style;
@@ -87,6 +88,8 @@ public class ToastUtil {
         ViewGroup vg = null;
         if (context instanceof SupportToolBarActivity) {
             vg = ((SupportToolBarActivity) context).getContentFl();
+        }else if (context instanceof BaseToolBarActivity) {
+            vg = ((BaseToolBarActivity) context).getContentFl();
         }
         if (vg != null) {
             showToast(context, message, vg);

app_core/common/src/main/java/com/core/widget/view/Activity/MultiImagePreviewActivity.java

@@ -76,7 +76,6 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 		}
 		getSupportActionBar().hide();
 		setContentView(R.layout.activity_images_preview);
-		setNotTouchEvent(true);
 		initView();
 	}
 

app_core/common/src/main/java/com/core/widget/view/Activity/SearchLocationActivity.java

@@ -156,4 +156,5 @@ public class SearchLocationActivity extends OABaseActivity implements ISearchVie
 	}
 
 
+
 }

app_core/common/src/main/java/com/core/widget/view/imp/HttpImp.java

@@ -1,27 +0,0 @@
-package com.core.widget.view.imp;
-
-/**
- * 有网络请求的接口
- * Created by Bitliker on 2016/12/15.
- */
-public interface HttpImp {
-
-    void showLoading();//显示刷新
-
-    void dimssLoading();//关闭刷新
-
-    void showToast(String message, int colorId);//显示提交的返回提示
-
-    void showToast(String message);//显示提交的返回提示
-
-    void showToast(int reId, int colorId);//显示提交的返回提示
-
-    void showToast(int reId);//显示提交的返回提示
-
-    void setTitle(String title);//设置标题栏
-
-    void setTitleStyles(int styles);//设置主题
-
-    void finish();
-
-}

app_core/common/src/main/java/com/core/widget/view/imp/ISearchView.java

@@ -1,6 +1,7 @@
 package com.core.widget.view.imp;
 
 import com.baidu.mapapi.model.LatLng;
+import com.core.base.HttpImp;
 import com.core.widget.view.model.SearchLocationModel;
 
 import java.util.List;

app_core/common/src/main/res/layout/action_data_inquiry_list.xml

@@ -3,15 +3,15 @@
     android:id="@+id/top"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="@color/antionbarcolor">
+    android:paddingRight="@dimen/paddingMin"
+    android:layout_height="?attr/actionBarSize">
 
     <ImageView
         android:id="@+id/back"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_back"/>
+        android:src="@drawable/ic_baseutil_back"/>
 
     <ImageView
         android:id="@+id/data_inquiry_filter_iv"

app_core/common/src/main/res/layout/activity_client.xml

@@ -187,13 +187,11 @@
 
                         <TextView
                             android:id="@+id/tv_rank_rirun_left"
-                            style="@style/crm_tv_ranking_left"
-                            android:text="@string/crm_ge"/>
+                            style="@style/crm_tv_ranking_left"/>
 
                         <TextView
                             android:id="@+id/tv_rank_rirun_right"
-                            style="@style/crm_tv_ranking_right"
-                            android:text="@string/crm_di_ming"/>
+                            style="@style/crm_tv_ranking_right"/>
                     </LinearLayout>
                 </LinearLayout>
 

app_core/common/src/main/res/layout/fragment_me.xml

@@ -11,24 +11,25 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="220dp">
+            android:layout_height="170dp">
 
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="180dp"
+                android:layout_height="130dp"
                 android:background="@drawable/bg_me_top" />
 
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <ImageView
                 android:id="@+id/avatar_img"
-                android:layout_width="94dp"
-                android:layout_height="94dp"
+                android:layout_width="86dp"
+                android:layout_height="86dp"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginBottom="8dp"
                 android:contentDescription="@string/app_name"
-                android:scaleType="fitXY"
-                android:src="@drawable/avatar_normal_u" />
+                android:padding="1dp"
+                android:background="@drawable/radian_hollow_white_bg"
+                android:scaleType="fitXY"                 />
 
 
             <LinearLayout
@@ -43,8 +44,10 @@
                     android:id="@+id/nick_name_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:maxWidth="200dp"
+                    android:lines="1"
+                    android:ellipsize="end"
                     android:layout_marginRight="@dimen/padding"
-                    android:text="陈玲"
                     android:textColor="@color/white"
                     android:textSize="20sp" />
 
@@ -61,6 +64,7 @@
                     android:id="@+id/editInfoIv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:padding="@dimen/paddingMin"
                     android:src="@drawable/ic_me_info_edit" />
             </LinearLayout>
 
@@ -88,7 +92,6 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -115,7 +118,6 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -204,7 +206,7 @@
                 android:gravity="center"
                 android:text="@string/user_firend_cirle"
                 android:textColor="#333333"
-                android:textSize="14sp" />
+                android:textSize="15sp" />
 
             <ImageView
                 android:id="@+id/iv_remain"
@@ -258,7 +260,7 @@
                 android:gravity="center"
                 android:text="@string/user_company"
                 android:textColor="#333333"
-                android:textSize="14sp" />
+                android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/company_tv"
@@ -302,7 +304,7 @@
                 android:gravity="center"
                 android:text="@string/user_account"
                 android:textColor="#333333"
-                android:textSize="14sp" />
+                android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/master_tv"
@@ -463,7 +465,7 @@
                 android:gravity="center"
                 android:text="@string/user_setting"
                 android:textColor="#333333"
-                android:textSize="14sp" />
+                android:textSize="15sp" />
 
             <ImageView
                 android:id="@+id/iv_arrow"
@@ -551,7 +553,7 @@
                 android:drawableLeft="@drawable/icon_uu_setting"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="HITest"
+                android:text="支付中心"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -564,6 +566,7 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
     </LinearLayout>
 
 </ScrollView>

app_core/common/src/main/res/values-v14/styles.xml

@@ -38,11 +38,11 @@
     </style>
     
     <!--crm title theme-->
-    <style name="CrmThemeBlue" parent="AppBaseThemeBule">
-        <item name="actionBarStyle">@style/CRM_Ttile_Bule</item>
+    <style name="CrmThemeBlue" parent="MainBaseTheme">
+        <!--<item name="actionBarStyle">@style/CRM_Ttile_Bule</item>-->
     </style>
 
-    <style name="CrmThemeCustomer" parent="AppBaseThemeBule">
+    <style name="CrmThemeCustomer" parent="MainBaseTheme">
         <item name="actionBarStyle">@style/CRM_Ttile_Customer</item>
     </style>
 
@@ -50,7 +50,7 @@
         <item name="actionBarStyle">@style/CRM_Ttile_Visit</item>
     </style>
 
-    <style name="CrmThemeRank" parent="AppBaseThemeBule">
+    <style name="CrmThemeRank" parent="MainBaseTheme">
         <item name="actionBarStyle">@style/CRM_Ttile_Rank</item>
     </style>
 

app_core/common/src/main/res/values/styles.xml

@@ -44,7 +44,7 @@
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
     </style>
 
-    <style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="SplashTheme" parent="MainBaseTheme">
 
     </style>
 
@@ -1013,7 +1013,7 @@
     </style>
 
     <!--TabPageIndicatorStyle-->
-    <style name="StyledIndicators" parent="@style/AppTheme">
+    <style name="StyledIndicators" parent="@style/MainBaseTheme">
         <item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item>
         <item name="vpiUnderlinePageIndicatorStyle">@style/CustomUnderlinePageIndicator</item>
     </style>
@@ -1050,7 +1050,7 @@
         <item name="fadeDelay">1000</item>-->
     </style>
 
-    <style name="StyledBlueIndicators" parent="@style/AppTheme">
+    <style name="StyledBlueIndicators" parent="@style/MainBaseTheme">
         <item name="vpiTabPageIndicatorStyle">@style/CustomBlueTabPageIndicator</item>
         <!--<item name="vpiUnderlinePageIndicatorStyle">@style/CustomBlueUnderlinePageIndicator</item>-->
     </style>

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBCompanyListActivity.java

@@ -60,7 +60,7 @@ public class BBCompanyListActivity extends BaseActivity {
     }
     
     public void initView(){
-        getSupportActionBar().setTitle("企业");
+     setTitle("企业");
         list = (ListView) findViewById(R.id.listview);
         search_edit = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         emptyLayout = new EmptyLayout(ct, list);

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -112,7 +112,7 @@ public class BBookingAddActivity extends SupportToolBarActivity implements View.
     }
 
     public void initView() {
-        getSupportActionBar().setTitle(getString(R.string.booking_business));
+      setTitle(getString(R.string.booking_business));
 
         tvBookObject = (TextView) findViewById(R.id.tv_book_object);
         companyAddRl = (RelativeLayout) findViewById(R.id.company_add_rl);

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -182,7 +182,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     }
     
     public void initView(){
-        getSupportActionBar().setTitle("商务预约");
+        setTitle("商务预约");
         sv_top =(CustomerScrollView)findViewById(R.id.sv_top);
         mListDetail=(MyListView) findViewById(R.id.mListDetail);
         rvTop = (RelativeLayout) findViewById(R.id.rv_top);

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -383,7 +383,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 }
 
                // getSupportActionBar().setTitle(model.getName());
-                getSupportActionBar().setTitle("预约");
+               setTitle("预约");
 
             } else {
                 //TODO 由于该界面必须要转进来的对象，如果model缺失，应返回

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceDetailActivity.java

@@ -132,7 +132,7 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 
 		if (getIntent() != null) {
 			model = getIntent().getParcelableExtra("model");
-			getSupportActionBar().setTitle(model.getName());
+			setTitle(model.getName());
 			LogUtil.prinlnLongMsg("myTest", "model:" + JSON.toJSONString(model));
 			if ("10005".equals(model.getIndustrycode())){
 				//会所

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceListActivity.java

@@ -63,10 +63,16 @@ public class BServiceListActivity extends OABaseActivity {
         initData();
     }
 
+    @Override
+    public boolean needNavigation() {
+        return false;
+    }
+
     private void initView() {
+        setTitle("");
         if (getIntent() != null) {
             menuModel = getIntent().getParcelableExtra("SBMenuModel");
-            getSupportActionBar().setTitle(menuModel.getTitle());
+//            setTitle(menuModel.getTitle());
             LogUtil.d("myTest", "menuModel:" + JSON.toJSONString(menuModel));
         }
         voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -102,7 +102,13 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         intData();
     }
 
+    @Override
+    public boolean needNavigation() {
+        return false;
+    }
+
     private void initView() {
+        setTitle("");
         View view = LayoutInflater.from(ct).inflate(R.layout.action_book_service, null);
         mBackImageView = (ImageView) view.findViewById(R.id.book_service_back);
         mSearchTv = (DrawableCenterTextView) view.findViewById(R.id.book_service_et);

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/DishMainActivity.java

@@ -136,7 +136,7 @@ public class DishMainActivity extends OABaseActivity {
             String sb_imageurl=data.getStringExtra("headImgUrl");
             String tvsub=data.getStringExtra("tvSub");
             String tvtitle=data.getStringExtra("tvTitle");
-            getSupportActionBar().setTitle(tvtitle);
+            setTitle(tvtitle);
             tv_title.setText(tvtitle);
             tv_sub.setText(tvsub);
             AvatarHelper.getInstance().display(sb_imageurl, iv_header, true);

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/DishSelectActivity.java

@@ -143,7 +143,7 @@ public class DishSelectActivity extends OABaseActivity {
              String sb_imageurl=   data.getStringExtra("headImgUrl");
              String tvsub=    data.getStringExtra("tvSub");
              String tvtitle=    data.getStringExtra("tvTitle");
-            getSupportActionBar().setTitle(tvtitle);
+            setTitle(tvtitle);
             tv_title.setText(tvtitle);
             tv_sub.setText(tvsub);
             AvatarHelper.getInstance().display(sb_imageurl, iv_header, true);

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/BBSharesListActivity.java

@@ -30,7 +30,7 @@ public class BBSharesListActivity extends SupportToolBarActivity {
     }
     
     private void initView(){
-        getSupportActionBar().setTitle(getString(R.string.booking_shared));
+       setTitle(getString(R.string.booking_shared));
         mlist=  findViewById(R.id.shareList);
         emptyLayout=new EmptyLayout(mContext,mlist.getRefreshableView());
         if (getIntent()!=null){

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/MuiltSelectShareActivity.java

@@ -45,7 +45,7 @@ public class MuiltSelectShareActivity extends SupportToolBarActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("预约共享");
+        setTitle("预约共享");
         mlist = (PullToRefreshListView) findViewById(R.id.shareList);
         emptyLayout = new EmptyLayout(ct, mlist.getRefreshableView());
         if (getIntent() != null) {

app_modular/appbooking/src/main/java/com/modular/booking/activity/utils/GridSelectActivity.java

@@ -45,7 +45,7 @@ public class GridSelectActivity extends OABaseActivity{
     private void initView(){
         if (getIntent()!=null){
            selectBeens=getIntent().getParcelableArrayListExtra("data");
-           getSupportActionBar().setTitle(getIntent().getStringExtra("title"));
+          setTitle(getIntent().getStringExtra("title"));
            if (!ListUtils.isEmpty(selectBeens)){
                for (int i = 0; i < selectBeens.size(); i++) {
                    SelectBean selectBean=selectBeens.get(i);

app_modular/appbooking/src/main/java/com/modular/booking/activity/utils/GridSelectDateActivity.java

@@ -22,7 +22,6 @@ import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
-import com.litesuits.orm.db.annotation.Ignore;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -112,7 +111,7 @@ public class GridSelectDateActivity extends OABaseActivity {
         });
         if (getIntent() != null) {
             selectBeens = getIntent().getParcelableArrayListExtra("data");
-            getSupportActionBar().setTitle(getIntent().getStringExtra("title"));
+           setTitle(getIntent().getStringExtra("title"));
             companyId=getIntent().getStringExtra("companyId");
             String date =getIntent().getStringExtra("date");
             tvTopDate.setText(date);

app_modular/appbooking/src/main/res/layout/action_book_service.xml

@@ -3,15 +3,14 @@
     android:id="@+id/book_service_action"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="@color/Transpant">
+    android:layout_height="48dp">
 
     <ImageView
         android:id="@+id/book_service_back"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_back" />
+        android:src="@drawable/ic_baseutil_back" />
 
     <com.core.widget.DrawableCenterTextView
         android:id="@+id/book_service_et"

app_modular/appbooking/src/main/res/layout/action_book_service_search.xml

@@ -3,15 +3,14 @@
     android:id="@+id/book_service_search_action"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="@color/antionbarcolor">
+    android:layout_height="48dp">
 
     <ImageView
         android:id="@+id/book_service_search_back"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_back" />
+        android:src="@drawable/ic_baseutil_back" />
 
     <RelativeLayout
         android:layout_width="match_parent"

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/CommonFragmentActivity.java

@@ -34,14 +34,14 @@ public class CommonFragmentActivity extends BaseActivity {
                 FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
                 fragmentTransaction.replace(R.id.fl_content, groupChatFrament);
                 fragmentTransaction.commit();
-                getSupportActionBar().setTitle(getString(R.string.contact_business));
+               setTitle(getString(R.string.contact_business));
                 break;
             case Constants.TYPE_CHAT_MANAGE:
                 AutoCreateChatFragment manageChatFrament = new AutoCreateChatFragment();
                 fragmentTransaction = getSupportFragmentManager().beginTransaction();
                 fragmentTransaction.replace(R.id.fl_content, manageChatFrament);
                 fragmentTransaction.commit();
-                getSupportActionBar().setTitle("管理群");
+            setTitle("管理群");
                 break;
         }
     }

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/CompanyContactsActivity.java

@@ -405,7 +405,7 @@ public class CompanyContactsActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.act_staff_query_list);
-        getSupportActionBar().setTitle(getString(R.string.contact_company));
+        setTitle(getString(R.string.contact_company));
         ct = this;
         manager = new DBManager(ct);
         mInflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -162,9 +162,9 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
 				select_rl.setVisibility(View.VISIBLE);
 			}
 			if (!StringUtil.isEmpty(title)) {
-				getSupportActionBar().setTitle(title);
+			setTitle(title);
 			} else {
-				getSupportActionBar().setTitle(getString(R.string.common_Contact_person));
+				setTitle(getString(R.string.common_Contact_person));
 			}
 		}
 		//设置为空显示列表

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/MyFriendActivity.java

@@ -87,9 +87,9 @@ public class MyFriendActivity extends BaseActivity {
         setContentView(R.layout.fragment_contact_friend);
         isPeculiar = getIntent().getBooleanExtra("isPeculiar", false);
         if (isPeculiar)
-            getSupportActionBar().setTitle(getString(R.string.contact_often));
+           setTitle(getString(R.string.contact_often));
         else
-            getSupportActionBar().setTitle(getString(R.string.contact_friend));
+          setTitle(getString(R.string.contact_friend));
         mSortFriends = new ArrayList<>();
         allFriends = new ArrayList<>();
         mBaseComparator = new BaseComparator<>();

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/NewFriendActivity.java

@@ -95,7 +95,7 @@ public class NewFriendActivity extends BaseActivity implements NewFriendListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.new_friend);
+        setTitle(R.string.new_friend);
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
         mPullToRefreshListView.setMode(Mode.PULL_FROM_START);
         mAdapter = new NewFriendAdapter(this, mNewFriends, mNewFriendActionListener);

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/SelectDateActivity.java

@@ -80,7 +80,7 @@ public class SelectDateActivity extends ActionBackActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getSupportActionBar().setTitle(R.string.select_date_title);
+        setTitle(R.string.select_date_title);
         setContentView(R.layout.activity_simple_list);
         initData();
         initView();

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/UserListActivity.java

@@ -45,7 +45,7 @@ public class UserListActivity extends BaseActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getSupportActionBar().setTitle(R.string.search);
+        setTitle(R.string.search);
         if (getIntent() != null) {
             mKeyWord = getIntent().getStringExtra("key_word");
             mSex = getIntent().getIntExtra("sex", 2);

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/UserSearchActivity.java

@@ -37,7 +37,7 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_user_search);
-        getSupportActionBar().setTitle(getString(R.string.title_friend_add));
+       setTitle(getString(R.string.title_friend_add));
         initView();
     }
 

app_modular/applogin/src/main/java/com/modular/login/activity/ModifyPasswordEmailVerifyActivity.java

@@ -42,7 +42,7 @@ public class ModifyPasswordEmailVerifyActivity extends BaseMVPActivity<SimplePre
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.title_password_reset);
+        setTitle(R.string.title_password_reset);
 
         mMobileEditText = $(R.id.modify_password_email_mobile_et);
         mCodeEditText = $(R.id.modify_password_email_code_et);

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/PersonalPageActivity.java

@@ -97,7 +97,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         type = intent.getIntExtra("type", -1);
         if (type == 1)
             my_rank = intent.getIntExtra("my_rank",-1);
-        getSupportActionBar().setTitle(title);
+      setTitle(title);
 
         LogUtil.i("userid",userid);
         mMovementTotalKmTv = (TextView) findViewById(R.id.movement_total_km_tv);

app_modular/appmessages/src/main/AndroidManifest.xml

@@ -63,8 +63,7 @@
             android:name=".activity.Subscription2Activity"
             android:label="@string/subscribe_title" />
         <activity
-            android:name=".activity.SubcribeManageActivity"
-            android:theme="@style/StyledIndicators">
+            android:name=".activity.SubcribeManageActivity">
             <intent-filter>
                 <action android:name="com.modular.company.SubcribeManageActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -34,7 +34,7 @@ import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
-import com.core.base.SupportToolBarActivity;
+import com.core.base.BaseActivity;
 import com.core.base.view.AndroidBug5497Workaround;
 import com.core.model.Approval;
 import com.core.model.OAConfig;
@@ -64,7 +64,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
-public class ApprovalActivity extends SupportToolBarActivity implements IApproval, ApprovalAdapter.OnChangeClickListener, View.OnClickListener, RecognizerDialogListener {
+public class ApprovalActivity extends BaseActivity implements IApproval, ApprovalAdapter.OnChangeClickListener, View.OnClickListener, RecognizerDialogListener {
     RelativeLayout opinionRL;//操作和意见输入
     FormEditText opinionET;//意见
     RecyclerView contentRV;
@@ -565,10 +565,6 @@ public class ApprovalActivity extends SupportToolBarActivity implements IApprova
         super.showToast(reId);
     }
 
-    @Override
-    public void setTitle(String title) {
-        super.setTitle(title);
-    }
 
     @Override
     public void setTitleStyles(int styles) {

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalNewListActivity.java

@@ -12,13 +12,13 @@ import android.text.Editable;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.core.base.SupportToolBarActivity;
+import com.core.base.BaseActivity;
 import com.core.widget.listener.EditChangeListener;
 import com.modular.appmessages.R;
 import com.modular.appmessages.fragment.ApprovalListFragment;
 import com.modular.apputils.widget.MenuVoiceSearchView;
 
-public class ApprovalNewListActivity extends SupportToolBarActivity {
+public class ApprovalNewListActivity extends BaseActivity {
     private  String[] tabTitle ;
     private ApprovalListFragment mCurrentFragment;
     private ApprovalListFragment daibanFragment, passFragment, pushFragment;

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/Subscription2Activity.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
@@ -15,7 +14,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -29,9 +27,7 @@ import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
 import com.core.widget.RecycleViewDivider;
-import com.core.widget.crouton.Crouton;
 import com.core.widget.crouton.Style;
 import com.modular.appmessages.R;
 import com.modular.appmessages.adapter.SubscriptionAdapter;
@@ -71,7 +67,7 @@ public class Subscription2Activity extends BaseActivity {
                             JSONArray array = JSON.parseObject(message).getJSONArray("data");
                             if (ListUtils.isEmpty(array)) {
                                 updataAdapter();
-                                Crouton.makeText(ct, getString(R.string.common_list_empty));
+                                showToast(  getString(R.string.common_list_empty));
                                 return;
                             }
                             if (ListUtils.isEmpty(messages)) messages = new ArrayList<>();
@@ -84,7 +80,7 @@ public class Subscription2Activity extends BaseActivity {
                                 reckonData(array, false);
                             }
                         } else {
-                            ToastUtil.showToast(ct, message == null ? "" : StringUtil.getChinese(message));
+                          showToast( message == null ? "" : StringUtil.getChinese(message));
                         }
                         break;
                     case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -233,9 +229,9 @@ public class Subscription2Activity extends BaseActivity {
         if (delete) {
             messages.remove(position);
             updataAdapter();
-            Crouton.makeText(ct, R.string.delete_all_succ);
+            showToast( R.string.delete_all_succ);
         } else {
-            Crouton.makeText(ct, R.string.delete_failed);
+            showToast(  R.string.delete_failed);
         }
     }
 

app_modular/appworks/src/main/AndroidManifest.xml

@@ -7,11 +7,9 @@
         android:label="@string/app_name"
         android:supportsRtl="true">
         <activity
-            android:name=".OA.erp.activity.DailydetailsActivity"
-            android:theme="@style/OAThemeSignin" />
+            android:name=".OA.erp.activity.DailydetailsActivity" />
         <activity
-            android:name=".OA.erp.activity.WorkDailyAddActivity"
-            android:theme="@style/OAThemeSignin">
+            android:name=".OA.erp.activity.WorkDailyAddActivity">
             <intent-filter>
                 <action android:name="com.modular.plat.WorkDailyAddActivity" />
 
@@ -19,8 +17,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".OA.erp.activity.WorkDailyShowActivity"
-            android:theme="@style/OAThemeSignin" />
+            android:name=".OA.erp.activity.WorkDailyShowActivity"/>
         <activity android:name=".OA.platform.activity.PlatDailyShowActivity" />
         <activity android:name=".OA.platform.activity.PlatWDdetailyActivity" />
         <activity
@@ -76,8 +73,7 @@
             android:label="@string/sign_teams_rank" />
         <activity
             android:name=".OA.erp.activity.MeetDetailsActivity"
-            android:label="@string/meet_detail"
-            android:theme="@style/OAThemeMeet" />
+            android:label="@string/meet_detail"/>
         <activity
             android:name=".OA.erp.activity.DetailTaskActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
@@ -86,7 +82,6 @@
             android:label="@string/new_meet"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@style/OAThemeMeet"
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.oa.AddMeetingActivity" />
@@ -96,21 +91,17 @@
         </activity>
         <activity
             android:name=".OA.erp.activity.MeetingActivity"
-            android:label="@string/meet_manage"
-            android:theme="@style/OAThemeMeet" />
+            android:label="@string/meet_manage"/>
         <activity
             android:name=".OA.erp.activity.SaveMeetActivity"
-            android:label="@string/meet_details"
-            android:theme="@style/OAThemeMeet" />
+            android:label="@string/meet_details" />
         <activity
             android:name=".OA.erp.activity.AddMeetTaskActivity"
-            android:label="@string/meet_task"
-            android:theme="@style/OAThemeMeet" />
+            android:label="@string/meet_task" />
         <activity android:name=".CRM.erp.activity.DbfindListActivity" />
         <activity android:name=".CRM.erp.activity.DbfindList2Activity" />
         <activity
-            android:name=".CRM.erp.activity.BusinessActivity"
-            android:theme="@style/CrmThemeBlue">
+            android:name=".CRM.erp.activity.BusinessActivity">
             <intent-filter>
                 <action android:name="com.modular.crm.BusinessActivity" />
 
@@ -118,46 +109,36 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".CRM.erp.activity.BusinessDetailActivty"
-            android:theme="@style/CrmThemeBlue" />
+            android:name=".CRM.erp.activity.BusinessDetailActivty"/>
         <activity
-            android:name=".CRM.erp.activity.BusinessDetailInfoActivity"
-            android:theme="@style/CrmThemeBlue" />
+            android:name=".CRM.erp.activity.BusinessDetailInfoActivity" />
         <activity
-            android:name=".CRM.erp.activity.BusinessLessActivity"
-            android:theme="@style/CrmThemeBlue" />
+            android:name=".CRM.erp.activity.BusinessLessActivity" />
         <activity
-            android:name=".CRM.erp.activity.BusinessTransferActivity"
-            android:theme="@style/CrmThemeBlue" />
+            android:name=".CRM.erp.activity.BusinessTransferActivity" />
         <activity
             android:name=".CRM.erp.activity.BusinessSelectCustomerActivity"
             android:launchMode="singleTask"
-            android:theme="@style/CrmThemeBlue"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".CRM.erp.activity.CustomerAddActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeBlue"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".CRM.erp.activity.BusinessAddActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeBlue"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".CRM.erp.activity.BusinessStateActivity"
-            android:launchMode="singleTask"
-            android:theme="@style/CrmThemeBlue" />
+            android:launchMode="singleTask" />
         <activity
             android:name=".CRM.erp.activity.AddBusinessActivity"
             android:label="@string/crm_creat_business" />
         <activity android:name=".CRM.erp.activity.SearchSelectActivity" />
         <activity
-            android:name=".CRM.erp.activity.CustomerDetailActivity"
-            android:theme="@style/CrmThemeCustomer" />
+            android:name=".CRM.erp.activity.CustomerDetailActivity" />
         <activity
-            android:name=".CRM.erp.activity.CustomerListActivity"
-            android:theme="@style/CrmThemeCustomer">
+            android:name=".CRM.erp.activity.CustomerListActivity">
             <intent-filter>
                 <action android:name="com.modular.crm.CustomerListActivity" />
 
@@ -165,8 +146,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".CRM.erp.activity.CustomerListSelectActivity"
-            android:theme="@style/CrmThemeCustomer" />
+            android:name=".CRM.erp.activity.CustomerListSelectActivity" />
         <activity
             android:name=".CRM.erp.activity.UserSelectActivity"
             android:label="@string/select_user" />
@@ -215,8 +195,7 @@
         </activity>
         <activity
             android:name=".CRM.erp.activity.SalesRankingActivity"
-            android:label="@string/crmmain_wall_of_fame"
-            android:theme="@style/CrmThemeRank">
+            android:label="@string/crmmain_wall_of_fame">
             <intent-filter>
                 <action android:name="com.modular.crm.SalesRankingActivity" />
 
@@ -301,8 +280,7 @@
 
         <!-- 产城服务主页面 -->
         <activity
-            android:name=".activity.CityIndustryServiceMainActivity"
-            android:theme="@style/SplashTheme">
+            android:name=".activity.CityIndustryServiceMainActivity">
             <intent-filter>
                 <action android:name="com.modular.cityIndustry.CityIndustryServiceMainActivity" />
 
@@ -436,17 +414,14 @@
         <activity
             android:name=".activity.PublicInquiryListActivity"
             android:hardwareAccelerated="true"
-            android:theme="@style/StyledBlueIndicators"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activity.CustomerInquiryListActivity"
             android:hardwareAccelerated="true"
-            android:theme="@style/StyledBlueIndicators"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activity.PurchaseOrderListActivity"
             android:hardwareAccelerated="true"
-            android:theme="@style/StyledBlueIndicators"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity android:name=".activity.PublicInquiryDetailActivity" />
 

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/AddBusinessActivity.java

@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.model.LatLng;
-import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -93,11 +92,11 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.crm_creat_business);
+      setTitle(R.string.crm_creat_business);
         Intent intent = getIntent();
         isUpdata = intent == null ? false : intent.getBooleanExtra("isUpdata", false);
         if (isUpdata) {
-            getSupportActionBar().setTitle(R.string.update_business);
+           setTitle(R.string.update_business);
             findViewById(R.id.business_stage_rl).setVisibility(View.VISIBLE);
             findViewById(R.id.business_Library_rl).setVisibility(View.VISIBLE);
             bc_id = intent.getIntExtra("id", 0);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessActivity.java

@@ -84,8 +84,7 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
     }
 
     public void initView() {
-        getSupportActionBar().setTitle(getString(R.string.crmmain_business));
-
+        setTitle(getString(R.string.crmmain_business));
         bt_qiang = (Button) findViewById(R.id.bt_qiang);
         bt_create = (Button) findViewById(R.id.bt_create);
         bt_manage = (Button) findViewById(R.id.bt_manage);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessAddActivity.java

@@ -303,7 +303,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("创建商机");
+       setTitle("创建商机");
         if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_emname"))) {
             et_business_enterMan.setText(CommonUtil.getSharedPreferences(ct, "erp_emname"));
         } else {

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailActivty.java

@@ -181,19 +181,19 @@ public class BusinessDetailActivty extends BaseActivity {
             currentdate = intent.getStringExtra("currentdate");
         }
         if (type == 0) {
-            getSupportActionBar().setTitle(getString(R.string.business_followup));
+          setTitle(getString(R.string.business_followup));
             ll_top_state.setVisibility(View.VISIBLE);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 1) {
-            getSupportActionBar().setTitle(getString(R.string.business_seize));
+          setTitle(getString(R.string.business_seize));
             ll_top_state.setVisibility(View.GONE);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 2) {
-            getSupportActionBar().setTitle(getString(R.string.business_distribution));
+           setTitle(getString(R.string.business_distribution));
             ll_top_state.setVisibility(View.GONE);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 3) {
-            getSupportActionBar().setTitle(business_steps);
+            setTitle(business_steps);
             ll_top_state.setVisibility(View.GONE);
             isAdminer(12);
         } else {

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailInfoActivity.java

@@ -219,7 +219,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.business_detail));
+       setTitle(getString(R.string.business_detail));
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 0);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessLessActivity.java

@@ -107,13 +107,13 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
 
         switch (type) {
             case 1:
-                getSupportActionBar().setTitle("商机失效");
+               setTitle("商机失效");
                 ll_leader.setVisibility(View.VISIBLE);
                 ll_moment.setVisibility(View.GONE);
                 ll_date.setVisibility(View.VISIBLE);
                 break;
             case 2:
-                getSupportActionBar().setTitle("继续跟进");
+               setTitle("继续跟进");
                 //tv_business_state.setText(process);
                 ll_leader.setVisibility(View.GONE);
                 ll_moment.setVisibility(View.VISIBLE);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessSelectCustomerActivity.java

@@ -71,7 +71,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     private void initView() {
         search_edit = (ClearEditText) findViewById(R.id.search_edit);
         mlist = (PullToRefreshListView) findViewById(R.id.list_business);
-        getSupportActionBar().setTitle("选择客户");
+        setTitle("选择客户");
         if (getIntent() != null) {
             code = getIntent().getStringExtra("code");
 

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessStateActivity.java

@@ -185,13 +185,13 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             type = intent.getIntExtra("bt_type", 0);
         }
         if (type == 0) {
-            getSupportActionBar().setTitle(getString(R.string.business_followup));
+      setTitle(getString(R.string.business_followup));
             ll_top_state.setVisibility(View.VISIBLE);
         } else if (type == 1) {
-            getSupportActionBar().setTitle(getString(R.string.business_seize));
+          setTitle(getString(R.string.business_seize));
             ll_top_state.setVisibility(View.GONE);
         } else if (type == 2) {
-            getSupportActionBar().setTitle(getString(R.string.business_distribution));
+          setTitle(getString(R.string.business_distribution));
             ll_top_state.setVisibility(View.GONE);
         }
     }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessTransferActivity.java

@@ -55,7 +55,7 @@ public class BusinessTransferActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("转移到商机库");
+        setTitle("转移到商机库");
         mlist = (PullToRefreshListView) findViewById(R.id.list_business);
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerAddActivity.java

@@ -192,7 +192,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             }
             if (type == 1) {
                 ll_infomal.setVisibility(View.VISIBLE);
-                getSupportActionBar().setTitle(getString(R.string.formal_customer));
+                setTitle(getString(R.string.formal_customer));
                 if (StringUtil.isEmpty(cu_code)) {
                     et_cu_code.setText("");
                     et_cu_code.setEnabled(true);
@@ -202,7 +202,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
             } else {
                 ll_infomal.setVisibility(View.GONE);
-                getSupportActionBar().setTitle(getString(R.string.client_yu_luru));
+                setTitle(getString(R.string.client_yu_luru));
             }
 
             if (mCompanyName != null) {
@@ -477,7 +477,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     if (falg == 0) {
                         ll_infomal.setVisibility(View.VISIBLE);
                         type = 1;//正式客户
-                        getSupportActionBar().setTitle(getString(R.string.formal_customer));
+                     setTitle(getString(R.string.formal_customer));
 
                         if (StringUtil.isEmpty(cu_code)) {
                             CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
@@ -485,7 +485,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     } else {
                         ll_infomal.setVisibility(View.GONE);
                         type = 0;//客户预录入
-                        getSupportActionBar().setTitle(getString(R.string.client_yu_luru));
+                        setTitle(getString(R.string.client_yu_luru));
 
                         if (StringUtil.isEmpty(cu_code)) {
                             CommonUtil.getCommonId(ct, "CUSTOMER_SEQ", mHandler, GET_CU_ID);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerDetailActivity.java

@@ -110,7 +110,7 @@ public class CustomerDetailActivity extends BaseActivity {
 
 
         ct = this;
-        getSupportActionBar().setTitle("客户详情");
+       setTitle("客户详情");
     }
 
     private void initListener() {

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerListActivity.java

@@ -104,7 +104,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
 
     private void initView() {
         ct = this;
-        getSupportActionBar().setTitle(getString(R.string.crmmain_client));
+       setTitle(getString(R.string.crmmain_client));
 
         if (CommonUtil.isNetWorkConnected(ct)) {
             loadParams(3);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/CustomerListSelectActivity.java

@@ -61,7 +61,7 @@ public class CustomerListSelectActivity extends BaseActivity   {
         ct = this;
         mlist = (PullToRefreshListView) findViewById(R.id.list_business);
         voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
-        getSupportActionBar().setTitle(getString(R.string.client_search));
+      setTitle(getString(R.string.client_search));
         mEmptyLayout = new EmptyLayout(this,mlist.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DbfindList2Activity.java

@@ -142,7 +142,7 @@ public class DbfindList2Activity extends BaseActivity{
         listview = (PullToRefreshListView) findViewById(R.id.listview);
         search_edit = (ClearEditText) findViewById(R.id.search_edit);
         listview.setEmptyView(view);
-        getSupportActionBar().setTitle("选择同事");
+      setTitle("选择同事");
         adapter = new DistributionSelectAdapter();
         listview.setAdapter(adapter);
         listview.setMode(PullToRefreshBase.Mode.DISABLED);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DbfindListActivity.java

@@ -121,7 +121,7 @@ public class DbfindListActivity extends BaseActivity {
         et_Search = (ClearEditText) findViewById(R.id.et_Search);
         lv_employee = (PullToRefreshListView) findViewById(R.id.lv_employee);
         ct = this;
-        getSupportActionBar().setTitle("选择同事");
+     setTitle("选择同事");
         
         Intent intent=getIntent();
         int listViewMode=ListView.CHOICE_MODE_SINGLE;

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceCycleCountDetailsActivity.java

@@ -65,7 +65,7 @@ public class DeviceCycleCountDetailsActivity extends SupportToolBarActivity {
             id = intent.getStringExtra("id");
             String title = isAct ? "已盘点" : "未盘点";
             if (title != null) {
-                getSupportActionBar().setTitle(title);
+             setTitle(title);
             }
             String modelJSON = intent.getStringExtra("models");
             List<CycleCount.Data> models = JSON.parseArray(modelJSON, CycleCount.Data.class);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -681,7 +681,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
             mDevice = intent.getParcelableExtra(Constants.FLAG.MODEL);
             caller = intent.getStringExtra("caller");
             if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
-                getSupportActionBar().setTitle(intent.getStringExtra("title"));
+            setTitle(intent.getStringExtra("title"));
             }
         }
     }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/SearchSelectActivity.java

@@ -59,7 +59,7 @@ public class SearchSelectActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.describe);
+       setTitle(R.string.describe);
 
         voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         pullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pullToRefreshListView);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/TaskAddErpActivity.java

@@ -118,7 +118,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             et_task_people.setText(people);
             selectNames = people;
         }
-        getSupportActionBar().setTitle(title);
+       setTitle(title);
         iv_find.setOnClickListener(this);
         et_startime.setOnClickListener(this);
         et_endtime.setOnClickListener(this);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/UserSelectActivity.java

@@ -170,7 +170,7 @@ public class UserSelectActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.select_user);
+       setTitle(R.string.select_user);
         View view = LayoutInflater.from(this).inflate(R.layout.view_empty, null);
         listview.setEmptyView(view);
         adapter = new MeetSelectAdapter();

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/CharitSearchActivity.java

@@ -70,7 +70,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 1);
-            getSupportActionBar().setTitle(R.string.charitable);
+          setTitle(R.string.charitable);
         } else {
             type = 1;
         }

app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessLoginActivity.java

@@ -41,7 +41,7 @@ public class B2BBusinessLoginActivity extends BaseMVPActivity {
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.str_work_b2b_commerce);
+       setTitle(R.string.str_work_b2b_commerce);
 
         mRecyclerView = $(R.id.b2b_business_login_company_rv);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));

app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryFuncSetActivity.java

@@ -46,7 +46,7 @@ public class CityIndustryFuncSetActivity extends BaseMVPActivity<WorkPlatPresent
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.city_industry_service);
+     setTitle(R.string.city_industry_service);
         mPullToRefreshListView = $(R.id.city_industry_ptlv);
         mPullToRefreshListView.setMode(PullToRefreshBase.Mode.DISABLED);
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonCityIndustryDetailsActivity.java

@@ -239,7 +239,7 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         mServiceId = intent.getStringExtra("serve_id");
         mTitle = intent.getStringExtra("title");
         if (!StringUtil.isEmpty(mTitle)) {
-            getSupportActionBar().setTitle(mTitle + getString(R.string.doc_detail));
+           setTitle(mTitle + getString(R.string.doc_detail));
         }
         //请求获取单据提交内容数据
         progressDialog.show();

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -680,12 +680,12 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     formidkey = "va_id";
                     startDate = "va_startime";
                     endDate = "va_endtime";
-                    getSupportActionBar().setTitle("请假单");
+                   setTitle("请假单");
                 } else if ("SpeAttendance".equals(caller)) {
                     startDate = "sa_appdate";
                     endDate = "sa_enddate";
                     formidkey = "sa_id";
-                    getSupportActionBar().setTitle("特殊考勤");
+                  setTitle("特殊考勤");
                 } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
                     startDate = "wod_startdate";
                     endDate = "wod_enddate";
@@ -698,7 +698,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     }
                     detailkey_id = "wod_id";//明细id
                     detailkey_did = "wod_woid";//主表id
-                    getSupportActionBar().setTitle("加班单");
+                   setTitle("加班单");
                 } else if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
                     startDate = "fp_prestartdate";
                     endDate = "fp_preenddate";
@@ -708,27 +708,27 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     formidkey = "fp_id";
                     detailkey_id = "fpd_id";//明细id
                     detailkey_did = "fpd_fpid";
-                    getSupportActionBar().setTitle("出差单");
+                   setTitle("出差单");
                 } else if ("StandbyApplication".equals(caller)) {
                     formidkey = "sa_id";
                     detailkey_id = "sad_id";//明细id
                     detailkey_did = "sad_said";//关联id 主表
-                    getSupportActionBar().setTitle("备用机申请单");
+                    setTitle("备用机申请单");
                 } else if ("MaterielApply".equals(caller)) {
                     formidkey = "ama_id";
                     detailkey_id = "amad_id";//明细id
                     detailkey_did = "amad_amaid";//关联id 主表
-                    getSupportActionBar().setTitle("物料申请单");
+                  setTitle("物料申请单");
                 } else if ("MainTain".equals(caller)) {
                     formidkey = "mt_id";
                     detailkey_id = "mtd_id";//明细id
                     detailkey_did = "mtd_mtid";//关联id 主表
-                    getSupportActionBar().setTitle("维修申请单");
+                   setTitle("维修申请单");
                 }
 
             }
             if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
-                getSupportActionBar().setTitle(intent.getStringExtra("title"));
+               setTitle(intent.getStringExtra("title"));
             }
             LogUtil.d("更新caller：" + caller);
             LogUtil.d("更新id：" + formid);

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonFormListActivity.java

@@ -183,28 +183,28 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
         from = intent.getStringExtra("from");
         serveId = intent.getStringExtra("serveId");
         if ("Ask4Leave".equals(caller)) {
-            getSupportActionBar().setTitle("请假单");
+            setTitle("请假单");
         }
         if ("SpeAttendance".equals(caller)) {
-            getSupportActionBar().setTitle("特殊考勤");
+            setTitle("特殊考勤");
         }
         if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
-            getSupportActionBar().setTitle("出差单");
+            setTitle("出差单");
         }
         if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
-            getSupportActionBar().setTitle("加班单");
+            setTitle("加班单");
         }
         if ("MaterielApply".equals(caller)) {
-            getSupportActionBar().setTitle("物料申请单");
+           setTitle("物料申请单");
         } else if ("MainTain".equals(caller)) {
-            getSupportActionBar().setTitle("维修申请单");
+            setTitle("维修申请单");
         }
         if ("FeePlease!FYBX".equals(caller)) {
-            getSupportActionBar().setTitle("费用报销");
+           setTitle("费用报销");
         }
 
         if (!StringUtil.isEmpty(intent.getStringExtra("title"))) {
-            getSupportActionBar().setTitle(intent.getStringExtra("title"));
+           setTitle(intent.getStringExtra("title"));
         }
         String user = CommonUtil.getSharedPreferences(CommonFormListActivity.this,
                 "username");
@@ -380,7 +380,7 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
                     statusKey = "ama_status";
                 } else if ("MainTain".equals(caller)) {
                     statusKey = "mt_status";
-                    getSupportActionBar().setTitle("维修申请单");
+                  setTitle("维修申请单");
                 } else if ("FeePlease!FYBX".equals(caller)) {
                     statusKey = "fp_status";
                 }

app_modular/appworks/src/main/java/com/uas/appworks/activity/CustomerInquiryDetailActivity.java

@@ -121,11 +121,11 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             if (mState != null) {
                 switch (mState) {
                     case Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO:
-                        getSupportActionBar().setTitle(R.string.str_wait_quoted);
+                        setTitle(R.string.str_wait_quoted);
                         initEditable(true, View.VISIBLE);
                         break;
                     case Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE:
-                        getSupportActionBar().setTitle(R.string.str_quoted_price);
+                        setTitle(R.string.str_quoted_price);
                         if (mJson != null && JSONUtil.validate(mJson)) {
                             JSONObject detailObject = JSON.parseObject(mJson);
                             JSONObject inquiryObject = detailObject.getJSONObject("inquiry");
@@ -142,31 +142,31 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                         }
                         break;
                     case Constants.FLAG.STATE_CUSTOMER_INQUIRY_AGREED:
-                        getSupportActionBar().setTitle(R.string.str_quotation_adopted);
+                        setTitle(R.string.str_quotation_adopted);
                         initEditable(false, View.GONE);
                         break;
                     case Constants.FLAG.STATE_CUSTOMER_INQUIRY_END:
-                        getSupportActionBar().setTitle(R.string.str_expired);
+                        setTitle(R.string.str_expired);
                         initEditable(false, View.GONE);
                         break;
                     case Constants.FLAG.STATE_CUSTOMER_INQUIRY_REFUSED:
-                        getSupportActionBar().setTitle(R.string.str_quotation_unadopted);
+                       setTitle(R.string.str_quotation_unadopted);
                         initEditable(false, View.GONE);
                         break;
                     case Constants.FLAG.STATE_CUSTOMER_INQUIRY_INVALID:
-                        getSupportActionBar().setTitle(R.string.str_invalid);
+                        setTitle(R.string.str_invalid);
                         initEditable(false, View.GONE);
                         break;
                     case Constants.FLAG.STATE_CUSTOMER_INQUIRY_ABANDONED:
-                        getSupportActionBar().setTitle(R.string.str_abandoned);
+                        setTitle(R.string.str_abandoned);
                         initEditable(false, View.GONE);
                         break;
                     case Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO:
-                        getSupportActionBar().setTitle(R.string.str_wait_quoted);
+                       setTitle(R.string.str_wait_quoted);
                         initEditable(true, View.VISIBLE);
                         break;
                     case Constants.FLAG.STATE_PUBLIC_INQUIRY_INVALID:
-                        getSupportActionBar().setTitle(R.string.str_finished);
+                        setTitle(R.string.str_finished);
                         initEditable(false, View.GONE);
                     default:
                         initEditable(false, View.GONE);
@@ -532,7 +532,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         String result = o.toString();
         LogUtil.prinlnLongMsg("customerdetailsuccess", result);
         if (flag == CUSTOMER_INQUIRY_REPLY) {
-            getSupportActionBar().setTitle(R.string.str_quoted_price);
+          setTitle(R.string.str_quoted_price);
             toast(getString(R.string.quote_success));
             String publicId = "";
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {

app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -91,8 +91,14 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         return R.layout.activity_data_inquiry_list;
     }
 
+    @Override
+    public boolean needNavigation() {
+        return false;
+    }
+
     @Override
     protected void initView() {
+        setTitle("");
         View view = LayoutInflater.from(ct).inflate(R.layout.action_data_inquiry_list, null);
         mBackImageView = (ImageView) view.findViewById(R.id.back);
         mFilterImageView = (ImageView) view.findViewById(R.id.data_inquiry_filter_iv);

app_modular/appworks/src/main/java/com/uas/appworks/activity/EnterpriseInviteStatisticsActivity.java

@@ -53,7 +53,7 @@ public class EnterpriseInviteStatisticsActivity extends BaseMVPActivity {
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle("企业邀请统计");
+        setTitle("企业邀请统计");
 
         mEnterpriseTextView = $(R.id.enterprise_invite_statistics_name_tv);
         mYearTextView = $(R.id.enterprise_invite_statistics_year_tv);

app_modular/appworks/src/main/java/com/uas/appworks/activity/InviteRegisterActivity.java

@@ -60,7 +60,7 @@ public class InviteRegisterActivity extends BaseMVPActivity {
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.str_work_invite_register);
+        setTitle(R.string.str_work_invite_register);
 
         mWebView = $(R.id.invite_register_wv);
         mSuccessLinearLayout = $(R.id.invite_register_success);

app_modular/appworks/src/main/java/com/uas/appworks/activity/InviteRegisterListActivity.java

@@ -73,13 +73,13 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
             mState = intent.getIntExtra(Constants.FLAG.INVITE_REGISTER_LIST_STATE, -1);
 
             if (mState == Constants.FLAG.STATE_INVITE) {
-                getSupportActionBar().setTitle(R.string.invite_detail);
+                setTitle(R.string.invite_detail);
                 mListState = "";
             } else if (mState == Constants.FLAG.STATE_REGISTER) {
-                getSupportActionBar().setTitle(R.string.register_detail);
+               setTitle(R.string.register_detail);
                 mListState = "done";
             } else if (mState == Constants.FLAG.STATE_UNREGISTER) {
-                getSupportActionBar().setTitle(R.string.unregister_detail);
+             setTitle(R.string.unregister_detail);
                 mListState = "todo";
             }
         }

app_modular/appworks/src/main/java/com/uas/appworks/activity/InviteRegisterMainActivity.java

@@ -83,7 +83,7 @@ public class InviteRegisterMainActivity extends BaseMVPActivity<WorkPlatPresente
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.str_work_invite_register);
+        setTitle(R.string.str_work_invite_register);
 
         mInviteCountLl = (LinearLayout) $(R.id.invite_register_main_invite_ll);
         mInviteCountTv = (TextView) $(R.id.invite_register_main_invite_tv);

app_modular/appworks/src/main/java/com/uas/appworks/activity/PublicInquiryDetailActivity.java

@@ -65,7 +65,7 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.title_quoted_price);
+       setTitle(R.string.title_quoted_price);
 
         mInquiryRecyclerView = $(R.id.public_inquiry_detail_inquiry_information_rv);
         mMaterialRecyclerView = $(R.id.public_inquiry_detail_material_information_rv);

app_modular/appworks/src/main/java/com/uas/appworks/activity/RegisterDetailActivity.java

@@ -39,7 +39,7 @@ public class RegisterDetailActivity extends BaseMVPActivity {
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.enterprise_register_detail);
+       setTitle(R.string.enterprise_register_detail);
 
         Intent intent = getIntent();
         if (intent != null) {

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkDataFormActivity.java

@@ -682,12 +682,12 @@ public class WorkDataFormActivity extends BaseActivity implements View.OnClickLi
                     formidkey = "va_id";
                     startDate = "va_startime";
                     endDate = "va_endtime";
-                    getSupportActionBar().setTitle("请假单");
+                   setTitle("请假单");
                 } else if ("SpeAttendance".equals(caller)) {
                     startDate = "sa_appdate";
                     endDate = "sa_enddate";
                     formidkey = "sa_id";
-                    getSupportActionBar().setTitle("特殊考勤");
+                   setTitle("特殊考勤");
                 } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
                     startDate = "wod_startdate";
                     endDate = "wod_enddate";

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkFuncSetActivity.java

@@ -39,7 +39,7 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.work_func_set);
+       setTitle(R.string.work_func_set);
 
         mFuncRecyclerView = $(R.id.work_plat_func_set_rv);
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkModuleSortActivity.java

@@ -64,7 +64,7 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
 
     @Override
     protected void initView() {
-        getSupportActionBar().setTitle(R.string.work_module_custom);
+       setTitle(R.string.work_module_custom);
 
         mAddRecyclerView = $(R.id.work_module_sort_add_rv);
         mDeleteRecyclerView = $(R.id.work_module_sort_delete_rv);

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryActivity.java

@@ -68,8 +68,7 @@ public class DataInquiryActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_data_inquiry);
-        getSupportActionBar().setTitle("数据查询");
-
+        setTitle("数据查询");
         initViews();
         initEvents();
         initDatas();

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryListActivity.java

@@ -186,7 +186,13 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
     }
 
+    @Override
+    public boolean needNavigation() {
+        return false;
+    }
+
     private void initViews() {
+        setTitle("");
         View view = LayoutInflater.from(ct).inflate(R.layout.action_data_inquiry_list, null);
         mBackImageView = (ImageView) view.findViewById(R.id.back);
         mFilterImageView = (ImageView) view.findViewById(R.id.data_inquiry_filter_iv);

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquirySearchActivity.java

@@ -65,7 +65,7 @@ public class DataInquirySearchActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_data_inquiry_search);
-        getSupportActionBar().setTitle("数据查询");
+        setTitle("数据查询");
 
         initViews();
         initEvents();

app_third/libbdupdatesdk/src/main/res/values/bdp_update_styles.xml

@@ -1,6 +1,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="bdp_update_dialog_style" parent="android:Theme.Dialog">
+    <style name="bdp_update_dialog_style" parent="android:Theme.Holo.Dialog.NoActionBar">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowIsTranslucent">true</item>