17:54

WeiChat/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'AndResGuard'
 
 //定义时间
 def releaseTime() {
@@ -101,7 +100,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.config
         }
         debug {
@@ -147,78 +146,6 @@ android {
     }*/
 }
 
-andResGuard {
-    // mappingFile = file("./resource_mapping.txt")
-    mappingFile = null
-    use7zip = true
-    useSign = true
-    // 打开这个开关，会keep住所有资源的原始路径，只混淆资源的名字
-    keepRoot = false
-    whiteList = [
-            // for your icon
-            "R.drawable.uuu",
-            // for fabric
-            "R.string.com.crashlytics.*",
-            // for google-services
-            "R.string.google_app_id",
-            "R.string.gcm_defaultSenderId",
-            "R.string.default_web_client_id",
-            "R.string.ga_trackingId",
-            "R.string.firebase_database_url",
-            "R.string.google_api_key",
-            "R.string.google_crash_reporting_api_key",
-            "R.dimen.rc_*",
-            //for umeng
-            "R.anim.umeng*",
-            "R.string.umeng*",
-            "R.string.UM*",
-            "R.string.tb_*",
-            "R.layout.umeng*",
-            "R.layout.socialize_*",
-            "R.layout.*messager*",
-            "R.layout.tb_*",
-            "R.color.umeng*",
-            "R.color.tb_*",
-            "R.style.*UM*",
-            "R.style.rc_*",
-            "R.style.umeng*",
-            "R.drawable.umeng*",
-            "R.drawable.tb_*",
-            "R.drawable.sina*",
-            "R.drawable.qq_*",
-            "R.drawable.tb_*",
-            "R.id.umeng*",
-            "R.id.*messager*",
-            "R.id.rc_*",
-            "R.id.progress_bar_parent",
-            "R.id.socialize_*",
-            "R.id.webView",
-            //for jpush
-            "R.drawable.jpush_notification_icon"
-    ]
-    compressFilePattern = [
-            "*.png",
-            "*.jpg",
-            "*.jpeg",
-            "*.gif",
-    ]
-    sevenzip {
-        artifact = 'com.tencent.mm:SevenZip:1.2.13'
-        //path = "/usr/local/bin/7za"
-    }
-
-    /**
-     * 可选： 如果不设置则会默认覆盖assemble输出的apk
-     **/
-    // finalApkBackupPath = "${project.rootDir}/final.apk"
-
-    /**
-     * 可选: 指定v1签名时生成jar文件的摘要算法
-     * 默认值为“SHA-1”
-     **/
-    // digestalg = "SHA-256"
-}
-
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile deps.junit

WeiChat/proguard-rules.pro

@@ -3,15 +3,232 @@
 # in C:\Android\sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
+
+###############################
+#
+# 公共部分（固定不变）
 #
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+###############################
+#1.基本指令区
+# 代码混淆压缩比，在0~7之间，默认为5，一般不做修改
+-optimizationpasses 5
+# 混合时不使用大小写混合，混合后的类名为小写
+-dontusemixedcaseclassnames
+# 指定不去忽略非公共库的类
+-dontskipnonpubliclibraryclasses
+# 这句话能够使我们的项目混淆后产生映射文件
+# 包含有类名->混淆后类名的映射关系
+-verbose
+# 指定不去忽略非公共库的类成员
+-dontskipnonpubliclibraryclassmembers
+# 不做预校验，preverify是proguard的四个步骤之一，Android不需要preverify，去掉这一步能够加快混淆速度。
+-dontpreverify
+# 保留Annotation不混淆
+-keepattributes *Annotation*,InnerClasses
+# 避免混淆泛型
+-keepattributes Signature
+# 抛出异常时保留代码行号
+-keepattributes SourceFile,LineNumberTable
+# 指定混淆是采用的算法，后面的参数是一个过滤器
+# 这个过滤器是谷歌推荐的算法，一般不做更改
+-optimizations !code/simplification/cast,!field/*,!class/merging/*
+
+#2.默认保留区
+# 保留我们使用的四大组件，自定义的Application等等这些类不被混淆
+# 因为这些子类都有可能被外部调用
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class * extends android.view.View
+-keep public class com.android.vending.licensing.ILicensingService
+# 保留support下的所有类及其内部类
+-keep class android.support.** {*;}
+# 保留继承的
+-keep public class * extends android.support.v4.**
+-keep public class * extends android.support.v7.**
+-keep public class * extends android.support.annotation.**
+# 保留R下面的资源
+-keep class **.R$* {*;}
+
+# 保留本地native方法不被混淆
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+# 保留在Activity中的方法参数是view的方法，
+# 这样以来我们在layout中写的onClick就不会被影响
+-keepclassmembers class * extends android.app.Activity{
+    public void *(android.view.View);
+}
+# 保留枚举类不被混淆
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+# 保留我们自定义控件（继承自View）不被混淆
+-keep public class * extends android.view.View{
+    *** get*();
+    void set*(***);
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+# 保留Parcelable序列化类不被混淆
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+# 保留Serializable序列化的类不被混淆
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    !private <fields>;
+    !private <methods>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+# 对于带有回调函数的onXXEvent、**On*Listener的，不能被混淆
+-keepclassmembers class * {
+    void *(**On*Event);
+}
 
-# Add any project specific keep options here:
+#3.webview
+-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+   public *;
+}
+-keepclassmembers class * extends android.webkit.webViewClient {
+    public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
+    public boolean *(android.webkit.WebView, java.lang.String);
+}
+-keepclassmembers class * extends android.webkit.webViewClient {
+    public void *(android.webkit.webView, jav.lang.String);
+}
+#移除Log类打印各个等级日志的代码，打正式包的时候可以做为禁log使用
+#这里可以作为禁止log打印的功能使用，另外的一种实现方案是通过BuildConfig.DEBUG的变量来控制
+-assumenosideeffects class android.util.Log {
+    public static *** v(...);
+    public static *** i(...);
+    public static *** d(...);
+    public static *** w(...);
+    public static *** e(...);
+}
+
+
+###############################
+#
+# 第三方jar包
+#
+###############################
+-keep class com.baidu.** {*;}
+-keep class vi.com.** {*;}
+-dontwarn com.baidu.**
+
+-keep class com.uuzuche.lib_zxing.** {*;}
+-keep class com.andreabaccega.** {*;}
+-keep class com.github.clans.fab.** {*;}
+-keep class com.yalantis.phoenix.** {*;}
+-keep class com.baoyz.swipemenulistview.** {*;}
+-keep class com.viewpagerindicator.** {*;}
+-keep class com.afollestad.materialdialogs.** {*;}
+-keep class com.github.mikephil.charting.** {*;}
+-keep class com.module.recyclerlibrary.** {*;}
+-keep class com.handmark.pulltorefresh.library.** {*;}
+-keep class cc.cloudist.acplibrary.** {*;}
+
+-keep class android.arch.core.internal.** {*;}
+-keep class android.arch.lifecycle.** {*;}
+-keep class com.alibaba.fastjson.** {*;}
+-dontwarn com.alibaba.fastjson.**
+-keep class android.support.graphics.drawable.** {*;}
+-keep class com.facebook.stetho.** {*;}
+-keep class javax.annotation.** {*;}
+-keep class com.lidroid.xutils.** {*;}
+-keep class okhttp3.** {*;}
+-keep class okio.** {*;}
+-dontwarn okio.**
+-keep class org.apache.** {*;}
+-keep class org.junit.** {*;}
+-keep class junit.** {*;}
+-keep class org.hamcrest.** {*;}
+
+-keep class sun.misc.Unsafe {*;}
+-keep class com.google.gson.** {*;}
+-keep class com.google.gson.stream.** {*;}
+-keep class com.android.volley.** {*;}
+
+-keep class butterknife.** {*;}
+-dontwarn butterknife.internal.**
+-keep class **$$ViewBinder { *; }
+
+-keep class cat.ereza.customactivityoncrash.** {*;}
+-keep class uk.co.senab.photoview.** {*;}
+-keep class com.flipboard.bottomsheet.** {*;}
+-keep class flipboard.bottomsheet.** {*;}
+-keep class com.bumptech.glide.** {*;}
+-keep class com.chad.library.** {*;}
+-keep class com.tonicartos.widget.stickygridheaders.** {*;}
+-keep class com.orhanobut.logger.** {*;}
+-keep class com.readystatesoftware.systembartint.** {*;}
+-keep class com.scwang.smartrefresh.** {*;}
+-keep class com.squareup.** {*;}
+-keep class com.tencent.** {*;}
+-keep class com.umeng.analytics.** {*;}
+-keep class com.youth.banner.** {*;}
+-keep class de.hdodenhof.circleimageview.** {*;}
+-keep class rx.** {*;}
+-keep class org.joda.time.** {*;}
+-keep class me.gujun.android.taggroup.** {*;}
+-keep class me.zhanghai.android.materialprogressbar.** {*;}
+-keep class android.net.** {*;}
+-keep class com.android.internal.http.multipart.** {*;}
+-keep class pl.droidsonroids.gif.** {*;}
+-keep class se.emilsjolander.stickylistheaders.** {*;}
+-keep class com.alipay.** {*;}
+-dontwarn com.alipay.**
+-keep class com.tencent.mm.sdk.** {
+   *;
+}
+
+###############################
+#
+# 自己的代码
+# 引用的其他Module可以直接在app的这个混淆文件里配置
+#
+###############################
+#实体类
+-keep class com.modular.booking.model.** {*;}
+-keep class com.uas.appcontact.model.** {*;}
+-keep class com.modular.login.model.** {*;}
+-keep class com.modular.booking.model.** {*;}
+-keep class com.uas.appme.settings.model.** {*;}
+-keep class com.modular.appmessages.model.** {*;}
+-keep class com.modular.apputils.model.** {*;}
+-keep class com.uas.appworks.model.** {*;}
+-keep class com.xzjmyk.pm.activity.bean.** {*;}
+-keep class com.modular.apputils.model.** {*;}
+#自定义控件
+-keep class com.core.widget.** {*;}
+-keep class com.modular.booking.widget.** {*;}
+-keep class com.uas.appcontact.ui.widget.stickylistheaders.** {*;}
+-keep class com.uas.appme.widget.** {*;}
+-keep class com.modular.appmessages.widget.** {*;}
+-keep class com.modular.apputils.widget.** {*;}
+-keep class com.uas.appworks.widget.** {*;}
+-keep class com.ipaulpro.afilechooser.** {*;}
+-keep class com.roamer.slidelistview.** {*;}
+-keep class com.xzjmyk.pm.activity.view.** {*;}
+-keep class com.xzjmyk.pm.activity.video.** {*;}
+-keep class com.modular.apputils.utils.** {*;}
+#与js互相调用的类
+-keep class com.com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity.JSWebView
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

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/ApplySubscribeActivity.java

@@ -48,7 +48,7 @@ public class ApplySubscribeActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_apply_subscribe);
-        getSupportActionBar().setTitle("申请订阅");
+        setTitle("申请订阅");
         initView();
         initEvent();
         initData();

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/java/com/xzjmyk/pm/activity/ui/erp/activity/AddTaskActivity.java

@@ -238,7 +238,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
         ViewUtils.inject(this);
         ct = this;
         TAG = "AddTaskActivity";
-        getSupportActionBar().setTitle("添加任务");
+       setTitle("添加任务");
         String people = getIntent().getStringExtra("people") == null ? "未填写" : getIntent().getStringExtra("people");
         bt_task_add.setOnClickListener(this);
         task_startime_rl.setOnTouchListener(new OnTouchListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ApproveDisplayActivity.java

@@ -40,7 +40,7 @@ public class ApproveDisplayActivity extends BaseActivity implements OnClickListe
 	public void initView() {
 		  setContentView(R.layout.act_log_approve_view);
 	      ViewUtils.inject(this);
-		  getSupportActionBar().setTitle("审批日志");
+		  setTitle("审批日志");
 		mEmptyLayout=new EmptyLayout(this,lv_logs_approve);
 	}
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ErpMenActivity.java

@@ -64,7 +64,7 @@ public class ErpMenActivity extends BaseActivity {
 //    }
 
     private void initData() {
-        getSupportActionBar().setTitle("考勤单据");
+        setTitle("考勤单据");
         menus = new ArrayList<String>();
        // menus.add("销售订单");
        // menus.add("报价单");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ExtraLeaveActivity.java

@@ -351,7 +351,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 		ViewUtils.inject(this);
 		ct=this;
 		progressDialog = CustomProgressDialog.createDialog(this);
-		getSupportActionBar().setTitle("特殊考勤");
+		setTitle("特殊考勤");
 		et_extra_date.setKeyListener(null);
 		et_extra_time.setKeyListener(null);
 		et_extra_resaon.setKeyListener(null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/InformActivity.java

@@ -89,7 +89,7 @@ public class InformActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.informed_listview);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("我的知会");
+        setTitle("我的知会");
         String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_ZHIHUI);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/LeaveActivity.java

@@ -605,7 +605,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
         et_leave_man.setText(CommonUtil.getSharedPreferences(this, "erp_emname"));
 
 
-        getSupportActionBar().setTitle("请假单");
+        setTitle("请假单");
         et_leave_man.setOnClickListener(this);
         startDate.setOnClickListener(this);
         endDate.setOnClickListener(this);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/LogsDisplayActivty.java

@@ -1,25 +1,25 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
-import java.text.SimpleDateFormat;
-import java.util.List;
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.core.base.BaseActivity;
+import com.core.widget.EmptyLayout;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
-import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
 
 /**
  * @author :LiuJie 2015年6月17日 下午5:23:22
@@ -54,7 +54,7 @@ public class LogsDisplayActivty extends BaseActivity implements OnClickListener
         setContentView(R.layout.act_log_list_view);
         ViewUtils.inject(this);
         ct = this;
-        getSupportActionBar().setTitle("操作日志");
+        setTitle("操作日志");
         mEmptyLayout = new EmptyLayout(this, lv_logs);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NewsDetailActivity.java

@@ -58,7 +58,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
         ViewUtils.inject(this);
 		ct=this;
         TAG="NewsDetailActivity";
-		getSupportActionBar().setTitle("新闻详情");
+		setTitle("新闻详情");
         tv_next.setText("下一条");
         tv_pre.setText("上一条");
         
@@ -133,10 +133,10 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
 			    String content=	JSON.parseObject(result).getString("content");
 				tv_content.setText(Html.fromHtml(content));
 				if (type==1) {
-					getSupportActionBar().setTitle("通知");
+					setTitle("通知");
 				}
 				if (type==2) {
-					getSupportActionBar().setTitle("公告");
+					setTitle("公告");
 				}
 				tv_next.setVisibility(View.GONE);
 				tv_pre.setVisibility(View.GONE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NewsTwoActivity.java

@@ -87,7 +87,7 @@ public class NewsTwoActivity extends BaseActivity {
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
-        getSupportActionBar().setTitle("新闻");
+        setTitle("新闻");
         mlist.setMode(PullToRefreshBase.Mode.BOTH);
         mlist.getRefreshableView().setOnItemClickListener(new OnItemClickListener() {
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NoticeMenuActivity.java

@@ -36,7 +36,7 @@ public class NoticeMenuActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_notice_menu);
-        getSupportActionBar().setTitle("通知公告");
+      setTitle("通知公告");
         init();
         initView();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NoticesActivity.java

@@ -71,7 +71,7 @@ public class NoticesActivity extends BaseActivity {
     public void initView() {
         TAG = "NoticesActivity";
         ct = this;
-        getSupportActionBar().setTitle("通知");
+        setTitle("通知");
 
         mNoticeData = new ArrayList<>();
         adapter = new CardItemAdapter(this,mNoticeData);
@@ -157,13 +157,13 @@ public class NoticesActivity extends BaseActivity {
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         if (getIntent().getIntExtra("type", 0) == 1) {
             url = CommonUtil.getAppBaseUrl(ct) + "common/desktop/note/inform.action";
-            getSupportActionBar().setTitle("通知");
+            setTitle("通知");
             String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
             // 表示已读
             FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_NOTICE);
         } else {
             url = CommonUtil.getAppBaseUrl(ct) + "common/desktop/note/notice.action";
-            getSupportActionBar().setTitle("公告");
+            setTitle("公告");
             String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
             // 表示已读
             FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_GONGGAO);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/QueryActivity.java

@@ -51,7 +51,7 @@ public class QueryActivity extends BaseActivity {
         super.onCreate(arg0);
         setContentView(R.layout.fragment_tab_simple);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("查询");
+        setTitle("查询");
         activity = this;
         initView();
     }
@@ -83,7 +83,7 @@ public class QueryActivity extends BaseActivity {
                 QueryGridFragment queryGridFragment = new QueryGridFragment();
                 fragmentTransaction = fragmentManager.beginTransaction();
                 fragmentTransaction.replace(R.id.fm_content, queryGridFragment);
-                getSupportActionBar().setTitle("查询");
+                setTitle("查询");
                 fragmentTransaction.commit();
             }
 
@@ -96,7 +96,7 @@ public class QueryActivity extends BaseActivity {
                 ChartListFragment queryGridFragment = new ChartListFragment();
                 fragmentTransaction = fragmentManager.beginTransaction();
                 fragmentTransaction.replace(R.id.fm_content, queryGridFragment);
-                getSupportActionBar().setTitle("统计");
+                setTitle("统计");
                 fragmentTransaction.commit();
             }
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SaleChartActivity.java

@@ -204,7 +204,7 @@ public class SaleChartActivity extends BaseActivity implements OnClickListener{
 		ct=this;
 		TAG="SaleChartActivity";
 		progressDialog = CustomProgressDialog.createDialog(this);
-	    getSupportActionBar().setTitle("统计分析");
+	    setTitle("统计分析");
 
         calendar = Calendar.getInstance(); // 设置当前日期
 
@@ -378,7 +378,7 @@ public class SaleChartActivity extends BaseActivity implements OnClickListener{
 		String xKey=(String) rMap.get("keyField");
 		String yKey=(String) rMap.get("valueField");
 		String title=(String)rMap.get("title");
-		getSupportActionBar().setTitle(title);
+		setTitle(title);
 		dlist=(List<HashMap<String, Object>>) rMap.get("data");
 		
 		
@@ -494,7 +494,7 @@ public class SaleChartActivity extends BaseActivity implements OnClickListener{
 		String xKey=(String) rMap.get("keyField");
 		String yKey=(String) rMap.get("valueField");
 		String title=(String)rMap.get("title");
-		getSupportActionBar().setTitle(title);
+		setTitle(title);
 		
 		ArrayList<String> list = new ArrayList<String>();/**@注释：初始化表格  */
         list.add("");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SaleDetailActivity.java

@@ -173,7 +173,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 	}
 
 	public void initData() {
-		getSupportActionBar().setTitle("订单明细");
+		setTitle("订单明细");
 		ly_panel_data.removeAllViews();
 		Intent intent = getIntent();
 		caller = intent.getStringExtra("caller");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SaleSelectActivity.java

@@ -193,7 +193,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
         String master = CommonUtil.getSharedPreferences(
                 SaleSelectActivity.this, "master");
         key = user + master + caller;
-        getSupportActionBar().setTitle(intent.getStringExtra("title"));
+       setTitle(intent.getStringExtra("title"));
         calendar = Calendar.getInstance();
         sBroadcast = new StateBroadcast();
         IntentFilter intentFilter = new IntentFilter();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ScheduleActivity.java

@@ -87,7 +87,7 @@ public class ScheduleActivity extends BaseActivity {
         setContentView(R.layout.schedule_listview);
         ViewUtils.inject(this);
         listview_main = (PullToRefreshListView) findViewById(R.id.listview_schedult);
-        getSupportActionBar().setTitle("待审批流");
+      setTitle("待审批流");
         String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_PROCESS);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -141,7 +141,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         isCookie = intent.getBooleanExtra("cookie", false);
         String msg_title = intent.getStringExtra("title");
         if (!StringUtil.isEmpty(msg_title)) {
-            getSupportActionBar().setTitle(msg_title);
+            setTitle(msg_title);
         }
         String StartApp = intent.getStringExtra("isStartApp");//参数账套
 //        if (intent.getBooleanExtra("orientation",false)){
@@ -187,7 +187,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         } catch (Exception e) {
         }
         if (p != null) {
-            getSupportActionBar().setTitle(p);
+            setTitle(p);
         }
         if (StringUtil.isEmpty(url)) {//为空时默认为b2b平台的
             url = "http://www.baidu.com";
@@ -297,7 +297,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         if (mPosition < 0 || mPosition > mSubscriptionMessages.size()) return;
         if (mSubscriptionMessages != null) {
             mReadSubs.add(mPosition);
-            getSupportActionBar().setTitle(mSubscriptionMessages.get(mPosition).getTitle());
+            setTitle(mSubscriptionMessages.get(mPosition).getTitle());
             if (mPosition == 0) {
                 mPreTv.setVisibility(View.GONE);
                 mNextTv.setVisibility(View.VISIBLE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewLoadActivity.java

@@ -116,13 +116,13 @@ public class WebViewLoadActivity extends BaseActivity {
         title = "";// 动态改变文字显示
         title = intent.getStringExtra("p");
         if (title != null) {
-            getSupportActionBar().setTitle(title);
+          setTitle(title);
         }
         if ("UAS".equals(title)) {
-            getSupportActionBar().setTitle("UAS管理系统");
+            setTitle("UAS管理系统");
         }
         if ("Record".equals(title)) {
-            getSupportActionBar().setTitle("业务拜访记录");
+            setTitle("业务拜访记录");
         }
         webView.getRefreshableView().getSettings().setJavaScriptEnabled(true);
         webView.getRefreshableView().getSettings().setSupportZoom(true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -215,7 +215,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.sales_statistics);
+        setTitle(R.string.sales_statistics);
         initBarChart();
         initSaleBarChart();
         initListener();
@@ -1112,7 +1112,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 DisplayUtil.backgroundAlpha(ClientActivity.this, 1f);
             }
         });
-        DisplayUtil.backgroundAlpha(this, 1f);
+        DisplayUtil.backgroundAlpha(this, 0.5f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ContactManAddActivity.java

@@ -74,7 +74,7 @@ public class ContactManAddActivity extends BaseActivity implements View.OnClickL
 
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("新增联系人");
+       setTitle("新增联系人");
         tv_birthday_login.setOnKeyListener(null);
         tv_birthday_login.setFocusable(false);
         

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/SubsActivity.java

@@ -46,7 +46,7 @@ public class SubsActivity extends BaseActivity {
             title = "我的下属";
             top.setVisibility(View.VISIBLE);
         }
-        getSupportActionBar().setTitle(title);
+       setTitle(title);
         String chche = getIntent().getStringExtra("data");
         if (!StringUtil.isEmpty(chche) && JSONUtil.validate(chche)) {
             JSONArray array = JSON.parseArray(chche);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -100,15 +100,15 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         String bc_custname = getIntent().getStringExtra("bc_custname");
         isBusiness = getIntent().getBooleanExtra("business", false);
         if (type == 0) {
-            getSupportActionBar().setTitle("创建任务");
+            setTitle("创建任务");
             tv_type.setText("任务");
         } else if (type == 1) {
-            getSupportActionBar().setTitle("创建日程");
+           setTitle("创建日程");
             tv_type.setText("日程");
             tv_name.setText(bc_custname);
             tv_executive.setText(bc_doman);
         } else if (type == 2) {
-            getSupportActionBar().setTitle("创建会议任务");
+          setTitle("创建会议任务");
             tv_type.setText("会议任务");
             tv_name.setText(getIntent().getStringExtra("meetname"));
             tv_name.setFocusable(false);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -175,7 +175,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.visitrecord));
+        setTitle(getString(R.string.visitrecord));
         findViewById(R.id.voice_search_iv).setOnClickListener(this);
         if (isB2b) {
             findViewById(R.id.stage_rl).setVisibility(View.GONE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportPlanActivity.java

@@ -104,7 +104,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
 
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("拜访计划");
+      setTitle("拜访计划");
         tv_date_select.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
         tv_date_select.setKeyListener(null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddVisitReportActivity.java

@@ -73,7 +73,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_visiting_report);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle(R.string.visitrecord);
+       setTitle(R.string.visitrecord);
         initData();
         initEvent();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AskForLeaveActivity.java

@@ -15,15 +15,14 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.andreabaccega.widget.FormEditText;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.SaleSelectActivity;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.core.widget.SingleDialog;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.activity.SaleSelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +47,7 @@ public class AskForLeaveActivity extends BaseActivity implements View.OnTouchLis
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_ask_for_leave);
-        getSupportActionBar().setTitle("请假申请");
+        setTitle("请假申请");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/FlihtsTimeActivity.java

@@ -47,7 +47,7 @@ public class FlihtsTimeActivity extends OABaseActivity implements View.OnClickLi
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_flihts_time);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle(R.string.work_time_setting);
+        setTitle(R.string.work_time_setting);
         initView();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationMapActivity.java

@@ -65,7 +65,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
 
         String qzone_select_add = getIntent().getStringExtra("qzone_select_add");
         if (!TextUtils.isEmpty(qzone_select_add) && qzone_select_add.equals("qzone_select_add")) {
-            getSupportActionBar().setTitle(R.string.select_locaton);
+            setTitle(R.string.select_locaton);
         }
         init();
         initView();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -368,7 +368,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                         intent.putExtra("data", object.toString());
                         startActivityForResult(intent, isMe ? 0x20 : 0x21);
                     } else {
-                        showToast(  getString(R.string.outplan_undone));
+                        showToast(getString(R.string.outplan_undone));
                     }
                 }
             }
@@ -425,6 +425,8 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
     }
 
     private void initView() {
+        subord_log.setTextColor(getResources().getColor(R.color.approval_select_tab));
+        subord_log_tag.setBackgroundResource(R.color.approval_select_tab);
         isCrm = !(getIntent() == null || getIntent().getIntExtra("type", 0) != 1);
         Intent intent = getIntent();
         workDailyAdd = intent.getStringExtra("WorkDailyAdd");
@@ -459,7 +461,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) viewPager.getLayoutParams(); // 取控件mGrid当前的布局参数   搜索
         linearParams.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);// 当控件的高强制设成50象素
         viewPager.setLayoutParams(linearParams); // 使设置好的布局参数应用到控件myGrid
-        pagerAdapter = new OACalenderViewPagerAdapter(ct,curDate);
+        pagerAdapter = new OACalenderViewPagerAdapter(ct, curDate);
         viewPager.setAdapter(pagerAdapter);
         viewPager.setCurrentItem(OACalenderViewPagerAdapter.MAX_NUM / 2);
         //判断是否是管理员
@@ -722,7 +724,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
             lastTime = System.currentTimeMillis();
             if (!StringUtil.isEmpty(workDailyAdd) && "WorkDailyAdd".equals(workDailyAdd)) {
             } else {
-             showToast(error);
+                showToast(error);
             }
         }
 
@@ -744,9 +746,9 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
             adapter.setModels(showModel);
             adapter.notifyDataSetChanged();
             emptyLayout.showEmpty();
-            CommonUtil.textSpanForStyle(all_task_num, getString(R.string.work_calender) + "   "+0, 0 + "", getResources().getColor(R.color.approval_select_tab));
-            CommonUtil.textSpanForStyle(ok_task_num, getString(R.string.done) + "   "+0, 0 + "", getResources().getColor(R.color.approval_select_tab));
-            CommonUtil.textSpanForStyle(uok_task_num, getString(R.string.undone) +"   "+ 0, 0 + "", getResources().getColor(R.color.approval_select_tab));
+            CommonUtil.textSpanForStyle(all_task_num, getString(R.string.work_calender) + "   " + 0, 0 + "", getResources().getColor(R.color.approval_select_tab));
+            CommonUtil.textSpanForStyle(ok_task_num, getString(R.string.done) + "   " + 0, 0 + "", getResources().getColor(R.color.approval_select_tab));
+            CommonUtil.textSpanForStyle(uok_task_num, getString(R.string.undone) + "   " + 0, 0 + "", getResources().getColor(R.color.approval_select_tab));
             return;
         }
         int ok = 0, size = 0;
@@ -761,9 +763,9 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         }
         if (ListUtils.isEmpty(filterModels))
             emptyLayout.showEmpty();
-        CommonUtil.textSpanForStyle(all_task_num, getString(R.string.work_calender) + size, size + "", getResources().getColor(R.color.orange_text));
-        CommonUtil.textSpanForStyle(ok_task_num, getString(R.string.done) + ok, ok + "", getResources().getColor(R.color.orange_text));
-        CommonUtil.textSpanForStyle(uok_task_num, getString(R.string.undone) + (size - ok), (size - ok) + "", getResources().getColor(R.color.orange_text));
+        CommonUtil.textSpanForStyle(all_task_num, getString(R.string.work_calender) + "   " + size, size + "", getResources().getColor(R.color.approval_select_tab));
+        CommonUtil.textSpanForStyle(ok_task_num, getString(R.string.done) + "   " + ok, ok + "", getResources().getColor(R.color.approval_select_tab));
+        CommonUtil.textSpanForStyle(uok_task_num, getString(R.string.undone) + "   " + (size - ok), (size - ok) + "", getResources().getColor(R.color.approval_select_tab));
         //当前日期小于等于选中日期
         if (adapter == null) {
             adapter = new OAAdapter(ct, util, filterModels);
@@ -877,9 +879,9 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
             setDateToListener(meInt);
             ok_scale.setVisibility(View.INVISIBLE);
             my_log.setTextColor(getResources().getColor(R.color.approval_select_tab));
+            my_log_tag.setBackgroundResource(R.color.approval_select_tab);
             subord_log.setTextColor(getResources().getColor(R.color.text_main));
             subord_log_tag.setBackgroundResource(R.color.item_line);
-            my_log_tag.setBackgroundResource(R.color.approval_select_tab);
         } else {
             setDateToListener(otherInt);
             ok_scale.setVisibility(View.VISIBLE);
@@ -954,7 +956,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                     if (hasOther) {
                         chaneTAG(false);
                     } else {
-                        showToast( getString(R.string.account_notice1));
+                        showToast(getString(R.string.account_notice1));
                     }
                 break;
             case R.id.my_log://我的工作日志

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OvertimeApplyActivity.java

@@ -29,7 +29,7 @@ public class OvertimeApplyActivity extends BaseActivity implements View.OnTouchL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_overtime_apply);
-        getSupportActionBar().setTitle("加班申请");
+        setTitle("加班申请");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java

@@ -63,7 +63,7 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
             type = intent.getIntExtra("type", 0);
             String title = intent.getStringExtra("title");
             if (!StringUtil.isEmpty(title))
-                getSupportActionBar().setTitle(title);
+              setTitle(title);
         }
         presenter = new SelectAimPresenter(this);
         presenter.start(type);
@@ -114,7 +114,7 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.activity_select_aims);
+      setTitle(R.string.activity_select_aims);
         BaiduMapUtil.getInstence().setMapViewPoint(mapView, MyApplication.getInstance().getBdLocationHelper().getLocation());
         listview.setLayoutManager(new LinearLayoutManager(this));
         RecycleViewDivider viewDivider = new RecycleViewDivider(this, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectCollisionActivity.java

@@ -79,7 +79,7 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
                 LogUtil.i("selectBean == null");
                 new NullPointerException("selectBean cannot be Null");
             } else if (!StringUtil.isEmpty(selectBean.getTitle()))
-                getSupportActionBar().setTitle(selectBean.getTitle());
+                setTitle(selectBean.getTitle());
             select_rl.setVisibility(selectBean.isSingleAble() ? View.GONE : View.VISIBLE);
         } else {
             LogUtil.i("selectBean == null");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectRemarkActivity.java

@@ -150,13 +150,13 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
         isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         isRemark = getIntent() == null || !getIntent().getBooleanExtra("isContact", false);
         String title = getIntent() == null ? "" : getIntent().getStringExtra("title");
-        if (!StringUtil.isEmpty(title)) getSupportActionBar().setTitle(title);
+       setTitle(title);
         beanList = new ArrayList<>();
         if (isRemark) {
             loadLocalData();
             loadBusinessRemark();
         } else {
-            getSupportActionBar().setTitle(R.string.common_Contact_person);
+          setTitle(R.string.common_Contact_person);
             contact = getIntent().getStringExtra("contact");
             loadContact(getIntent().getStringExtra("cuname"));
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SpecialAttendanceActivity.java

@@ -24,7 +24,7 @@ public class SpecialAttendanceActivity extends BaseActivity implements View.OnTo
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_special_attendance);
-        getSupportActionBar().setTitle("特殊考勤");
+       setTitle("特殊考勤");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/TravelRequestActivity.java

@@ -61,7 +61,7 @@ public class TravelRequestActivity extends BaseActivity implements View.OnTouchL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_travel_request);
-        getSupportActionBar().setTitle("出差申请");
+       setTitle("出差申请");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WaittingWorksActivity.java

@@ -60,7 +60,7 @@ public class WaittingWorksActivity extends BaseActivity implements View.OnClickL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.waitting_works);
-        getSupportActionBar().setTitle(msg_title);
+        setTitle(msg_title);
         ViewUtils.inject(this);
         initView();
         initMsgsData();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -87,7 +87,7 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_book_add);
-        getSupportActionBar().setTitle(getString(R.string.booking_add));
+       setTitle(getString(R.string.booking_add));
         tvBookObject =findViewById(R.id.tv_book_object);
         companyAddRl =findViewById(R.id.company_add_rl);
         tvBookTimes =findViewById(R.id.tv_book_times);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -120,7 +120,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
         }
     };
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.booking_title));
+        setTitle(getString(R.string.booking_title));
         
         rvTop = (RelativeLayout) findViewById(R.id.rv_top);
         llLeft = (LinearLayout) findViewById(R.id.ll_left);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -103,7 +103,7 @@ public class BookingListActivity extends SupportToolBarActivity implements  View
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_booking_list);
-        getSupportActionBar().setTitle(getString(R.string.booking_menu));
+        setTitle(getString(R.string.booking_menu));
         ViewUtils.inject(this);
         initView();
         initEvent();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsActivity.java

@@ -175,7 +175,7 @@ public class SelectPContactsActivity extends OABaseActivity implements ISelectAc
                 LogUtil.i("selectBean == null");
                 new NullPointerException("selectBean cannot be Null");
             } else if (!StringUtil.isEmpty(selectBean.getTitle()))
-                getSupportActionBar().setTitle(selectBean.getTitle());
+               setTitle(selectBean.getTitle());
             select_rl.setVisibility(selectBean.isSingleAble() ? View.GONE : View.VISIBLE);
         } else {
             LogUtil.i("selectBean == null");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/LocalVideoActivity.java

@@ -70,7 +70,7 @@ public class LocalVideoActivity extends BaseActivity {
 	}
 
 	private void initView() {
-		getSupportActionBar().setTitle(R.string.local_video);
+		setTitle(R.string.local_video);
 		mPullToRefreshListView = (PullToRefreshSlideListView) findViewById(R.id.pull_refresh_list);
 
 		View emptyView = LayoutInflater.from(mContext).inflate(R.layout.layout_list_empty_view, null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -7,17 +7,29 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -25,20 +37,27 @@ import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
+import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
+import com.core.adapter.ItemPopListAdapter;
+import com.core.adapter.ItemsSelectType1;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUAS;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.fragment.SupportToolBarFragment;
+import com.core.base.EasyFragment;
 import com.core.broadcast.MsgBroadcast;
 import com.core.net.http.ViewUtil;
 import com.core.net.utils.NetUtils;
+import com.core.utils.DialogUtils;
 import com.core.utils.FlexJsonUtil;
+import com.core.utils.StatusBarUtil;
+import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
@@ -46,6 +65,7 @@ import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.apputils.listener.OnPlayListener;
 import com.modular.apputils.utils.playsdk.AliPlay;
+import com.scwang.smartrefresh.layout.util.DensityUtil;
 import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
 import com.uas.appme.settings.activity.CheckWagesActivity;
@@ -60,19 +80,22 @@ import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.im.audio.FaceRecognition.FaceView.OnlineFaceDemo;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import de.hdodenhof.circleimageview.CircleImageView;
+
 import static com.xzjmyk.pm.activity.util.oa.CommonUtil.getSharedPreferencesBoolean;
 
 
-public class MeFragment extends SupportToolBarFragment implements View.OnClickListener, OnPlayListener {
+public class MeFragment extends EasyFragment implements View.OnClickListener, OnPlayListener {
     private final String TAG = "MeFragment";
 
     private final int REQUEST_CODE = 11;
-    private ImageView mAvatarImg;
+    private CircleImageView mAvatarImg;
     private TextView mNickNameTv;
     private TextView mPhoneNumTv;
     private RelativeLayout my_qr_code_rl;
@@ -115,33 +138,38 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                                 Master.class);
                         getChMaster(mList);
                     } else {
-                        showToact( "获取账套信息失败!");
+                        showToact("获取账套信息失败!");
                     }
                     break;
                 case 2://切换账套
                     result = msg.getData().getString("result");
                     Map<Object, Object> resultsMap = FlexJsonUtil.fromJson(result);
-                    List<Master> mList = FlexJsonUtil.fromJsonArray(
-                            FlexJsonUtil.toJson(resultsMap.get("masters")),
-                            Master.class);
-                    //保存账套列表
-                    CommonUtil.setSharedPreferences(ct, "erp_masterlist", JSON.toJSONString(
-                            resultsMap.get("masters")
-                    ));
-                    if (CommonUtil.isDialogShowing(mDialog)) {
-                        return;
-                    }
-                    if (!((Activity) ct).isFinishing()) {
-                        mDialog = new MasterDialog(ct, "切换账套",
-                                new MasterDialog.PickDialogListener() {
-                                    @Override
-                                    public void onListItemClick(int position, final Master master) {
-                                        Login(master);
-                                    }
-                                });
-                        mDialog.show();
-                        mDialog.initViewData(mList);
+                    List<Master> mList = FlexJsonUtil.fromJsonArray(FlexJsonUtil.toJson(resultsMap.get("masters")), Master.class);
+                    CommonUtil.setSharedPreferences(ct, "erp_masterlist", JSON.toJSONString(resultsMap.get("masters")));
+                    List<ItemsSelectType1> selectType1s = new ArrayList<>();
+                    if (!ListUtils.isEmpty(mList)) {
+                        for (int i = 0; i < mList.size(); i++) {
+                            ItemsSelectType1 itemsSelectType1 = new ItemsSelectType1();
+                            itemsSelectType1.setName(mList.get(i).getMa_function());
+                            itemsSelectType1.setEn_name(mList.get(i).getMa_user());
+                            selectType1s.add(itemsSelectType1);
+                        }
                     }
+                    showPopDialog(getActivity(), selectType1s);
+//                    if (CommonUtil.isDialogShowing(mDialog)) {
+//                        return;
+//                    }
+//                    if (!((Activity) ct).isFinishing()) {
+//                        mDialog = new MasterDialog(ct, "切换账套",
+//                                new MasterDialog.PickDialogListener() {
+//                                    @Override
+//                                    public void onListItemClick(int position, final Master master) {
+//                                        Login(master);
+//                                    }
+//                                });
+//                        mDialog.show();
+//                        mDialog.initViewData(mList);
+//                    }
                     break;
                 case 3://切换账套登录
                     Map<String, Object> results = FlexJsonUtil.fromJson(msg
@@ -161,7 +189,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                         intent.putExtra("falg", "home");
                         LocalBroadcastManager.getInstance(ct).sendBroadcast(intent);
                     } else {
-                        showToact(  R.string.user_master_fai);
+                        showToact(R.string.user_master_fai);
                     }
                     break;
             }
@@ -176,10 +204,12 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         }
     };
     private Boolean platform;
+    private FrameLayout vg;
 
     public MeFragment() {
     }
 
+
     @Override
     public void onResume() {
         if (!mReceiverTag) {     //在注册广播接受者的时候 判断是否已被注册,避免重复多次注册广播
@@ -249,11 +279,17 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
     }
 
     private void initView() {
-        android.support.v7.widget.Toolbar toolbar = getCommonToolBar();
-        if (toolbar != null) {
-            toolbar.setBackgroundResource(R.drawable.common_toolbar_me_bg);
+        android.support.v7.widget.Toolbar meToolbar = findViewById(R.id.meToolbar);
+        TextView meTitleTv = findViewById(R.id.meTitleTv);
+        vg = findViewById(R.id.vg);
+
+        if (meToolbar != null) {
+            StatusBarUtil.immersive(getActivity(), 0x00000000, 0.0f);
+            ((AppCompatActivity) ct).setSupportActionBar(meToolbar);
+            ((AppCompatActivity) ct).getSupportActionBar().setDisplayShowTitleEnabled(false);
+            StatusBarUtil.setPaddingSmart(ct, meToolbar);
         }
-        setTitle(R.string.me);
+        meTitleTv.setText(R.string.me);
         //编辑
         findViewById(R.id.editInfoIv).setOnClickListener(this);
         findViewById(R.id.my_data_rl).setOnClickListener(this);
@@ -297,7 +333,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         CommonUtil.clearSharedPreferences(ct, "seting");
         CommonUtil.clearSharedPreferences(ct, "seting_1");
         doHITask(); // TODO 测试按钮
-        UserRoleUtils.checkUserRole(this, getContentView());
+        UserRoleUtils.checkUserRole(this, getmRootView());
         iv_remain.post(new Runnable() {
             @Override
             public void run() {
@@ -432,7 +468,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
 
     private void turn2CaptureActivity() {
         Intent intent = new Intent(getActivity(), CaptureActivity.class);
-        ct.startActivityForResult(intent, REQUEST_CODE);
+        getActivity().startActivityForResult(intent, REQUEST_CODE);
     }
 
     @Override
@@ -440,22 +476,28 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         int id = v.getId();
         switch (id) {
             case R.id.rl_company_change://公司切换
-                if (!NetUtils.isNetWorkConnected(ct)){
+                if (!NetUtils.isNetWorkConnected(ct)) {
                     showToact(R.string.networks_out);
                     return;
                 }
-                com.core.net.http.ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
+                if (DialogUtils.isDialogShowing(popupWindow)){
+                    popupWindow.dismiss();
+                }
+               ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
                         , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
                 break;
             case R.id.editInfoIv://个人资料
                 ct.startActivity(new Intent(getActivity(), BaseInfoActivity.class));
                 break;
-            case R.id.rl_master_change://切换账套
+            case R.id.rl_master_change:
                 if (!platform) {
+                    if (DialogUtils.isDialogShowing(ViewUtil.popupWindow)){
+                        ViewUtil.popupWindow.dismiss();
+                    }
                     changeMaster();
                 }
                 break;
-            case R.id.my_friend_rl://我的朋友圈
+            case R.id.my_friend_rl:
                 setChangerRemain(true);
                 MainActivity.isUnReadWork = false;
                 Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
@@ -478,7 +520,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 1 && resultCode == Activity.RESULT_OK) {// 个人资料更新了
-            AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), mAvatarImg, true);
+            AvatarHelper.getInstance().displayCircular(MyApplication.getInstance().mLoginUser.getUserId(), mAvatarImg, true);
             mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
         }
         if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
@@ -512,6 +554,9 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                 Master master = mList.get(i);
                 if (master.getMa_user().equals(en_master)) {
                     master_tv.setText(master.getMa_function());
+                    if (adapter != null) {
+                        selectId = i;
+                    }
                     CommonUtil.setSharedPreferences(ct, "Master_ch", master.getMa_function());
                 }
             }
@@ -524,6 +569,11 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
 
     //切换账套
     public void changeMaster() {
+//        if (ViewUtil.mdProcessDialog!=null&&!ViewUtil.mdProcessDialog.isShowing()){
+//            ViewUtil.mdProcessDialog.setContent("加载数据中...");
+//            ViewUtil.mdProcessDialog.getBuilder().autoDismiss(false);
+//            ViewUtil.mdProcessDialog.show();
+//        }
         if (StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_masterlist"))) {
             String url = com.core.utils.CommonUtil.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
             Map<String, Object> params = new HashMap<>();
@@ -533,21 +583,36 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
             ViewUtil.httpSendRequest(ct, url, params, mhandler, headers, 2, null, null, "get");
         } else {
             String masterlist = CommonUtil.getSharedPreferences(ct, "erp_masterlist");
-            Log.i("bbb", masterlist);
             List<Master> mList = JSON.parseArray(masterlist, Master.class);
-            if (CommonUtil.isDialogShowing(mDialog)) {
-                return;
-            }
-            mDialog = new MasterDialog(ct, getString(R.string.user_dialog_master),
-                    new MasterDialog.PickDialogListener() {
-                        @Override
-                        public void onListItemClick(int position, final Master master) {
-                            Login(master);
+            List<ItemsSelectType1>   selectType1s=new ArrayList<>();
+            if (!ListUtils.isEmpty(mList)) {
+                for (int i = 0; i < mList.size(); i++) {
+                    String masterCN = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "Master_ch");
+                    if (!StringUtil.isEmpty(masterCN)) {
+                        if (masterCN.equals(mList.get(i).getMa_function())) {
+                            selectId = i;
                         }
-                    });
-            mDialog.show();
-            mDialog.initViewData(mList);
-        }
+                    }
+                    ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
+                    itemsSelectType1.setName(mList.get(i).getMa_function());
+                    itemsSelectType1.setEn_name(mList.get(i).getMa_user());
+                    selectType1s.add(itemsSelectType1);
+                }
+            }
+            showPopDialog(getActivity(), selectType1s);
+//            if (CommonUtil.isDialogShowing(mDialog)) {
+//                return;
+//            }
+//            mDialog = new MasterDialog(ct, getString(R.string.user_dialog_master),
+//                    new MasterDialog.PickDialogListener() {
+//                        @Override
+//                        public void onListItemClick(int position, final Master master) {
+//                            Login(master);
+//                        }
+//                    });
+//            mDialog.show();
+//            mDialog.initViewData(mList);
+        };
 
     }
 
@@ -624,15 +689,79 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
 
     @Override
     public void onSuccess(String resultStatus, String resultInfo) {
-        showToact(  "支付成功");
+        showToact("支付成功");
     }
 
     @Override
     public void onFailure(String resultStatus, String resultInfo) {
-        showToact(  "支付失败");
+        showToact("支付失败");
     }
-    
-    
-    
-    
+
+    public void showToact(int resId) {
+        ToastUtil.showToast(ct, resId, vg);
+    }
+
+    public void showToact(CharSequence message) {
+        ToastUtil.showToast(ct, message, vg);
+    }
+
+
+
+    public PopupWindow popupWindow = null;
+    public int selectId = 0;
+    public ItemPopListAdapter adapter;
+
+    public void showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s) {
+        View view = null;
+        popupWindow = null;
+        WindowManager windowManager = (WindowManager) ct.getSystemService(Context.WINDOW_SERVICE);
+        if (popupWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) ct.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(com.core.app.R.layout.pop_dialog_list, null);
+            ListView plist = view.findViewById(com.core.app.R.id.mList);
+            TextView tv_title = view.findViewById(R.id.tv_title);
+            tv_title.setText("账套选择");
+            List<ItemsSelectType1> datas = itemsSelectType1s;
+            adapter = new ItemPopListAdapter(ct, datas);
+            adapter.setSelectId(selectId);
+            plist.setAdapter(adapter);
+            plist.setSelection(selectId);
+            Drawable drawable = ct.getResources().getDrawable(com.core.app.R.drawable.selector_check_items);
+            plist.setSelector(drawable);
+            plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    popupWindow.dismiss();
+                    selectId = position;
+                    adapter.setSelectId(selectId);
+                    adapter.notifyDataSetChanged();
+                    ItemPopListAdapter.ViewHolder viewHolder = (ItemPopListAdapter.ViewHolder) view.getTag();
+                    ItemsSelectType1 model = viewHolder.model;
+                    Master master = new Master();
+                    master.setMa_user(model.getEn_name());
+                    master.setMa_function(model.getName());
+                    Login(master);
+                }
+            });
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() - DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
+        }
+        popupWindow.setFocusable(true);
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(ct, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(ct, 0.5f);
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.showAtLocation(ct.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+
+//        if (ViewUtil.mdProcessDialog!=null&&ViewUtil.mdProcessDialog.isShowing()){
+//            ViewUtil.mdProcessDialog.dismiss();
+//        }
+    }
+
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SpeechrecognitionActivity.java

@@ -29,7 +29,7 @@ public class SpeechrecognitionActivity extends BaseActivity implements Recognize
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.speech_recognition);
-        getSupportActionBar().setTitle("语音识别");
+        setTitle("语音识别");
 
         identify_words_et = (EditText) findViewById(R.id.sr_identify_words_et);
         speak_start_bt = (Button) findViewById(R.id.sr_speak_start_bt);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -44,6 +44,7 @@ import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.broadcast.MsgBroadcast;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
@@ -136,6 +137,7 @@ public class ChatActivity extends SupportToolBarActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.chat);
+        AndroidBug5497Workaround.assistActivity(this);
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         mLoginNickName = MyApplication.getInstance().mLoginUser.getNickName();
         if (savedInstanceState != null) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -50,6 +49,7 @@ import com.modular.appmessages.model.MessageNew;
 import com.modular.appmessages.presenter.MessagePresenter;
 import com.modular.appmessages.presenter.imp.IMessageView;
 import com.modular.appmessages.widget.SignRefreshLayout;
+import com.modular.apputils.adapter.LinearItemDecoration;
 import com.uas.appme.pedometer.view.UURanking;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskActivity;
@@ -194,7 +194,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
         mSignRefreshLayout = findViewById(R.id.mSignRefreshLayout);
         mRecyclerView = findViewById(R.id.mRecyclerView);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(ct));
-        mRecyclerView.addItemDecoration(new DividerItemDecoration(ct, LinearLayout.VERTICAL));
+        mRecyclerView.addItemDecoration(new LinearItemDecoration());
         presenter = new MessagePresenter(mContext, this, unReaderListener);
         signView = mSignRefreshLayout.getSignView();
         if (signView != null) {
@@ -328,7 +328,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
                         work = (WorkModel) tag;
                     }
                 }
-                if (!NetUtils.isNetWorkConnected(ct)) {
+                if (NetUtils.isNetWorkConnected(ct)) {
                     presenter.signWork(work);
                 } else {
                     showToact(R.string.networks_out);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskActivity.java

@@ -264,7 +264,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
-//        mEmptyLayout.showEmpty();
+        mEmptyLayout.showEmpty();
         //加载网络数据
         new Thread(new getallprocess_run()).start();
 //        sendResquestForServer("START", 2);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SelectConstantActivity.java

@@ -52,7 +52,7 @@ public class SelectConstantActivity extends ActionBackActivity {
 	}
 
 	private void initView() {
-		getSupportActionBar().setTitle(getFullTitle());
+		setTitle(getFullTitle());
 		mListView = (ListView) findViewById(R.id.list_view);
 
 		if (mSubConstants == null) {

WeiChat/src/main/res/drawable/selector_me_menu_item_bg.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/me_menu_item_press" android:state_checked="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
-
     <item android:drawable="@color/me_menu_item_normal"/>
 </selector>

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

@@ -25,8 +25,8 @@
 
             <ImageView
                 android:id="@+id/voice_name_iv"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="10dp"
+                android:layout_height="16dp"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="35dp"
                 android:layout_toRightOf="@+id/name_tag"

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

@@ -21,7 +21,13 @@
                 style="@style/item_menu_tag"
                 android:gravity="center_vertical"
                 android:text="@string/booking_object" />
-
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="@dimen/padding"
+                android:text="*"
+                android:textColor="@color/red" />
             <TextView
                 android:id="@+id/tv_book_object"
                 style="@style/item_menu_input"
@@ -41,7 +47,13 @@
                 android:gravity="center_vertical"
                 android:text="@string/times"
                 android:textColor="@color/hintColor" />
-
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="@dimen/padding"
+                android:text="*"
+                android:textColor="@color/red" />
             <TextView
                 android:id="@+id/tv_book_times"
                 style="@style/item_menu_input"
@@ -62,7 +74,13 @@
                 android:layout_alignParentTop="true"
                 android:gravity="center_vertical"
                 android:text="@string/address" />
-
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="@dimen/padding"
+                android:text="*"
+                android:textColor="@color/red" />
             <TextView
                 android:id="@+id/tv_book_address"
                 style="@style/item_menu_input"
@@ -85,7 +103,13 @@
                 android:layout_alignParentTop="true"
                 android:gravity="center_vertical"
                 android:text="@string/booking_topic" />
-
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="@dimen/padding"
+                android:text="*"
+                android:textColor="@color/red" />
             <EditText
                 android:id="@+id/tv_book_topic"
                 style="@style/item_menu_input"

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

@@ -69,11 +69,12 @@
                     android:text="@string/business_name"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
+
                 <TextView
                     style="@style/form_relative_left_text"
                     android:layout_marginLeft="10dp"
                     android:layout_toRightOf="@+id/tv_leave_mankind"
-                    android:visibility="gone"
+                    android:visibility="visible"
                     android:text="*"
                     android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
@@ -125,7 +126,7 @@
                     android:layout_marginLeft="10dp"
                     android:layout_toRightOf="@+id/tv_leave_category"
                     android:text="*"
-                    android:visibility="gone"
+                    android:visibility="visible"
                     android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_business_source"
@@ -160,7 +161,7 @@
                     android:layout_marginLeft="25dp"
                     android:layout_toRightOf="@+id/tv_leave_reason"
                     android:text="*"
-                    android:visibility="gone"
+                    android:visibility="visible"
                     android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_business"
@@ -234,7 +235,7 @@
                     android:layout_marginLeft="10dp"
                     android:layout_toRightOf="@+id/tv_set_"
                     android:text="*"
-                    android:visibility="gone"
+                    android:visibility="visible"
                     android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_business_jieDuan"
@@ -259,12 +260,18 @@
                 android:background="@color/item_color2">
 
                 <TextView
-
+android:id="@+id/company_name_tv"
                     style="@style/form_relative_left_text"
                     android:text="@string/Company_Name"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
-
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/company_name_tv"
+                    android:text="*"
+                    android:visibility="visible"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_name"
                     style="@style/form_relative_right_text"
@@ -285,11 +292,18 @@
 
 
                 <TextView
+                    android:id="@+id/company_address_tv"
                     style="@style/form_relative_left_text"
                     android:text="@string/enterprise_address"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
-
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/company_address_tv"
+                    android:text="*"
+                    android:visibility="visible"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_address"
                     style="@style/form_relative_right_text"
@@ -313,7 +327,13 @@
                     android:text="@string/Business_license_number"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
-
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/tv_date_businesslicense"
+                    android:text="*"
+                    android:visibility="visible"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_businesslicense"
                     style="@style/form_relative_right_text"

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

@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -22,8 +21,8 @@
 
             <RelativeLayout
                 style="@style/IMTbleLine2"
-                android:minHeight="40dp"
-                android:background="@color/white">
+                android:background="@color/white"
+                android:minHeight="40dp">
 
                 <TextView
                     android:id="@+id/name_tv"
@@ -33,10 +32,22 @@
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/name_tv"
+                    android:layout_toRightOf="@id/name_tv"
+                    android:text="*"
+                    android:textColor="@color/red" />
+
                 <com.andreabaccega.widget.FormEditText
                     android:id="@+id/reimbursement_title_fet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignBaseline="@+id/name_tv"
+                    android:layout_alignBottom="@+id/name_tv"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:background="@null"
                     android:gravity="center_vertical|right"
                     android:hint="@string/common_input"
@@ -46,11 +57,7 @@
                     android:textSize="15sp"
                     whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,30}+$"
                     whatever:testErrorString="限制30个之内有效中英文字符"
-                    whatever:testType="regexp"
-                    android:layout_alignBaseline="@+id/name_tv"
-                    android:layout_alignBottom="@+id/name_tv"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true" />
+                    whatever:testType="regexp" />
             </RelativeLayout>
 
             <View
@@ -70,21 +77,27 @@
                     android:text="@string/Reimbursement_type"
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
-
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/type_left"
+                    android:layout_toRightOf="@id/type_left"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:layout_toRightOf="@+id/type_left"
                     android:id="@+id/reimbursement_type_fet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
+                    android:layout_toRightOf="@+id/type_left"
                     android:background="@null"
+                    android:ellipsize="end"
                     android:gravity="center_vertical|right"
                     android:hint="@string/common_select"
                     android:padding="10dp"
-                    android:textColor="@color/dark_dark_grey"
-                    android:textSize="15sp"
                     android:singleLine="true"
-                    android:ellipsize="end"/>
+                    android:textColor="@color/dark_dark_grey"
+                    android:textSize="15sp" />
 
                 <ImageView
                     style="@style/IMTbleLine_ArrowImg"
@@ -106,12 +119,19 @@
 
 
                 <TextView
+                    android:id="@+id/reimbursement_type"
                     style="@style/form_relative_left_text"
                     android:layout_marginLeft="0dp"
                     android:text="@string/currency"
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
-
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/reimbursement_type"
+                    android:layout_toRightOf="@id/reimbursement_type"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/reimbursement_currency_fet"
                     android:layout_width="100dp"
@@ -121,9 +141,9 @@
                     android:background="@null"
                     android:gravity="center_vertical|right"
                     android:padding="10dp"
+                    android:text="RMB"
                     android:textColor="@color/dark_dark_grey"
-                    android:textSize="15sp"
-                    android:text="RMB"/>
+                    android:textSize="15sp" />
 
                 <ImageView
                     style="@style/IMTbleLine_ArrowImg"
@@ -143,27 +163,26 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                >
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Consumer_details"
-                    android:textColor="@color/text_main"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"/>
+                    android:layout_marginTop="10dp"
+                    android:text="@string/Consumer_details"
+                    android:textColor="@color/text_main" />
 
                 <TextView
                     android:id="@+id/add_details_tv"
                     android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:text="@string/new_add"
-                    android:textColor="@color/blue"
-                    android:padding="10dp"
                     android:layout_marginRight="5dp"
-                    android:gravity="right"/>
+                    android:gravity="right"
+                    android:padding="10dp"
+                    android:text="@string/new_add"
+                    android:textColor="@color/blue" />
             </RelativeLayout>
 
 
@@ -171,58 +190,60 @@
                 android:id="@+id/detail_table_ll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true">
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:orientation="vertical">
+
                 <LinearLayout
                     android:id="@+id/detail_table_top_ll"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp">
-                    <View
-                        style="@style/expense_table_h_1dp"/>
+                    android:layout_marginRight="10dp"
+                    android:orientation="vertical">
+
+                    <View style="@style/expense_table_h_1dp" />
+
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
-                        <View
-                            style="@style/expense_table_v_1dp"/>
+
+                        <View style="@style/expense_table_v_1dp" />
+
                         <TextView
-                            android:text="@string/type"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
                             android:layout_weight="2"
                             android:paddingLeft="10dp"
-                            android:layout_gravity="center_vertical"/>
-                        <View
-                            style="@style/expense_table_v_1dp"/>
+                            android:text="@string/type" />
+
+                        <View style="@style/expense_table_v_1dp" />
+
                         <TextView
-                            android:text="@string/Amount_of_money"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
                             android:layout_weight="2"
                             android:paddingLeft="10dp"
-                            android:layout_gravity="center_vertical"
-                            />
-                        <View
-                            style="@style/expense_table_v_1dp"/>
+                            android:text="@string/Amount_of_money" />
+
+                        <View style="@style/expense_table_v_1dp" />
+
                         <TextView
-                            android:text="@string/common_delete"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
                             android:layout_gravity="center_vertical"
-                            android:gravity="center"/>
-                        <View
-                            style="@style/expense_table_v_1dp"
-                            />
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/common_delete" />
+
+                        <View style="@style/expense_table_v_1dp" />
                     </LinearLayout>
 
-                    <View
-                        style="@style/expense_table_h_1dp"/>
+                    <View style="@style/expense_table_h_1dp" />
                 </LinearLayout>
 
                 <com.core.widget.MyListView
@@ -230,9 +251,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    >
-                </com.core.widget.MyListView>
+                    android:layout_marginRight="10dp"></com.core.widget.MyListView>
+
                 <LinearLayout
                     android:id="@+id/detail_table_bottom_ll"
                     android:layout_width="match_parent"
@@ -240,75 +260,80 @@
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:orientation="vertical">
+
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
                         <View
                             android:id="@+id/left_view_v"
-                            style="@style/expense_table_v_1dp"/>
+                            style="@style/expense_table_v_1dp" />
 
                         <View
                             android:id="@+id/right_view_v"
-                            android:layout_alignParentRight="true"
-                            style="@style/expense_table_v_1dp"/>
+                            style="@style/expense_table_v_1dp"
+                            android:layout_alignParentRight="true" />
+
                         <TextView
                             android:id="@+id/automatic_calculation_tv"
-                            android:layout_toRightOf="@id/left_view_v"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="自动计算"
                             android:layout_centerVertical="true"
                             android:layout_marginLeft="10dp"
+                            android:layout_toRightOf="@id/left_view_v"
+                            android:text="自动计算"
                             android:textColor="@color/blue"
-                            android:visibility="gone"/>
+                            android:visibility="gone" />
 
                         <TextView
                             android:id="@+id/i_calculation_tv"
-                            android:layout_toRightOf="@id/automatic_calculation_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/calculator_name"
                             android:layout_centerVertical="true"
                             android:layout_marginLeft="10dp"
+                            android:layout_toRightOf="@id/automatic_calculation_tv"
+                            android:text="@string/calculator_name"
                             android:textColor="@color/blue"
-                            android:visibility="gone"
-                            />
+                            android:visibility="gone" />
+
                         <TextView
                             android:id="@+id/sum_money_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_toLeftOf="@+id/right_view_v"
                             android:layout_alignParentRight="true"
-                            android:layout_marginRight="30dp"
                             android:layout_centerVertical="true"
-                            android:textColor="@color/red"/>
+                            android:layout_marginRight="30dp"
+                            android:layout_toLeftOf="@+id/right_view_v"
+                            android:textColor="@color/red" />
+
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/all_Amount_of_money"
-                            android:layout_toLeftOf="@+id/sum_money_tv"
                             android:layout_centerVertical="true"
                             android:layout_marginRight="10dp"
-                            android:textColor="@color/text_main"/>
+                            android:layout_toLeftOf="@+id/sum_money_tv"
+                            android:text="@string/all_Amount_of_money"
+                            android:textColor="@color/text_main" />
                     </RelativeLayout>
-                    <View
-                        style="@style/expense_table_h_1dp"/>
+
+                    <View style="@style/expense_table_h_1dp" />
                 </LinearLayout>
 
             </LinearLayout>
+
             <View
-                android:layout_marginTop="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="20px"
+                android:layout_marginTop="10dp"
                 android:background="@color/item_line" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/Add_invoice"
-                android:textColor="@color/text_main"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp"/>
+                android:layout_marginTop="10dp"
+                android:text="@string/Add_invoice"
+                android:textColor="@color/text_main" />
 
             <LinearLayout
                 android:id="@+id/select_img_layout"
@@ -328,6 +353,7 @@
                     android:stretchMode="columnWidth"
                     android:verticalSpacing="3dp" />
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/bottom_layout"
                 android:layout_width="match_parent"

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

@@ -19,9 +19,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_marginBottom="@dimen/padding"
-            android:layout_alignParentTop="true"
-            android:paddingLeft="@dimen/sub_padding"
-            android:paddingRight="@dimen/sub_padding" />
+            android:layout_alignParentTop="true" />
     </com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshLayout>
 
 

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

@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/item_line"
+        android:visibility="gone"
         android:drawableLeft="@drawable/icon_date_nor"
         android:drawablePadding="10dp"
         android:padding="5dp"

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

@@ -1,574 +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="94dp"
-                android:layout_height="94dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="8dp"
-                android:contentDescription="@string/app_name"
-                android:padding="2dp"
-                android:background="@drawable/radian_hollow_white_bg"
-                android:scaleType="fitXY"
-                android:src="@drawable/avatar_normal_u" />
-
-
-            <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: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/src/main/res/layout/item_subscription_first.xml

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="10dp"
-    android:background="@color/white"
-    android:orientation="vertical">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:padding="10dp">
 
     <ImageView
         android:id="@+id/item_image"
-        android:scaleType="fitXY"
         android:layout_width="match_parent"
-        android:layout_height="130dp" />
+        android:layout_height="130dp"
+        android:scaleType="fitXY" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -31,10 +33,10 @@
             android:id="@+id/item_title_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:lines="1"
-            android:ellipsize="end"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@id/item_isr_tv"
+            android:ellipsize="end"
+            android:lines="1"
             android:text="hhhh"
             android:textColor="@color/white"
             android:textSize="@dimen/text_main" />

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

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="70dp"
-    android:background="@color/white"
-    android:orientation="vertical"
-    android:padding="10dp">
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:padding="10dp">
 
     <ImageView
         android:id="@+id/item_image"
@@ -17,10 +19,10 @@
         android:id="@+id/item_isr_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginRight="10dp"
         android:layout_marginTop="10dp"
         android:layout_toLeftOf="@id/item_image"
         android:text="aaaa"
-        android:layout_marginRight="10dp"
         android:textSize="@dimen/text_hine" />
 
     <TextView
@@ -29,9 +31,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@id/item_isr_tv"
-        android:text="hhhh"
-        android:lines="1"
         android:ellipsize="end"
+        android:lines="1"
+        android:text="hhhh"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 

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

@@ -7,16 +7,16 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5px"
-        android:background="@color/gray_light"/>
+        android:background="#f2f2f2"/>
     <TextView
         android:id="@+id/head"
         android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:background="#faf9f9"
+        android:layout_height="20dp"
+        android:background="#f2f2f2"
         android:paddingLeft="10dp"
         android:gravity="center_vertical"/>
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5px"
-        android:background="@color/gray_light"/>
+        android:background="#f2f2f2"/>
 </LinearLayout>

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

@@ -22,6 +22,7 @@
             android:layout_gravity="left"
             android:drawablePadding="5dp"
             android:padding="10dp"
+            android:textColor="@color/titleBlue"
             android:text="基本信息"/>
 
         <TextView

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

@@ -9,10 +9,19 @@
         android:layout_width="match_parent"
         android:layout_height="20dp" />
 
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textColor="#999999"
+        android:text="多见一个客户就多一个机会,
+        现在就去做客户拜访吧                 "/>
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:visibility="gone"
         android:layout_centerInParent="true"
         android:src="@drawable/oa_empty" />
 

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

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:layout_height="wrap_content">
-
-    <View
-        android:id="@+id/top"
-        android:layout_width="match_parent"
-        android:layout_height="200dp" />
-
-    <TextView
-        android:id="@+id/tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/top"
-        android:layout_gravity="center"
-        android:layout_marginTop="16dp"
-        android:drawableTop="@drawable/ic_empty"
-        android:gravity="center"
-        android:text="@string/common_list_empty"
-        android:textColor="@color/gray_light" />
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:minHeight="200dp"
-      />
-
-</LinearLayout>

WeiChat/src/main/res/menu/menu_list.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/push"
         android:title="@string/daily_record"
-        android:icon="@drawable/xlist"
+        android:icon="@drawable/ic_oa_list"
         app:showAsAction="ifRoom" />
 
 </menu>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue May 22 17:15:17 CST 2018
-debugName=271
+#Tue May 22 16:16:38 CST 2018
+debugName=320
 versionName=630
-debugCode=271
+debugCode=320
 versionCode=170

app_core/common/src/main/java/com/core/adapter/ItemPopListAdapter.java

@@ -20,7 +20,7 @@ import java.util.List;
 public class ItemPopListAdapter extends BaseAdapter {
 
     private List<ItemsSelectType1> objects = new ArrayList<ItemsSelectType1>();
-    private int selectId=7;
+    private int selectId=0;
     private Context context;
     private LayoutInflater layoutInflater;
 
@@ -59,31 +59,30 @@ public class ItemPopListAdapter extends BaseAdapter {
             convertView = layoutInflater.inflate(R.layout.item_pop_list_select, null);
             convertView.setTag(new ViewHolder(convertView));
         }
-        initializeViews((ItemsSelectType1)getItem(position), (ViewHolder) convertView.getTag(),position);
+        if (selectId==position) {
+            convertView.setBackgroundResource(R.color.me_menu_item_press);
+        }else{
+            convertView.setBackgroundResource(android.R.color.transparent);
+        }
+        initializeViews(getItem(position), (ViewHolder) convertView.getTag(),position);
         return convertView;
     }
 
     private void initializeViews(ItemsSelectType1 object, ViewHolder holder,int position) {
-       // holder.tvItemName.setSelected(object.isSelected());
         holder.tvItemName.setText(object.getName());
-       if (selectId==position) {
-           holder.checkBox.setChecked(true);
-       }else{
-           holder.checkBox.setChecked(false);
-       }
-       holder.checkBox.setFocusable(false);
-       holder.checkBox.setClickable(false);
+        holder.checkBox.setFocusable(false);
+        holder.checkBox.setClickable(false);
+        holder.model=object;
     }
 
     public class ViewHolder {
-//        private LinearLayout llPopTop;
         public TextView tvItemName;
         public CheckBox checkBox;
+        public ItemsSelectType1 model;
 
         public ViewHolder(View view) {
-//            llPopTop = (LinearLayout) view.findViewById(R.id.ll_pop_top);
-            tvItemName = (TextView) view.findViewById(R.id.tv_item_name);
-            checkBox= (CheckBox) view.findViewById(R.id.cb_select);
+            tvItemName = view.findViewById(R.id.tv_item_name);
+            checkBox= view.findViewById(R.id.cb_select);
         }
     }
 }

app_core/common/src/main/java/com/core/adapter/ItemsSelectType1.java

@@ -6,6 +6,7 @@ package com.core.adapter;
 public class ItemsSelectType1 {
     
     private String name;//名称
+    private String en_name;//英文名称
     private boolean selected=false;//是否被选中
 
     public String getName() {
@@ -16,10 +17,18 @@ public class ItemsSelectType1 {
         this.name = name;
     }
 
+    public String getEn_name() {
+        return en_name;
+    }
+
+    public void setEn_name(String en_name) {
+        this.en_name = en_name;
+    }
+
     public boolean isSelected() {
         return selected;
     }
-
+    
     public void setSelected(boolean selected) {
         this.selected = selected;
     }

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/app/MyApplication.java

@@ -299,12 +299,11 @@ public class MyApplication extends BaseApplication {
                 .bitmapConfig(Bitmap.Config.RGB_565).
                         cacheInMemory(true)
                 .cacheOnDisc(true)
-                .displayer(new RoundedBitmapDisplayer(10))
-//                .displayer(new RoundedBitmapDisplayer(10))
+                .displayer(new RoundedBitmapDisplayer(20))
                 .resetViewBeforeLoading(true)
-                .showImageForEmptyUri(R.drawable.avatar_normal)
-                .showImageOnFail(R.drawable.avatar_normal)
-                .showImageOnLoading(R.drawable.avatar_normal)
+                .showImageForEmptyUri(R.drawable.avatar_round)
+                .showImageOnFail(R.drawable.avatar_round)
+                .showImageOnLoading(R.drawable.avatar_round)
                 .build();
 
         mAvatarNormalImageOptions = new DisplayImageOptions.Builder()

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,273 +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.base.view.AndroidBug5497Workaround;
-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();
-        AndroidBug5497Workaround.assistActivity(this);
-    }
 }

app_core/common/src/main/java/com/core/base/fragment/SupportToolBarFragment.java

@@ -17,7 +17,6 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.core.app.R;
-import com.core.base.view.AndroidBug5497Workaround;
 import com.core.utils.StatusBarUtil;
 import com.core.utils.ToastUtil;
 
@@ -184,6 +183,6 @@ public abstract class SupportToolBarFragment extends Fragment {
     @Override
     public void onStart() {
         super.onStart();
-        AndroidBug5497Workaround.assistActivity(ct);
+       // AndroidBug5497Workaround.assistActivity(ct);
     }
 }

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -317,7 +317,6 @@ public class ViewUtil {
         startNetThread(url, params, handler, Constants.SUCCESS_LOGIN, message,
                 bundle, "get");*/
 //        }
-
         HttpRequest.getInstance().sendRequest(Constants.ACCOUNT_CENTER_HOST,
                 new HttpParams.Builder()
                         .url("sso/login/mobile")
@@ -743,15 +742,21 @@ public class ViewUtil {
                 model.setName(loginEntities.get(j).getName());
                 items[j] = loginEntities.get(j).getName();
                 itemsSelectType1s.add(model);
+                String companyName=CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany");
+                if (!StringUtil.isEmpty(companyName)){
+                    if (companyName.equals(loginEntities.get(j).getName())){
+                        selectId=j;
+                    }
+                }
             }
             if (!DialogUtils.isDialogShowing(loginERPDialog)) {
-                if (loginERPDialog != null) {
-                    select = loginERPDialog.getSelectedIndex();
-                }
-                if (select > items.length) {
-                    select = 0;
-                }
-
+//                if (loginERPDialog != null) {
+//                    select = loginERPDialog.getSelectedIndex();
+//                }
+//                if (select > items.length) {
+//                    select = 0;
+//                }
+                popupWindow=null;
                 showPopDialog((Activity) ct,itemsSelectType1s,phone,password);
 //                loginERPDialog = new MaterialDialog.Builder(ct)
 //                        .title(ct.getString(R.string.user_dialog_company))
@@ -771,7 +776,8 @@ public class ViewUtil {
 
 
     public static PopupWindow popupWindow = null;
-    public static int selectId;
+    public static int selectId=0;
+    public static ItemPopListAdapter adapter;
     public static void  showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s
     , final String phone, final String password){
         erp_phone=phone;
@@ -786,8 +792,10 @@ public class ViewUtil {
             view = layoutInflater.inflate(R.layout.pop_dialog_list, null);
             ListView plist = view.findViewById(R.id.mList);
             List<ItemsSelectType1> datas =itemsSelectType1s;
-            final ItemPopListAdapter adapter = new ItemPopListAdapter(ct, datas);
+            adapter = new ItemPopListAdapter(ct, datas);
+            adapter.setSelectId(selectId);
             plist.setAdapter(adapter);
+            plist.setSelection(selectId);
             Drawable drawable = ct.getResources().getDrawable(R.drawable.selector_check_items);
             plist.setSelector(drawable);
             plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -803,7 +811,6 @@ public class ViewUtil {
                 }});
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth()- DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
         }
-
         popupWindow.setFocusable(true);
         popupWindow.setOutsideTouchable(true);
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
@@ -1216,9 +1223,6 @@ public class ViewUtil {
                         .url("mobile/login.action")
                         .addParam("token", loginToken)
                         .addParam("enuu", enuu)
-//                        .addParam("username", username)
-//                        .addParam("password", password)
-//                        .addParam("master", "UAS_DEV")
                         .method(Method.POST)
                         .build(), new HttpCallback() {
                     @Override
@@ -1231,7 +1235,8 @@ public class ViewUtil {
 
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
-                        Log.e("erp登录失败", failStr);
+                        Log.e("erp登录失败", "登录失败:"+failStr);
+                        ToastMessage(MyApplication.getInstance(),"登录失败:"+failStr);
                         mdProcessDialog.setContent("登录失败");
                         new Handler().postDelayed(new Runnable() {
                             @Override

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/utils/helper/AvatarHelper.java

@@ -276,7 +276,7 @@ public class AvatarHelper {
         if (isThumb) {
             ImageLoader.getInstance().displayImage(url, imageView, MyApplication.mAvatarRoundImageOptions);
         } else {
-            ImageLoader.getInstance().displayImage(url, imageView, MyApplication.mAvatarNormalImageOptions);
+            ImageLoader.getInstance().displayImage(url, imageView, MyApplication.mAvatarRoundImageOptions);
         }
     }
 

app_core/common/src/main/java/com/core/widget/crouton/Crouton.java

@@ -274,7 +274,7 @@ public final class Crouton {
      */
     public static Crouton makeText(Activity activity, CharSequence text, int color, int time, ViewGroup viewGroup) {
         Style customColor = new Style.Builder().setBackgroundColorValue(color)
-                .setGravity(Gravity.BOTTOM).build();
+                .setGravity(Gravity.CENTER).build();
         Configuration customConfiguration = new Configuration.Builder().setDuration(time).build();
         return new Crouton(activity, text, customColor, viewGroup).setConfiguration(customConfiguration);
     }

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/Activity/SelectActivity.java

@@ -423,7 +423,7 @@ public class SelectActivity extends BaseActivity {
     }
 
     private void initView() {
-        if (!StringUtil.isEmpty(title)) getSupportActionBar().setTitle(title);
+        if (!StringUtil.isEmpty(title)) setTitle(title);
         list = (ListView) findViewById(R.id.listview);
         search_edit = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         search_edit.addTextChangedListener(new TextWatcher() {
@@ -520,8 +520,8 @@ public class SelectActivity extends BaseActivity {
         LogUtil.d(JSON.toJSONString(object));
         isSingle = intent.getBooleanExtra("isSingle", true);
         int reid = intent.getIntExtra("reid", -1);
-        if (reid != -1)
-            setTheme(getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", reid));
+//        if (reid != -1)
+//            setTheme(getSharedPreferences("cons", MODE_PRIVATE).getInt("theme", reid));
         if (type == 1) {//网络
             action = intent.getStringExtra("action");
             key = intent.getStringExtra("key");

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;