10:20 下拉前备份

WeiChat/src/main/AndroidManifest.xml

@@ -1030,31 +1030,6 @@
 
         <activity android:name=".ui.me.TemperatureActivity" />
 
-        <!--数据统计，报表查询-->
-        <activity android:name=".ui.erp.activity.datainquiry.activity.ReportStatisticsActivity">
-            <intent-filter>
-                <action android:name="com.modular.company.ReportStatisticsActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".ui.erp.activity.datainquiry.activity.DataInquiryActivity">
-            <intent-filter>
-                <action android:name="com.modular.company.DataInquiryActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.erp.activity.datainquiry.activity.DataInquiryListActivity"
-            android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.erp.activity.datainquiry.activity.DataInquiryMoreMenuActivity" />
-        <activity
-            android:name=".ui.erp.activity.datainquiry.activity.ReportQueryCriteriaActivity"
-            android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.erp.activity.datainquiry.activity.ReportStatisticsMoreMenuActivity" />
-        <activity android:name=".ui.erp.activity.datainquiry.activity.PDFDownloadActivity" />
-        <activity android:name=".ui.erp.activity.datainquiry.activity.DataInquirySearchActivity" />
-        <activity android:name=".ui.erp.activity.datainquiry.activity.ReportQuerySearchActivity" />
-
         <activity android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity" />
         <activity
             android:name=".ui.erp.activity.oa.NavigationActivity"

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

@@ -104,8 +104,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         setContentView(R.layout.activity_booking_list);
         getSupportActionBar().setTitle(getString(R.string.booking_menu));
         ViewUtils.inject(this);
-//        String path=null;
-//        new File(path);
         initView();
         initEvent();
     }
@@ -538,6 +536,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 //                                int day = c.get(Calendar.DAY_OF_MONTH);
                             //                               calendarView.setDownIndex(day);
                             if (mDatas.size() == 0) {
+                                emptyLayout.setEmptyMessage("您还没有预约，现在就去约吧！");
                                 emptyLayout.showEmpty();
                             }
                         }
@@ -617,7 +616,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((keyCode == KeyEvent.KEYCODE_BACK)) {
             Intent it = new Intent(BookingListActivity.this, MainActivity.class);
-            // it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             startActivity(it);
             overridePendingTransition(R.anim.anim_activity_out, R.anim.anim_activity_in);
             finish();

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

@@ -23,8 +23,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.DataInquiryActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.ReportStatisticsActivity;
+import com.uas.appworks.datainquiry.activity.DataInquiryActivity;
+import com.uas.appworks.datainquiry.activity.ReportStatisticsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_selected="true">
-        <shape  android:shape="rectangle">
-            <corners
-                android:topLeftRadius="100dp"
-                android:topRightRadius="100dp"
-                android:bottomRightRadius="100dp"
-                android:bottomLeftRadius="100dp">
-            </corners>
-            <stroke
-                android:width="1dp"
-                android:color="#fbfbfb">
-            </stroke>
-            <solid
-                android:color="#ffffff">
-            </solid>
-        </shape>
-        </item>
-    <item>
-        <shape  android:shape="rectangle">
-            <corners
-                android:topLeftRadius="100dp"
-                android:topRightRadius="100dp"
-                android:bottomRightRadius="100dp"
-                android:bottomLeftRadius="100dp">
-            </corners>
-            <solid
-                android:color="@color/antionbarcolor">
-            </solid>
-        </shape>
-        </item>
-</selector>

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

@@ -16,9 +16,8 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:layout_centerInParent="true"
-        android:textSize="12sp"
-        android:text="多约一个老板就多一个生意\n
-       现在就去约他们吧！"
+        android:textSize="14sp"
+        android:text="您还没有预约，现在就去约吧！"
        />
 
 </LinearLayout>

WeiChat/src/main/res/values-en/strings.xml

@@ -1423,23 +1423,6 @@
     <string name = "input_phone_number"> Please enter the phone number </string>
     <string name = "input_name"> Please enter a name </string>
 
-
-    <!--工作->数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
-    <string name="report_query">报表查询</string>
-    <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_downloading">正在下载...</string>
-    <string name="re_download">重新下载</string>
-    <string name="search_history">搜索历史</string>
-    <string name="str_clear">清空</string>
-    <string name="pause_download">暂停下载</string>
-    <string name="continue_download">继续下载</string>
-    <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
-    <string name="download_paused">下载已暂停</string>
-    <string name="str_reloading">正在加载....</string>
     <string name="sales_statistics">销售看板</string>
-    <string name="str_work_add_func">添加应用</string>
 
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1535,23 +1535,6 @@
     <string name="input_phone_number">请输入手机号</string>
     <string name="input_name">请输入姓名</string>
 
-
-    <!--工作->数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
-    <string name="report_query">报表查询</string>
-    <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_downloading">正在下载...</string>
-    <string name="re_download">重新下载</string>
-    <string name="search_history">搜索历史</string>
-    <string name="str_clear">清空</string>
-    <string name="pause_download">暂停下载</string>
-    <string name="continue_download">继续下载</string>
-    <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
-    <string name="download_paused">下载已暂停</string>
-    <string name="str_reloading">正在加载....</string>
     <string name="sales_statistics">销售看板</string>
-    <string name="str_work_add_func">添加应用</string>
 
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1524,23 +1524,6 @@
     <string name="input_phone_number">請輸入手機號</string>
     <string name="input_name">請輸入姓名</string>
 
-
-    <!--工作-数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
-    <string name="report_query">报表查询</string>
-    <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_downloading">正在下载...</string>
-    <string name="re_download">重新下载</string>
-    <string name="search_history">搜索历史</string>
-    <string name="str_clear">清空</string>
-    <string name="pause_download">暂停下载</string>
-    <string name="continue_download">继续下载</string>
-    <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
-    <string name="download_paused">下载已暂停</string>
-    <string name="str_reloading">正在加载....</string>
     <string name="sales_statistics">销售看板</string>
-    <string name="str_work_add_func">添加应用</string>
 
 </resources>

WeiChat/src/main/res/values/strings.xml

@@ -1868,21 +1868,5 @@
     <string name="input_phone_number">请输入手机号</string>
     <string name="input_name">请输入姓名</string>
 
-    <!--工作->数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
-    <string name="report_query">报表查询</string>
-    <string name="report_query_prompt">报表查询结果是PDF文件，\n需要耗费您一些流量....</string>
-    <string name="str_downloading">正在下载...</string>
-    <string name="re_download">重新下载</string>
-    <string name="search_history">搜索历史</string>
-    <string name="str_clear">清空</string>
-    <string name="pause_download">暂停下载</string>
-    <string name="continue_download">继续下载</string>
-    <string name="obtain_pdf_path">正在获取报表文件资源,请稍候...</string>
-    <string name="download_paused">下载已暂停</string>
-    <string name="str_reloading">正在加载....</string>
     <string name="sales_statistics">销售看板</string>
-    <string name="str_work_add_func">添加应用</string>
 </resources>

WeiChat/src/main/res/values/styles.xml

@@ -392,7 +392,7 @@
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">right|center_vertical</item>
         <item name="android:textColorHint">@color/gray</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">14sp</item>
     </style>
     <!-- 日报详情总结、计划、心得内容显示样式-->
     <style name="form_relative_right_text1">
@@ -1225,15 +1225,5 @@
         <item name="android:textColor">@color/text_normal</item>
     </style>
 
-    <style name="myprogressbar">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@drawable/progressbar_diy
-        </item><!-- progress_horizontal -->
-        <item name="android:indeterminateDrawable">
-            @android:drawable/progress_indeterminate_horizontal
-        </item>
-        <item name="android:minHeight">20dip</item>
-        <item name="android:maxHeight">20dip</item>
-    </style>
 
 </resources>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Dec 16 09:48:59 CST 2017
-debugName=180
-versionName=624
-debugCode=180
-versionCode=163
+#Fri Dec 22 17:16:40 CST 2017
+debugName=242
+versionName=612
+debugCode=242
+versionCode=151

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

@@ -448,4 +448,9 @@ public class Constants {
     public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile#/activity/detail/";
     public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile#/project/detail/";
 
+
+    public interface FLAG {
+        String DEVICE_CALLER = "device_caller";
+        String DEVICE_CLASS = "device_class";
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/database/HistoricalRecordBean.java → app_core/common/src/main/java/com/core/dao/historical/HistoricalRecordBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
+package com.core.dao.historical;
 
 /**
  * Created by RaoMeng on 2017/8/18.

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/database/HistoricalRecordDao.java → app_core/common/src/main/java/com/core/dao/historical/HistoricalRecordDao.java

@@ -1,9 +1,10 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
+package com.core.dao.historical;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.core.db.CommonCursorWrapper;
 import com.core.db.DatabaseManager;
 import com.core.db.DatabaseTables;
 
@@ -24,8 +25,9 @@ public class HistoricalRecordDao {
     public static HistoricalRecordDao getInstance() {
         if (instance == null) {
             synchronized (HistoricalRecordDao.class) {
-                if (instance == null)
+                if (instance == null) {
                     instance = new HistoricalRecordDao();
+                }
             }
         }
         return instance;
@@ -54,7 +56,7 @@ public class HistoricalRecordDao {
      * @return
      */
     public List<HistoricalRecordBean> getHistoricalRecordBeansById(String schemeId) {
-        HistoricalRecordCursorWrapper cursor = queryHistoricalRecord(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        CommonCursorWrapper cursor = queryHistoricalRecord(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{schemeId});
 
         List<HistoricalRecordBean> historicalRecordBeans = new ArrayList<>();
@@ -123,7 +125,7 @@ public class HistoricalRecordDao {
      * @param whereArgs
      * @return
      */
-    public HistoricalRecordCursorWrapper queryHistoricalRecord(String whereCause, String[] whereArgs) {
+    public CommonCursorWrapper queryHistoricalRecord(String whereCause, String[] whereArgs) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
         Cursor cursor = sqLiteDatabase.query(DatabaseTables.HistoricalRecordTable.NAME, null,
@@ -133,6 +135,6 @@ public class HistoricalRecordDao {
 
 //        DatabaseManager.getInstance().closeDatabase();
 
-        return new HistoricalRecordCursorWrapper(cursor);
+        return new CommonCursorWrapper(cursor);
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/database/HistoricalRecordCursorWrapper.java → app_core/common/src/main/java/com/core/db/CommonCursorWrapper.java

@@ -1,22 +1,24 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
+package com.core.db;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
 
-import com.core.db.DatabaseTables;
+import com.core.dao.historical.HistoricalRecordBean;
 
 /**
- * Created by RaoMeng on 2017/8/18.
- * 历史记录的CursorWrapper封装类
+ * @author RaoMeng
+ * @describe CursorWrapper封装类
+ * @date 2017/12/12 10:17
  */
-public class HistoricalRecordCursorWrapper extends CursorWrapper {
+
+public class CommonCursorWrapper extends CursorWrapper {
 
     /**
      * Creates a cursor wrapper.
      *
      * @param cursor The underlying cursor to wrap.
      */
-    public HistoricalRecordCursorWrapper(Cursor cursor) {
+    public CommonCursorWrapper(Cursor cursor) {
         super(cursor);
     }
 

app_core/common/src/main/java/com/core/db/DatabaseTables.java

@@ -4,32 +4,32 @@ package com.core.db;
  * Created by RaoMeng on 2017/8/14.
  * 数据库表
  */
-public class DatabaseTables {
-    public static final class HistoricalRecordTable {
-        public static final String NAME = "historical_record";
+public interface DatabaseTables {
+    interface HistoricalRecordTable {
+        String NAME = "historical_record";
 
-        public static final class Cols {
-            public static final String SCHEME_ID = "scheme_id";
-            public static final String SCHEME_NAME = "scheme_name";
-            public static final String SEARCH_FIELD = "search_field";
+        interface Cols {
+            String SCHEME_ID = "scheme_id";
+            String SCHEME_NAME = "scheme_name";
+            String SEARCH_FIELD = "search_field";
         }
     }
 
-    public static final class UUHelperTable {
-        public static final String NAME = "uu_helper";
+    interface UUHelperTable {
+        String NAME = "uu_helper";
 
-        public static final class Cols {
-            public static final String ID = "id";
-            public static final String USER_ID = "userId";
-            public static final String TIME_SEND = "timeSend";
-            public static final String DATE = "date";
-            public static final String IMAGE_URL = "imageUrl";
-            public static final String ICON_URL = "iconUrl";
-            public static final String LINK_URL = "linkUrl";
-            public static final String CONTENT = "content";
-            public static final String READED = "readed";
-            public static final String TITLE = "title";
-            public static final String TYPE = "type";
+        interface Cols {
+            String ID = "id";
+            String USER_ID = "userId";
+            String TIME_SEND = "timeSend";
+            String DATE = "date";
+            String IMAGE_URL = "imageUrl";
+            String ICON_URL = "iconUrl";
+            String LINK_URL = "linkUrl";
+            String CONTENT = "content";
+            String READED = "readed";
+            String TITLE = "title";
+            String TYPE = "type";
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.core.net.http.http;
 
 import android.os.Bundle;
 
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -10,7 +11,7 @@ import java.util.Map;
  * Created by Bitliker on 2017/3/7.
  */
 
-public class Request  {
+public class Request {
 
     private int what;
     private String url;
@@ -68,12 +69,26 @@ public class Request  {
             return this;
         }
 
+        public Bulider addParam(String key, String value) {
+            if (request.param == null) {
+                request.param = new HashMap<>();
+            }
+            request.param.put(key, value);
+            return this;
+        }
 
         public Bulider setHeaders(LinkedHashMap<String, Object> headers) {
             request.headers = headers;
             return this;
         }
 
+        public Bulider addHeader(String key, String value) {
+            if (request.headers == null) {
+                request.headers = new LinkedHashMap<>();
+            }
+            request.headers.put(key, value);
+            return this;
+        }
 
         public Bulider setBundle(Bundle bundle) {
             request.bundle = bundle;

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

@@ -99,7 +99,7 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        //baseUrl="http://192.168.253.58:8080/ERP/";
+//        baseUrl="http://192.168.253.203:8090/ERP/";
         return baseUrl;
     }
 
@@ -145,7 +145,7 @@ public class CommonUtil {
     }
 
     /**
-     * B2B身份session
+     * ERP身份session
      *
      * @param ct
      * @return
@@ -1116,6 +1116,26 @@ public class CommonUtil {
         return vString;
     }
 
+
+    private static long mLastClickTime;
+    private static final long SPACE_TIME = 1000;//重复点击间隔时间
+
+    /**
+     * 是否控件重复点击
+     *
+     * @return
+     */
+    public static boolean isRepeatClick() {
+        long currentTime = System.currentTimeMillis();
+        long intervals = currentTime - mLastClickTime;
+        if (intervals > 0 && intervals < SPACE_TIME) {
+            return true;
+        }
+        mLastClickTime = currentTime;
+        return false;
+
+    }
+
     /**
      * EditText竖直方向是否可以滚动
      *

app_core/common/src/main/java/com/core/utils/helper/AvatarHelper.java

@@ -398,6 +398,9 @@ public class AvatarHelper {
         } else {
             url = MyApplication.getInstance().getConfig().AVATAR_ORIGINAL_PREFIX + "/" + dirName + "/" + userId + ".jpg";
         }
+        Log.i("fanglhuserId=",userId+"");
+        Log.i("fanglhdirName=",dirName + "");
+        Log.i("fanglhurl=",url);
         return url;
     }
 
@@ -423,6 +426,7 @@ public class AvatarHelper {
         } else {
             url = MyApplication.getInstance().getConfig().AVATAR_ORIGINAL_PREFIX + "/" + dirName + "/" + userId + ".png";
         }
+
         return url;
     }
 

app_core/common/src/main/java/com/core/widget/SearchActionView.java

@@ -0,0 +1,141 @@
+package com.core.widget;
+
+import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.core.app.R;
+import com.core.utils.CommonUtil;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/12/22 10:17
+ */
+
+public class SearchActionView extends FrameLayout {
+    private ImageView mBackImageView, mMenuImageView, mVoiceImageView;
+    private OnVoiceCompleteListener mOnVoiceCompleteListener;
+    private OnEnterActionListener mOnEnterActionListener;
+    private OnMenuClickListener mOnMenuClickListener;
+    private ClearEditText mSearchEditText;
+
+    public void setOnVoiceCompleteListener(OnVoiceCompleteListener onVoiceCompleteListener) {
+        mOnVoiceCompleteListener = onVoiceCompleteListener;
+    }
+
+    public void setOnEnterActionListener(OnEnterActionListener onEnterActionListener) {
+        mOnEnterActionListener = onEnterActionListener;
+    }
+
+    public void setOnMenuClickListener(OnMenuClickListener onMenuClickListener) {
+        mOnMenuClickListener = onMenuClickListener;
+    }
+
+    public void setMenuImage(int menuImage) {
+        try {
+            mMenuImageView.setImageResource(menuImage);
+            mMenuImageView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (mOnMenuClickListener != null) {
+                        mOnMenuClickListener.onMenuClick(view);
+                    }
+                }
+            });
+        } catch (Exception e) {
+
+        }
+
+    }
+
+    public SearchActionView(@NonNull Context context) {
+        super(context);
+        init(context, null, 0);
+    }
+
+    public SearchActionView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs, 0);
+    }
+
+    public SearchActionView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    private void init(final Context context, AttributeSet attrs, int defStyleAttr) {
+        LayoutInflater.from(context).inflate(R.layout.layout_search_action, this);
+
+        mBackImageView = (ImageView) findViewById(R.id.search_action_back_iv);
+        mMenuImageView = (ImageView) findViewById(R.id.search_action_menu_iv);
+        mVoiceImageView = (ImageView) findViewById(R.id.search_action_voice_iv);
+        mSearchEditText = (ClearEditText) findViewById(R.id.search_action_search_et);
+
+        mBackImageView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ((Activity) getContext()).finish();
+                ((Activity) getContext()).overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
+            }
+        });
+
+        mVoiceImageView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CommonUtil.getVoiceText(context, mSearchEditText, new com.core.interfac.OnVoiceCompleteListener() {
+                    @Override
+                    public void onVoiceComplete() {
+                        if (mOnVoiceCompleteListener != null) {
+                            mOnVoiceCompleteListener.onVoiceComplete();
+                        }
+                    }
+                });
+            }
+        });
+
+        mSearchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+                if (actionId == EditorInfo.IME_ACTION_SEARCH
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (keyEvent != null && keyEvent.getAction() == KeyEvent.ACTION_DOWN && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    if (mOnEnterActionListener != null) {
+                        mOnEnterActionListener.onEnterAction();
+                        return true;
+                    }
+                }
+                return false;
+            }
+        });
+    }
+
+    public void setSearchHint(String hint) {
+        mSearchEditText.setHint(hint);
+    }
+
+    public void setSearchHint(int hint) {
+        mSearchEditText.setHint(hint);
+    }
+
+    public interface OnVoiceCompleteListener {
+        void onVoiceComplete();
+    }
+
+    public interface OnEnterActionListener {
+        void onEnterAction();
+    }
+
+    public interface OnMenuClickListener {
+        void onMenuClick(View view);
+    }
+}

app_core/common/src/main/java/com/core/widget/VoiceSearchView.java

@@ -5,9 +5,12 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.core.app.R;
 import com.core.interfac.OnVoiceCompleteListener;
@@ -28,6 +31,7 @@ import java.util.regex.Pattern;
 public class VoiceSearchView extends RelativeLayout {
     private ClearEditText search_edit;
     private OnVoiceCompleteListener mOnVoiceCompleteListener;
+    private OnEnterActionListener mOnEnterActionListener;
 
     public VoiceSearchView(Context context) {
         this(context, null);
@@ -47,12 +51,31 @@ public class VoiceSearchView extends RelativeLayout {
                 btnVoice();
             }
         });
+
+        search_edit.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+                if (actionId == EditorInfo.IME_ACTION_SEARCH
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (keyEvent != null && keyEvent.getAction() == KeyEvent.ACTION_DOWN && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    if (mOnEnterActionListener != null) {
+                        mOnEnterActionListener.onEnterAction();
+                        return true;
+                    }
+                }
+                return false;
+            }
+        });
     }
 
     public void setHineText(String hine) {
         search_edit.setHint(hine);
     }
 
+    public void setHineText(int hint) {
+        search_edit.setHint(hint);
+    }
+
     public void setText(String hine) {
         search_edit.setText(hine);
     }
@@ -89,6 +112,10 @@ public class VoiceSearchView extends RelativeLayout {
         mOnVoiceCompleteListener = onVoiceCompleteListener;
     }
 
+    public void setOnEnterActionListener(OnEnterActionListener onEnterActionListener) {
+        mOnEnterActionListener = onEnterActionListener;
+    }
+
     public void addTextChangedListener(TextWatcher watcher) {
         search_edit.addTextChangedListener(watcher);
     }
@@ -121,4 +148,8 @@ public class VoiceSearchView extends RelativeLayout {
             return nulltext;
         }
     }
+
+    public interface OnEnterActionListener {
+        void onEnterAction();
+    }
 }

app_core/common/src/main/java/com/core/widget/expandableLayout/ExpandableLayout.java

@@ -0,0 +1,253 @@
+package com.core.widget.expandableLayout;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.animation.Interpolator;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import com.core.app.R;
+
+
+public class ExpandableLayout extends FrameLayout {
+    private static final int IDLE = 0;
+    private static final int EXPANDING = 1;
+    private static final int COLLAPSING = 2;
+
+    public static final String KEY_SUPER_STATE = "super_state";
+    public static final String KEY_EXPANSION = "expansion";
+
+    private static final int HORIZONTAL = 0;
+    private static final int VERTICAL = 1;
+
+    private static final int DEFAULT_DURATION = 300;
+
+    private int duration = DEFAULT_DURATION;
+    private boolean translateChildren;
+    private float expansion;
+    private int orientation;
+    private int state = IDLE;
+
+    private Interpolator interpolator = new FastOutSlowInInterpolator();
+    private ValueAnimator animator;
+
+    private OnExpansionUpdateListener listener;
+
+    public ExpandableLayout(Context context) {
+        super(context);
+        init(null);
+    }
+
+    public ExpandableLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs);
+    }
+
+    public ExpandableLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public ExpandableLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(attrs);
+    }
+
+    private void init(AttributeSet attrs) {
+        if (attrs != null) {
+            TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ExpandableLayout);
+            duration = a.getInt(R.styleable.ExpandableLayout_el_duration, DEFAULT_DURATION);
+            expansion = a.getBoolean(R.styleable.ExpandableLayout_el_expanded, false) ? 1 : 0;
+            translateChildren = a.getBoolean(R.styleable.ExpandableLayout_el_translate_children, true);
+            orientation = a.getInt(R.styleable.ExpandableLayout_android_orientation, VERTICAL);
+            a.recycle();
+        }
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        Bundle bundle = new Bundle();
+
+        expansion = isExpanded() ? 1 : 0;
+
+        bundle.putFloat(KEY_EXPANSION, expansion);
+        bundle.putParcelable(KEY_SUPER_STATE, superState);
+
+        return bundle;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        Bundle bundle = (Bundle) state;
+        expansion = bundle.getFloat(KEY_EXPANSION);
+        Parcelable superState = bundle.getParcelable(KEY_SUPER_STATE);
+
+        super.onRestoreInstanceState(superState);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        int width = getMeasuredWidth();
+        int height = getMeasuredHeight();
+
+        int size = orientation == LinearLayout.HORIZONTAL ? width : height;
+
+        setVisibility(expansion == 0 && size == 0 ? GONE : VISIBLE);
+
+        int expansionDelta = size - Math.round(size * expansion);
+        if (translateChildren) {
+            for (int i = 0; i < getChildCount(); i++) {
+                View child = getChildAt(i);
+                if (orientation == HORIZONTAL) {
+                    child.setTranslationX(-expansionDelta);
+                } else {
+                    child.setTranslationY(-expansionDelta);
+                }
+            }
+        }
+
+        if (orientation == HORIZONTAL) {
+            setMeasuredDimension(width - expansionDelta, height);
+        } else {
+            setMeasuredDimension(width, height - expansionDelta);
+        }
+    }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        if (animator != null) {
+            animator.cancel();
+        }
+        super.onConfigurationChanged(newConfig);
+    }
+
+    public boolean isExpanded() {
+        return state == EXPANDING || expansion == 1;
+    }
+
+    public void toggle() {
+        toggle(true);
+    }
+
+    public void toggle(boolean animate) {
+        if (isExpanded()) {
+            collapse(animate);
+        } else {
+            expand(animate);
+        }
+    }
+
+    public void expand() {
+        expand(true);
+    }
+
+    public void expand(boolean animate) {
+        setExpanded(true, animate);
+    }
+
+    public void collapse() {
+        collapse(true);
+    }
+
+    public void collapse(boolean animate) {
+        setExpanded(false, animate);
+    }
+
+    public void setExpansion(float expansion) {
+        if (this.expansion == expansion) {
+            return;
+        }
+
+        setVisibility(expansion == 0 ? GONE : VISIBLE);
+
+        this.expansion = expansion;
+        requestLayout();
+
+        if (listener != null) {
+            listener.onExpansionUpdate(expansion);
+        }
+    }
+
+    public void setOnExpansionUpdateListener(OnExpansionUpdateListener listener) {
+        this.listener = listener;
+    }
+
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+    private void setExpanded(boolean expand, boolean animate) {
+        if (expand && (state == EXPANDING || expansion == 1)) {
+            return;
+        }
+
+        if (!expand && (state == COLLAPSING || expansion == 0)) {
+            return;
+        }
+
+        int targetExpansion = expand ? 1 : 0;
+        if (animate) {
+            animateSize(targetExpansion);
+        } else {
+            setExpansion(targetExpansion);
+        }
+    }
+
+    private void animateSize(final int targetExpansion) {
+        if (animator != null) {
+            animator.cancel();
+            animator = null;
+        }
+
+        animator = ValueAnimator.ofFloat(expansion, targetExpansion);
+        animator.setInterpolator(interpolator);
+        animator.setDuration(duration);
+
+        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator valueAnimator) {
+                setExpansion((float) valueAnimator.getAnimatedValue());
+            }
+        });
+
+        animator.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                state = targetExpansion == 0 ? COLLAPSING : EXPANDING;
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                state = IDLE;
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                state = IDLE;
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+            }
+        });
+
+        animator.start();
+    }
+
+    public interface OnExpansionUpdateListener {
+        void onExpansionUpdate(float expansionFraction);
+    }
+}

app_core/common/src/main/java/com/core/widget/expandableLayout/ExpandableLinearLayout.java

@@ -0,0 +1,339 @@
+package com.core.widget.expandableLayout;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Interpolator;
+import android.widget.LinearLayout;
+
+import com.core.app.R;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExpandableLinearLayout extends LinearLayout {
+
+    public static final String KEY_SUPER_STATE = "super_state";
+    public static final String KEY_EXPANDED = "expanded";
+
+    private static final int DEFAULT_DURATION = 300;
+
+    private int wms;
+    private int hms;
+
+    private List<View> expandableViews;
+
+    private int duration = DEFAULT_DURATION;
+    private boolean expanded = false;
+
+    private Interpolator interpolator = new FastOutSlowInInterpolator();
+    private AnimatorSet animatorSet;
+
+    private OnExpansionUpdateListener listener;
+
+    public ExpandableLinearLayout(Context context) {
+        super(context);
+        init(null);
+    }
+
+    public ExpandableLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs);
+    }
+
+    public ExpandableLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public ExpandableLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(attrs);
+    }
+
+    private void init(AttributeSet attrs) {
+        if (attrs != null) {
+            TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ExpandableLayout);
+            duration = a.getInt(R.styleable.ExpandableLayout_el_duration, DEFAULT_DURATION);
+            expanded = a.getBoolean(R.styleable.ExpandableLayout_el_expanded, false);
+            a.recycle();
+        }
+
+        expandableViews = new ArrayList<>();
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        Bundle bundle = new Bundle();
+
+        bundle.putBoolean(KEY_EXPANDED, expanded);
+        bundle.putParcelable(KEY_SUPER_STATE, superState);
+
+        return bundle;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        Bundle bundle = (Bundle) state;
+        expanded = bundle.getBoolean(KEY_EXPANDED);
+        Parcelable superState = bundle.getParcelable(KEY_SUPER_STATE);
+
+        for (View expandableView : expandableViews) {
+            expandableView.setVisibility(expanded ? VISIBLE : GONE);
+        }
+
+        super.onRestoreInstanceState(superState);
+    }
+
+    @Override
+    public void addView(View child, int index, ViewGroup.LayoutParams params) {
+        LayoutParams lp = (LayoutParams) params;
+        if (lp.expandable) {
+            expandableViews.add(child);
+            child.setVisibility(expanded ? VISIBLE : GONE);
+        }
+
+        super.addView(child, index, params);
+    }
+
+    @Override
+    public void removeView(View child) {
+        LayoutParams lp = (LayoutParams) child.getLayoutParams();
+        if (lp.expandable) {
+            expandableViews.remove(child);
+        }
+
+        super.removeView(child);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        wms = widthMeasureSpec;
+        hms = heightMeasureSpec;
+    }
+
+    @Override
+    public LinearLayout.LayoutParams generateLayoutParams(AttributeSet attrs) {
+        return new LayoutParams(getContext(), attrs);
+    }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        if (animatorSet != null) {
+            animatorSet.cancel();
+        }
+        super.onConfigurationChanged(newConfig);
+    }
+
+    public boolean isExpanded() {
+        return expanded;
+    }
+
+    public void toggle() {
+        toggle(true);
+    }
+
+    public void toggle(boolean animate) {
+        if (expanded) {
+            collapse(animate);
+        } else {
+            expand(animate);
+        }
+    }
+
+    public void expand() {
+        expand(true);
+    }
+
+    @SuppressLint("WrongCall")
+    public void expand(boolean animate) {
+        if (expanded) {
+            return;
+        }
+
+        if (animatorSet != null) {
+            animatorSet.cancel();
+            animatorSet = null;
+        }
+
+        expanded = true;
+
+        for (View expandableView : expandableViews) {
+            LayoutParams lp = (LayoutParams) expandableView.getLayoutParams();
+
+            // Calculate view's original height
+            expandableView.setVisibility(View.VISIBLE);
+            lp.width = lp.originalWidth;
+            lp.height = lp.originalHeight;
+            lp.weight = lp.originalWeight;
+            super.onMeasure(wms, hms);
+        }
+
+        for (View expandableView : expandableViews) {
+            int targetSize = getOrientation() == HORIZONTAL
+                    ? expandableView.getMeasuredWidth() : expandableView.getMeasuredHeight();
+
+            if (animate) {
+                animateSize(expandableView, targetSize);
+            } else {
+                setSize(expandableView, targetSize);
+            }
+        }
+
+        if (animatorSet != null && animate) {
+            animatorSet.start();
+        }
+    }
+
+    public void collapse() {
+        collapse(true);
+    }
+
+    public void collapse(boolean animate) {
+        if (!expanded) {
+            return;
+        }
+
+        if (animatorSet != null) {
+            animatorSet.cancel();
+            animatorSet = null;
+        }
+
+        expanded = false;
+
+        for (View expandableView : expandableViews) {
+            if (animate) {
+                animateSize(expandableView, 0);
+            } else {
+                setSize(expandableView, 0);
+            }
+        }
+
+        if (animatorSet != null && animate) {
+            animatorSet.start();
+        }
+    }
+
+    public void setOnExpansionUpdateListener(OnExpansionUpdateListener listener) {
+        this.listener = listener;
+    }
+
+    private void animateSize(final View view, final int targetSize) {
+        if (animatorSet == null) {
+            animatorSet = new AnimatorSet();
+            animatorSet.setInterpolator(interpolator);
+            animatorSet.setDuration(duration);
+        }
+
+        final LayoutParams lp = (LayoutParams) view.getLayoutParams();
+        lp.weight = 0;
+
+        int currentSize;
+        if (getOrientation() == HORIZONTAL) {
+            currentSize = view.getWidth();
+        } else {
+            currentSize = view.getHeight();
+        }
+
+        ValueAnimator animator = ValueAnimator.ofInt(currentSize, targetSize);
+        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator valueAnimator) {
+                if (getOrientation() == HORIZONTAL) {
+                    view.getLayoutParams().width = (Integer) valueAnimator.getAnimatedValue();
+                } else {
+                    view.getLayoutParams().height = (Integer) valueAnimator.getAnimatedValue();
+                }
+                view.requestLayout();
+
+                if (listener != null) {
+                    float fraction = targetSize == 0 ? 1 - valueAnimator.getAnimatedFraction() : valueAnimator.getAnimatedFraction();
+                    listener.onExpansionUpdate(fraction);
+                }
+            }
+        });
+        animator.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animator) {
+                view.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                if (targetSize == 0) {
+                    view.setVisibility(GONE);
+                } else {
+                    lp.width = lp.originalWidth;
+                    lp.height = lp.originalHeight;
+                    lp.weight = lp.originalWeight;
+                }
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animator) {
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animator) {
+            }
+        });
+
+        animatorSet.playTogether(animator);
+    }
+
+    private void setSize(View view, int targetSize) {
+        LayoutParams lp = (LayoutParams) view.getLayoutParams();
+
+        if (targetSize == 0) {
+            view.setVisibility(GONE);
+        } else {
+            lp.width = lp.originalWidth;
+            lp.height = lp.originalHeight;
+            lp.weight = lp.originalWeight;
+
+            view.requestLayout();
+        }
+
+        if (listener != null) {
+            listener.onExpansionUpdate(targetSize == 0 ? 0f : 1f);
+        }
+    }
+
+
+    public static class LayoutParams extends LinearLayout.LayoutParams {
+        private final boolean expandable;
+        private final int originalWidth;
+        private final int originalHeight;
+        private final float originalWeight;
+
+        public LayoutParams(Context c, AttributeSet attrs) {
+            super(c, attrs);
+            TypedArray a = c.obtainStyledAttributes(attrs, R.styleable.ExpandableLayout);
+            expandable = a.getBoolean(R.styleable.ExpandableLayout_layout_expandable, false);
+            originalWidth = this.width;
+            originalHeight = this.height;
+            originalWeight = this.weight;
+            a.recycle();
+        }
+    }
+
+    public interface OnExpansionUpdateListener {
+        void onExpansionUpdate(float expansionFraction);
+    }
+}

app_core/common/src/main/java/com/core/widget/expandableLayout/FastOutSlowInInterpolator.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.core.widget.expandableLayout;
+
+/**
+ * Interpolator corresponding to {@link android.R.interpolator#fast_out_slow_in}.
+ *
+ * Uses a lookup table for the Bezier curve from (0,0) to (1,1) with control points:
+ * P0 (0, 0)
+ * P1 (0.4, 0)
+ * P2 (0.2, 1.0)
+ * P3 (1.0, 1.0)
+ */
+public class FastOutSlowInInterpolator extends LookupTableInterpolator {
+
+    /**
+     * Lookup table values sampled with x at regular intervals between 0 and 1 for a total of
+     * 201 points.
+     */
+    private static final float[] VALUES = new float[] {
+            0.0000f, 0.0001f, 0.0002f, 0.0005f, 0.0009f, 0.0014f, 0.0020f,
+            0.0027f, 0.0036f, 0.0046f, 0.0058f, 0.0071f, 0.0085f, 0.0101f,
+            0.0118f, 0.0137f, 0.0158f, 0.0180f, 0.0205f, 0.0231f, 0.0259f,
+            0.0289f, 0.0321f, 0.0355f, 0.0391f, 0.0430f, 0.0471f, 0.0514f,
+            0.0560f, 0.0608f, 0.0660f, 0.0714f, 0.0771f, 0.0830f, 0.0893f,
+            0.0959f, 0.1029f, 0.1101f, 0.1177f, 0.1257f, 0.1339f, 0.1426f,
+            0.1516f, 0.1610f, 0.1707f, 0.1808f, 0.1913f, 0.2021f, 0.2133f,
+            0.2248f, 0.2366f, 0.2487f, 0.2611f, 0.2738f, 0.2867f, 0.2998f,
+            0.3131f, 0.3265f, 0.3400f, 0.3536f, 0.3673f, 0.3810f, 0.3946f,
+            0.4082f, 0.4217f, 0.4352f, 0.4485f, 0.4616f, 0.4746f, 0.4874f,
+            0.5000f, 0.5124f, 0.5246f, 0.5365f, 0.5482f, 0.5597f, 0.5710f,
+            0.5820f, 0.5928f, 0.6033f, 0.6136f, 0.6237f, 0.6335f, 0.6431f,
+            0.6525f, 0.6616f, 0.6706f, 0.6793f, 0.6878f, 0.6961f, 0.7043f,
+            0.7122f, 0.7199f, 0.7275f, 0.7349f, 0.7421f, 0.7491f, 0.7559f,
+            0.7626f, 0.7692f, 0.7756f, 0.7818f, 0.7879f, 0.7938f, 0.7996f,
+            0.8053f, 0.8108f, 0.8162f, 0.8215f, 0.8266f, 0.8317f, 0.8366f,
+            0.8414f, 0.8461f, 0.8507f, 0.8551f, 0.8595f, 0.8638f, 0.8679f,
+            0.8720f, 0.8760f, 0.8798f, 0.8836f, 0.8873f, 0.8909f, 0.8945f,
+            0.8979f, 0.9013f, 0.9046f, 0.9078f, 0.9109f, 0.9139f, 0.9169f,
+            0.9198f, 0.9227f, 0.9254f, 0.9281f, 0.9307f, 0.9333f, 0.9358f,
+            0.9382f, 0.9406f, 0.9429f, 0.9452f, 0.9474f, 0.9495f, 0.9516f,
+            0.9536f, 0.9556f, 0.9575f, 0.9594f, 0.9612f, 0.9629f, 0.9646f,
+            0.9663f, 0.9679f, 0.9695f, 0.9710f, 0.9725f, 0.9739f, 0.9753f,
+            0.9766f, 0.9779f, 0.9791f, 0.9803f, 0.9815f, 0.9826f, 0.9837f,
+            0.9848f, 0.9858f, 0.9867f, 0.9877f, 0.9885f, 0.9894f, 0.9902f,
+            0.9910f, 0.9917f, 0.9924f, 0.9931f, 0.9937f, 0.9944f, 0.9949f,
+            0.9955f, 0.9960f, 0.9964f, 0.9969f, 0.9973f, 0.9977f, 0.9980f,
+            0.9984f, 0.9986f, 0.9989f, 0.9991f, 0.9993f, 0.9995f, 0.9997f,
+            0.9998f, 0.9999f, 0.9999f, 1.0000f, 1.0000f
+    };
+
+    public FastOutSlowInInterpolator() {
+        super(VALUES);
+    }
+
+}

app_core/common/src/main/java/com/core/widget/expandableLayout/LookupTableInterpolator.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.core.widget.expandableLayout;
+
+import android.view.animation.Interpolator;
+
+/**
+ * An {@link Interpolator} that uses a lookup table to compute an interpolation based on a
+ * given input.
+ */
+abstract class LookupTableInterpolator implements Interpolator {
+
+    private final float[] mValues;
+    private final float mStepSize;
+
+    public LookupTableInterpolator(float[] values) {
+        mValues = values;
+        mStepSize = 1f / (mValues.length - 1);
+    }
+
+    @Override
+    public float getInterpolation(float input) {
+        if (input >= 1.0f) {
+            return 1.0f;
+        }
+        if (input <= 0f) {
+            return 0f;
+        }
+
+        // Calculate index - We use min with length - 2 to avoid IndexOutOfBoundsException when
+        // we lerp (linearly interpolate) in the return statement
+        int position = Math.min((int) (input * (mValues.length - 1)), mValues.length - 2);
+
+        // Calculate values to account for small offsets as the lookup table has discrete values
+        float quantized = position * mStepSize;
+        float diff = input - quantized;
+        float weight = diff / mStepSize;
+
+        // Linearly interpolate between the table values
+        return mValues[position] + weight * (mValues[position + 1] - mValues[position]);
+    }
+
+}

app_core/common/src/main/res/drawable/bg_bule_btn.xml

@@ -15,10 +15,21 @@
         </shape>
     </item>
     <item>
-        <shape>
-            <solid android:color="@color/titleBlue" />
-            <corners android:radius="1dp" />
-            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="4dp"
+                android:topRightRadius="4dp"
+                android:bottomRightRadius="4dp"
+                android:bottomLeftRadius="4dp">
+            </corners>
+            <stroke
+                android:width="1dp"
+                android:color="#999999">
+            </stroke>
+            <solid
+                android:color="@color/titleBlue">
+            </solid>
         </shape>
+
     </item>
 </selector>

app_core/common/src/main/res/drawable/shape_process_item.xml

@@ -2,33 +2,23 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_selected="true">
-        <shape  android:shape="rectangle">
-            <corners
-                android:topLeftRadius="100dp"
-                android:topRightRadius="100dp"
-                android:bottomRightRadius="100dp"
-                android:bottomLeftRadius="100dp">
-            </corners>
-            <stroke
-                android:width="1dp"
-                android:color="#fbfbfb">
-            </stroke>
-            <solid
-                android:color="#ffffff">
-            </solid>
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="100dp" android:bottomRightRadius="100dp" android:topLeftRadius="100dp" android:topRightRadius="100dp"></corners>
+            <stroke android:width="1dp" android:color="#fbfbfb"></stroke>
+            <solid android:color="#ffffff"></solid>
         </shape>
-        </item>
+    </item>
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="100dp" android:bottomRightRadius="100dp" android:topLeftRadius="100dp" android:topRightRadius="100dp"></corners>
+            <stroke android:width="1dp" android:color="#fbfbfb"></stroke>
+            <solid android:color="#ffffff"></solid>
+        </shape>
+    </item>
     <item>
-        <shape  android:shape="rectangle">
-            <corners
-                android:topLeftRadius="100dp"
-                android:topRightRadius="100dp"
-                android:bottomRightRadius="100dp"
-                android:bottomLeftRadius="100dp">
-            </corners>
-            <solid
-                android:color="@color/antionbarcolor">
-            </solid>
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="100dp" android:bottomRightRadius="100dp" android:topLeftRadius="100dp" android:topRightRadius="100dp"></corners>
+            <solid android:color="@color/antionbarcolor"></solid>
         </shape>
-        </item>
+    </item>
 </selector>

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

@@ -26,8 +26,8 @@
         android:layout_below="@id/voiceSearchView"
         android:background="@color/Transpant"
         android:divider="@drawable/bg_bar"
-        android:layerType="software"
-        android:scrollingCache="false" />
+       
+        />
 
     <com.github.clans.fab.FloatingActionButton
         android:id="@+id/fab"

WeiChat/src/main/res/layout/activity_data_inquiry_list.xml → app_core/common/src/main/res/layout/activity_data_inquiry_list.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:focusable="true"
@@ -18,11 +19,11 @@
             android:layout_height="match_parent"
             android:divider="@color/gray_light"
             android:dividerHeight="1dp"
-            android:layerType="software"
             android:hardwareAccelerated="true"
+            android:layerType="software"
             android:scrollbars="none"
             android:scrollingCache="false"
-            android:visibility="visible"/>
+            android:visibility="visible" />
 
         <ImageView
             android:id="@+id/data_inquiry_list_total_spread_iv"
@@ -32,7 +33,7 @@
             android:background="#20000000"
             android:scaleType="centerInside"
             android:src="@drawable/ic_expansion_spread"
-            android:visibility="invisible"/>
+            android:visibility="invisible" />
     </RelativeLayout>
 
     <LinearLayout
@@ -47,7 +48,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="0.5dp"
-            android:background="@color/gray_light"/>
+            android:background="@color/gray_light" />
 
         <RelativeLayout
             android:id="@+id/data_inquiry_list_total_hide_rl"
@@ -62,7 +63,7 @@
                 android:layout_height="26dp"
                 android:layout_centerInParent="true"
                 android:scaleType="centerInside"
-                android:src="@drawable/ic_expansion_retract"/>
+                android:src="@drawable/ic_expansion_retract" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -71,7 +72,7 @@
                 android:layout_toLeftOf="@id/data_inquiry_list_total_hide_iv"
                 android:gravity="center_vertical"
                 android:text="合计"
-                android:textSize="14sp"/>
+                android:textSize="14sp" />
 
         </RelativeLayout>
 
@@ -80,13 +81,23 @@
             android:layout_width="match_parent"
             android:layout_height="120dp"
             android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"/>
+            android:layout_marginTop="10dp"
+            android:scrollbars="none"
+            android:overScrollMode="never" />
     </LinearLayout>
 
+    <View
+        android:id="@+id/data_inquiry_list_gray_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#20000000"
+        android:clickable="true"
+        android:visibility="gone" />
+
     <LinearLayout
         android:id="@+id/data_inquiry_list_fuzzy_ll"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:visibility="gone">
 
@@ -112,8 +123,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/search_history"
-                    android:textSize="16sp"/>
+                    android:text="@string/str_search_history"
+                    android:textSize="16sp" />
 
                 <TextView
                     android:id="@+id/data_inquiry_history_clear_tv"
@@ -121,29 +132,25 @@
                     android:layout_height="wrap_content"
                     android:text="@string/str_clear"
                     android:textColor="@color/LightBlue"
-                    android:textSize="16sp"/>
+                    android:textSize="16sp" />
             </LinearLayout>
 
             <com.core.widget.MyListView
                 android:id="@+id/data_inquiry_list_history_data_lv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/me_menu_item_normal"/>
+                android:background="@color/me_menu_item_normal"
+                android:scrollbars="none"
+                android:overScrollMode="never"/>
 
         </LinearLayout>
 
-        <View
-            android:id="@+id/data_inquiry_list_fuzzy_bg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#20000000"
-            />
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/data_inquiry_list_exact_ll"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:visibility="gone">
 
@@ -158,7 +165,9 @@
                 android:id="@+id/data_inquiry_list_option_lv"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"/>
+                android:layout_weight="1"
+                android:scrollbars="none"
+                android:overScrollMode="never"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -178,7 +187,7 @@
                     android:gravity="center"
                     android:text="@string/cancel"
                     android:textColor="@color/selector_cancel_text_color"
-                    android:textSize="14sp"/>
+                    android:textSize="14sp" />
 
                 <TextView
                     android:id="@+id/data_inquiry_list_option_reset_tv"
@@ -191,7 +200,7 @@
                     android:gravity="center"
                     android:text="@string/reset"
                     android:textColor="@color/white"
-                    android:textSize="14sp"/>
+                    android:textSize="14sp" />
 
                 <TextView
                     android:id="@+id/data_inquiry_list_option_confirm_tv"
@@ -203,17 +212,9 @@
                     android:gravity="center"
                     android:text="@string/app_dialog_ok"
                     android:textColor="@color/white"
-                    android:textSize="14sp"/>
+                    android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
-
-        <View
-            android:id="@+id/data_inquiry_list_exact_bg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#20000000"
-            />
-
     </LinearLayout>
 
 </RelativeLayout>

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

@@ -274,7 +274,8 @@
             <RelativeLayout
                 android:id="@+id/room_type_rl"
                 style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="gone">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -301,7 +302,8 @@
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg"
                 android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true">
+                android:layout_centerHorizontal="true"
+                android:visibility="gone">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:id="@+id/top"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/antionbarcolor">
+
+    <ImageView
+        android:id="@+id/search_action_back_iv"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_centerVertical="true"
+        android:src="@drawable/ic_action_back" />
+
+    <ImageView
+        android:id="@+id/search_action_menu_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:maxWidth="40dp" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
+        android:visibility="visible">
+
+        <com.core.widget.ClearEditText
+            android:id="@+id/search_action_search_et"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_centerVertical="true"
+            android:background="@drawable/search_input"
+            android:drawableLeft="@drawable/search"
+            android:drawableRight="@drawable/search_clear"
+            android:hint="@string/search"
+            android:imeOptions="actionSearch"
+            android:inputType="text"
+            android:paddingRight="26dp"
+            android:textColor="@color/dark_grey"
+            android:textColorHint="@color/grey"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/search_action_voice_iv"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignRight="@+id/search_edit"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="6dp"
+            android:background="@drawable/btn_yuyin_nor"
+            android:visibility="visible" />
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -199,7 +199,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@null"
-                    android:hint="@string/common_input1"
+                    android:hint="@string/common_input"
                     android:textSize="15sp"
                     android:gravity="center_vertical|right"
                     android:layout_marginLeft="5dp"

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

@@ -52,8 +52,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:background="@drawable/shape_process_item"
-            >
+            android:background="@drawable/shape_process_item">
             <TextView
                 android:id="@+id/tv_process_already"
                 android:layout_width="wrap_content"

app_core/common/src/main/res/values-en/strings.xml

@@ -37,7 +37,7 @@
         <string name = "common_noinput"> not filled in </string>
         <string name = "common_camera"> take pictures </string>
         <string name = "common_photo"> select </string> from the album
-        <string name = "common_notlinknet"> The network is not connected </string>
+        <string name = "common_notlinknet">The current network is not available, please try again later</string>
         <string name = "common_notice"> Warm Tips </string>
         <string name = "common_save_failed"> save failed </string>
         <string name = "common_save_success"> save successfully </string>
@@ -1424,11 +1424,6 @@
     <string name = "input_phone_number"> Please enter the phone number </string>
     <string name = "input_name"> Please enter a name </string>
 
-
-    <!--工作->数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
     <string name="give_up">放弃</string>
     <string name="app_time_selecting">选择时间</string>
     <string name="qzone_edit_weekly">编写周报</string>
@@ -1439,6 +1434,8 @@
     <string name="complete">完成</string>
 
     <!--工作台菜单-->
+    <string name="str_work_add_func">添加应用</string>
+
     <string name="str_uu_application">UU应用</string>
     <string name="str_work_subscribe_secretary">预约小秘书</string>
     <string name="str_work_uu_sports">UU运动</string>
@@ -1474,6 +1471,9 @@
     <string name="str_usoft_cloud_platform">优软云平台</string>
     <string name="str_work_b2b_commerce">B2B商务</string>
     <string name="str_work_usoft_mall">优软商城</string>
+    <string name="str_work_charitable_donations">一元捐</string>
+    <string name="str_search_history">搜索历史</string>
+    <string name="str_clear">清空</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -38,7 +38,7 @@
     <string name="common_noinput">未填写</string>
     <string name="common_camera">拍照</string>
     <string name="common_photo">从相册选择</string>
-    <string name="common_notlinknet">网络未连接</string>
+    <string name="common_notlinknet">当前网络不可用，请稍后重试!</string>
     <string name="common_notice">温馨提示</string>
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
@@ -1537,11 +1537,6 @@
     <string name="input_phone_number">请输入手机号</string>
     <string name="input_name">请输入姓名</string>
 
-
-    <!--工作->数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
     <string name="give_up">放弃</string>
     <string name="app_time_selecting">选择时间</string>
     <string name="qzone_edit_weekly">编写周报</string>
@@ -1552,6 +1547,8 @@
     <string name="complete">完成</string>
 
     <!--工作台菜单-->
+    <string name="str_work_add_func">添加应用</string>
+
     <string name="str_uu_application">UU应用</string>
     <string name="str_work_subscribe_secretary">预约小秘书</string>
     <string name="str_work_uu_sports">UU运动</string>
@@ -1587,6 +1584,9 @@
     <string name="str_usoft_cloud_platform">优软云平台</string>
     <string name="str_work_b2b_commerce">B2B商务</string>
     <string name="str_work_usoft_mall">优软商城</string>
+    <string name="str_work_charitable_donations">一元捐</string>
+    <string name="str_search_history">搜索历史</string>
+    <string name="str_clear">清空</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -34,7 +34,7 @@
     <string name="common_agree">同意</string>
     <string name="common_disagree">不同意</string>
     <string name="common_changedealman">變更處理人</string>
-    <string name="common_notlinknet">網絡未連接</string>
+    <string name="common_notlinknet">當前網絡不可用，請稍後重試!</string>
     <string name="common_notice">溫馨提示</string>
     <string name="common_save_failed">保存失敗</string>
     <string name="common_save_success">保存成功</string>
@@ -1525,11 +1525,6 @@
     <string name="input_phone_number">請輸入手機號</string>
     <string name="input_name">請輸入姓名</string>
 
-
-    <!--工作-数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
     <string name="give_up">放弃</string>
     <string name="app_time_selecting">选择时间</string>
     <string name="qzone_edit_weekly">编写周报</string>
@@ -1540,6 +1535,8 @@
     <string name="complete">完成</string>
 
     <!--工作台菜单-->
+    <string name="str_work_add_func">添加应用</string>
+
     <string name="str_uu_application">UU应用</string>
     <string name="str_work_subscribe_secretary">预约小秘书</string>
     <string name="str_work_uu_sports">UU运动</string>
@@ -1575,6 +1572,9 @@
     <string name="str_usoft_cloud_platform">优软云平台</string>
     <string name="str_work_b2b_commerce">B2B商务</string>
     <string name="str_work_usoft_mall">优软商城</string>
+    <string name="str_work_charitable_donations">一元捐</string>
+    <string name="str_search_history">搜索历史</string>
+    <string name="str_clear">清空</string>
     <!--工作台菜单-->
 
 </resources>

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

@@ -262,4 +262,13 @@
         <attr name="noticeTextSize" format="dimension" />
         <attr name="noticeRollingTime" format="integer" />
     </declare-styleable>
+
+    <!--伸缩布局属性-->
+    <declare-styleable name="ExpandableLayout">
+        <attr name="el_duration" format="integer" />
+        <attr name="el_expanded" format="boolean" />
+        <attr name="el_translate_children" format="boolean" />
+        <attr name="layout_expandable" format="boolean" />
+        <attr name="android:orientation"/>
+    </declare-styleable>
 </resources>

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

@@ -582,7 +582,7 @@
     <string name="common_noinput">未填写</string>
     <string name="common_camera">拍照</string>
     <string name="common_photo">从相册选择</string>
-    <string name="common_notlinknet">网络未连接</string>
+    <string name="common_notlinknet">当前网络不可用，请稍后重试!</string>
     <string name="common_notice">温馨提示</string>
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
@@ -1871,12 +1871,6 @@
     <string name="input_phone_number">请输入手机号</string>
     <string name="input_name">请输入姓名</string>
 
-    <!--工作->数据查询-->
-    <string name="common_service_query">常用业务查询</string>
-    <string name="more_queries">更多查询</string>
-    <string name="select_query_service">选择查询业务</string>
-
-
     <string name="schedule_title_must_input">日程标题为必填项</string>
     <string name="schedule_detail_must_input">日程详情为必填项</string>
     <string name="not_camera_permission">应用没有获取到权限,请允许打开摄像头权限或到设置中打开摄像头权限</string>
@@ -1891,6 +1885,8 @@
 
 
     <!--工作台菜单-->
+    <string name="str_work_add_func">添加应用</string>
+
     <string name="str_uu_application">UU应用</string>
     <string name="str_work_subscribe_secretary">预约小秘书</string>
     <string name="str_work_uu_sports">UU运动</string>
@@ -1926,6 +1922,9 @@
     <string name="str_usoft_cloud_platform">优软云平台</string>
     <string name="str_work_b2b_commerce">B2B商务</string>
     <string name="str_work_usoft_mall">优软商城</string>
+    <string name="str_work_charitable_donations">一元捐</string>
+    <string name="str_search_history">搜索历史</string>
+    <string name="str_clear">清空</string>
     <!--工作台菜单-->
 
 </resources>

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

@@ -370,7 +370,7 @@
 
     <style name="item_menu_tag">
         <item name="android:ellipsize">end</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">18sp</item>
         <item name="android:textColor">@color/text_normal</item>
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:layout_width">wrap_content</item>
@@ -392,7 +392,7 @@
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">right|center_vertical</item>
         <item name="android:textColorHint">@color/gray</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">12sp</item>
     </style>
     <!-- 日报详情总结、计划、心得内容显示样式-->
     <style name="form_relative_right_text1">

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

@@ -200,8 +200,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         tv_title.setOnClickListener(this);
 
         addSubUtils = (AddSubUtils) findViewById(R.id.add_sub);
-        addSubUtils.setBuyMax(100000000)       // 最大购买数，默认为int的最大值
-                .setInventory(100000000)       // 库存，默认为int的最大值
+        addSubUtils.setBuyMax(999)       // 最大购买数，默认为int的最大值
+                .setInventory(999)       // 库存，默认为int的最大值
                 .setCurrentNumber(1)    // 设置当前数，默认为1
                 .setStep(1)             // 步长，默认为1
                 .setBuyMin(1)           // 购买的最小值，默认为1
@@ -295,6 +295,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             sb_userid = intent.getStringExtra("sb_userid");
             sb_username = intent.getStringExtra("sb_username");
             LogUtil.d(TAG, "sb_userid:" + sb_userid + "  sb_username:" + sb_username + " dataService:" + dataService);
+            LogUtil.prinlnLongMsg("model",JSON.toJSONString(model));
             if (model != null) {
                 LogUtil.i(model.toString());
                 initType(model.getType());
@@ -1644,6 +1645,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
           
                      @Override
                      public void onResponse(Object o) {
+                         LogUtil.prinlnLongMsg("appLineList",o.toString());
                          dimssLoading();
                          try {
                              LogUtil.d(TAG,o.toString());
@@ -1684,9 +1686,13 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                  }
                              }
                              if (desklist!=null){
-                                 if (deskbook.size()==0){
+                                 if (desklist.size()==0){
+                                     tv_food_rooms.setHint(R.string.common_select);
                                      ll_seats_panel.setVisibility(View.GONE);
                                      food_seats_rl.setVisibility(View.GONE);
+                                 }else{
+                                     ll_seats_panel.setVisibility(View.VISIBLE);
+                                     food_seats_rl.setVisibility(View.VISIBLE);
                                  }
                                  for (int i = 0; i <desklist.size() ; i++) {
                                      JSONObject object=desklist.getJSONObject(i);
@@ -1730,6 +1736,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                     }
                                  }
                              }else{
+                                 tv_food_rooms.setHint(R.string.common_select);
                                  ll_seats_panel.setVisibility(View.GONE);
                                  food_seats_rl.setVisibility(View.GONE);
                              }
@@ -1794,6 +1801,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                              gvMSeats.setAdapter(new ItemFoodStateAdapter(mContext,seatsM));
                              gvDSeats.setAdapter(new ItemFoodStateAdapter(mContext,seatsD));
                              gvZSeats.setAdapter(new ItemFoodStateAdapter(mContext,seatsZ));
+                             //ni
                              
                              gvMSeats.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                                  @Override

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

@@ -132,7 +132,7 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 		if (getIntent() != null) {
 			model = getIntent().getParcelableExtra("model");
 			getSupportActionBar().setTitle(model.getName());
-			LogUtil.d("myTest", "model:" + JSON.toJSONString(model));
+			LogUtil.prinlnLongMsg("myTest", "model:" + JSON.toJSONString(model));
 			if ("10005".equals(model.getIndustrycode())){
 				//会所
 				mBookStoreTv.setText("不指定技师，预约门店");

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

@@ -33,7 +33,7 @@ public class BBSharesListActivity extends BaseActivity {
     }
     
     private void initView(){
-        getSupportActionBar().setTitle("共享预约");
+        getSupportActionBar().setTitle("预约共享");
         mlist= (PullToRefreshListView) findViewById(R.id.shareList);
         emptyLayout=new EmptyLayout(mContext,mlist.getRefreshableView());
         if (getIntent()!=null){
@@ -42,6 +42,7 @@ public class BBSharesListActivity extends BaseActivity {
             mAdapter.setTime(true);
             mlist.setAdapter(mAdapter);
             if (mAdapter.getCount()==0){
+                emptyLayout.setEmptyMessage("您还没有预约，现在就去约吧！");
                 emptyLayout.showEmpty();
             }
         }

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

@@ -9,7 +9,6 @@ import android.widget.AdapterView;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
@@ -42,12 +41,11 @@ public class MuiltSelectShareActivity extends OABaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_shares_list);
-        LogUtil.d(TAG,"AppUtils.isDebug():"+ BaseConfig.isDebug());
         initView();
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("预约分享");
+        getSupportActionBar().setTitle("预约共享");
         mlist = (PullToRefreshListView) findViewById(R.id.shareList);
         emptyLayout = new EmptyLayout(ct, mlist.getRefreshableView());
         if (getIntent() != null) {
@@ -56,6 +54,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
             mAdapter.setTime(true);
             mlist.setAdapter(mAdapter);
             if (mAdapter.getCount()==0){
+                emptyLayout.setEmptyMessage("您还没有预约，现在就去约吧！");
                 emptyLayout.showEmpty();
             }
         }

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemRoomsSelectAdapter.java

@@ -75,10 +75,12 @@ public class ItemRoomsSelectAdapter extends BaseAdapter {
         holder.model = object;
         if (object.isBooking()) {
             holder.tvBookAction.setText("已预定");
-            holder.tvBookAction.setBackgroundResource(R.color.item_line);
+            holder.tvBookAction.setBackgroundResource(R.drawable.bg_bule_btn);
+            holder.tvBookAction.setSelected(true);
         } else {
             holder.tvBookAction.setBackgroundResource(R.drawable.bg_bule_btn);
             holder.tvBookAction.setText("预定");
+            holder.tvBookAction.setSelected(false);
         }
 
         holder.ivItem.setOnClickListener(new View.OnClickListener() {

app_modular/appbooking/src/main/java/com/modular/booking/widget/AddSubUtils.java

@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.DigitsKeyListener;
 import android.util.AttributeSet;
@@ -222,12 +223,12 @@ public class AddSubUtils extends LinearLayout implements View.OnClickListener, T
 
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-       
+      
     }
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
-        onNumberInput();
+     
     }
 
     /**
@@ -328,7 +329,7 @@ public class AddSubUtils extends LinearLayout implements View.OnClickListener, T
 
     @Override
     public void afterTextChanged(Editable s) {
-
+        onNumberInput();
     }
 
     /**
@@ -337,7 +338,7 @@ public class AddSubUtils extends LinearLayout implements View.OnClickListener, T
      * @return
      */
     public int getNumber() {
-//        if (!TextUtils.isEmpty(etInput.getText().toString())) {
+        if (!TextUtils.isEmpty(etInput.getText().toString())) {
             try {
                 return Integer.parseInt(etInput.getText().toString());
             } catch (NumberFormatException e) {
@@ -345,9 +346,9 @@ public class AddSubUtils extends LinearLayout implements View.OnClickListener, T
             }
             etInput.setText(mBuyMin + "");
            // etInput.setSelection(etInput.getText().length());
-//        }else{
-//            
-//        }
+        }else{
+
+        }
         return mBuyMin;
     }
 

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

@@ -3,7 +3,7 @@
     android:id="@+id/book_service_action"
     android:layout_width="match_parent"
     android:background="@color/antionbarcolor"
-    android:layout_height="48dp">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/book_service_search_back"

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

@@ -410,7 +410,7 @@
             android:id="@+id/ll_food"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            
+            android:visibility="gone"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -508,7 +508,7 @@
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/food_seats_rl"
-             
+                android:visibility="gone"
                 style="@style/item_menu">
 
                 <TextView
@@ -537,8 +537,9 @@
                 android:id="@+id/ll_seats_panel"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:visibility="gone"
                 android:background="@color/me_menu_item_normal"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="6dp"
                 android:orientation="vertical">
                 
                 <LinearLayout
@@ -551,15 +552,21 @@
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
                         android:textColor="@color/blue_seats_num"
-                
+                        android:textStyle="bold"
                         android:text="排队实况"/>
+<!--
+                    <View
+                      
+                        style="@style/app_line_v_1dp" ></View>
+-->
                     <TextView
                         android:id="@+id/tvSeatsRight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                       
+                       android:drawableLeft="@drawable/icon_line_v"
                         android:textColor="@color/gray"
+                        android:textStyle="bold"
                         android:text="商家释放"/>
                 </LinearLayout>
                
@@ -571,7 +578,7 @@
                     android:orientation="vertical">
                     <RelativeLayout
                         style="@style/item_menu"
-                        android:layout_margin="5dp"
+                        android:layout_margin="6dp"
                         android:background="@drawable/shape_sample_one_1dp">
                         <TextView
                             android:id="@+id/tvMSeatsName"
@@ -593,7 +600,7 @@
                     </RelativeLayout>
                     <RelativeLayout
                         android:background="@drawable/shape_sample_one_1dp"
-                        android:layout_margin="5dp"
+                        android:layout_margin="6dp"
                         style="@style/item_menu">
                         <TextView
                             android:id="@+id/tvZSeatsName"
@@ -615,7 +622,7 @@
                     </RelativeLayout>
                     <RelativeLayout
                         android:background="@drawable/shape_sample_one_1dp"
-                        android:layout_margin="5dp"
+                        android:layout_margin="6dp"
                         style="@style/item_menu">
                         <TextView
                             android:id="@+id/tvDSeatsName"

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

@@ -7,11 +7,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/transparent"
-        android:horizontalSpacing="15dp"
+        android:horizontalSpacing="5dp"
         android:numColumns="2"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="5dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:scrollbars="none"
-        android:verticalSpacing="10dp" />
+        android:verticalSpacing="5dp" />
 </RelativeLayout>

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

@@ -52,7 +52,8 @@
                 android:id="@+id/rg_sex"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="center"
+                android:gravity="right|center_vertical"
+             
                 android:layout_toRightOf="@+id/tag_book_sex"
                 android:orientation="horizontal" >
 
@@ -70,6 +71,7 @@
                     android:id="@+id/rb_girl"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="right"
                     android:layout_marginLeft="20dp"
 
                     android:button="@null"
@@ -105,9 +107,11 @@
         </RelativeLayout>
         <RelativeLayout
             android:id="@+id/notes_rl"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="17dp"
             android:layout_height="wrap_content"
-            style="@style/item_menu">
+            style="@style/item_menu"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true">
 
             <TextView
                 android:id="@+id/tag_book_notes"

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <!--抬头信息-->
     <RelativeLayout
@@ -12,27 +14,44 @@
             android:id="@+id/max_img"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:alpha="0.16"
+            android:alpha="0.5"
             android:scaleType="fitXY" />
-
+        <ImageView
+            android:id="@+id/shadow_img"
+            android:background="#80000000"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY" />
+<com.xzjmyk.pm.activity.view.shadow.ShadowLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:layout_centerVertical="true"
+    android:layout_marginLeft="12dp"
+    android:layout_marginStart="12dp"
+    app:sl_shadowRadius="4dp"
+    app:sl_shadowColor="#AA000000"
+    app:sl_dx="2dp"
+    app:sl_dy="2dp"
+    android:id="@+id/sl_header"
+    app:sl_cornerRadius="50dp">
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_header"
             android:layout_width="55dp"
             android:layout_height="55dp"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
+         
             android:background="@null"
-            android:src="@drawable/defaultpic"></de.hdodenhof.circleimageview.CircleImageView>
-
+            android:src="@drawable/defaultpic">
+            
+        </de.hdodenhof.circleimageview.CircleImageView>
+</com.xzjmyk.pm.activity.view.shadow.ShadowLayout>
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="15dp"
-            android:layout_toRightOf="@+id/iv_header"
+            android:layout_marginLeft="7dp"
+            android:layout_toRightOf="@+id/sl_header"
             android:orientation="vertical">
 
             <TextView
@@ -40,9 +59,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/icon_detail"
+                android:drawablePadding="3dp"
                 android:gravity="center_vertical"
+                android:elevation="2dp"
                 android:text="********"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="20sp"
                 android:textStyle="bold" />
 
@@ -51,9 +72,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/icon_map"
+                android:drawablePadding="3dp"
+                android:elevation="2dp"
                 android:gravity="center_vertical"
                 android:text="********"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
         </LinearLayout>
     </RelativeLayout>

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

@@ -44,7 +44,7 @@
                 android:layout_weight="1"
                 android:gravity="right"
                 android:text="餐饮"
-                android:textSize="10sp" />
+                android:textSize="14sp" />
         </LinearLayout>
 
         <!--<LinearLayout-->
@@ -99,13 +99,12 @@
             <TextView
                 android:id="@+id/tvCash"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
                 android:drawableLeft="@drawable/icon_tel"
-                android:padding="5dp"
                 android:layout_weight="1"
                 android:text="1328349823"
                 android:textColor="@color/light_green" />
-
             <Button
                 android:id="@+id/btBook"
                 android:layout_width="65dp"

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

@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.xzjmyk.pm.activity.view.shadow.ShadowLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:sl_cornerRadius="0dp"
+    app:sl_dx="-1dp"
+    app:sl_dy="3dp"
+    app:sl_shadowColor="@color/shadow"
+    app:sl_shadowRadius="3dp">
+<RelativeLayout 
     android:orientation="vertical"
     android:layout_width="match_parent"
+    android:background="@color/white"
     android:layout_height="match_parent">
     <RelativeLayout
         android:id="@+id/rlImage"
@@ -17,12 +28,13 @@
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:textSize="16sp"
+   
         android:gravity="center"
         android:layout_alignParentBottom="true"
         android:textColor="@color/white"
         android:textStyle="bold"
         android:background="#80000000"
-        android:text="服务项目" />
+        android:text="服务项目" />  
 </RelativeLayout>
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,7 +44,7 @@
         android:orientation="horizontal">
         <TextView
             android:id="@+id/tvBookAction"
-            android:layout_width="60dp"
+            android:layout_width="80dp"
             android:layout_height="30dp"
             android:gravity="center"
             
@@ -45,4 +57,5 @@
             android:background="@color/gray"/>
     </LinearLayout>
   
-</RelativeLayout>
+</RelativeLayout>
+</com.xzjmyk.pm.activity.view.shadow.ShadowLayout>

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

@@ -81,14 +81,12 @@ public class CompanyContactsActivity extends BaseActivity {
     private LinearLayout ll_content;
     private RelativeLayout rl_empty;
     private SuperSwipeRefreshLayout reScrollView;
-
-
+    
     private Context ct;
     //关键变量
     public static ArrayList<String> tabTitle = new ArrayList<>(); // 标题
     public static Map<String, Object> keystore = new LinkedHashMap<>(); // 标题
-
-
+    
     private LayoutInflater mInflater;
     private Hrorgs hrorgs_parent;
     private Hrorgs hrorgs_left;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BRestActivity.java

@@ -147,6 +147,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 	public void onClick(View v) {
 		if (!CommonUtil.isNetWorkConnected(ct)) {
 			ToastMessage(getString(R.string.common_notlinknet));
+			ToastMessage(getString(R.string.networks_out));
 			return;
 		}
 		if (v.getId() == R.id.saveBtn) {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -63,13 +63,10 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
                 sc_industrycode = array.getJSONObject(0).getString("sc_industrycode");
 
                 if ("餐饮".equals(sc_industry)) {
-                    rTyperl.setVisibility(View.GONE);
                     tableSetRl.setVisibility(View.VISIBLE);
                 }else {
-                    rTyperl.setVisibility(View.GONE);
-                    tableSetRl.setVisibility(View.GONE);
+                    tableSetRl.setVisibility(View.VISIBLE);
                 }
-
             }
         }));
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -93,6 +93,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
+        progressDialog.show();
         initView();
         judgeWhichType();
         String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
@@ -170,6 +171,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             myAdapter.notifyDataSetChanged();
         }
         Log.i("fanglh",sc_industry+"");
+        progressDialog.dismiss();
     }
 
     private void initView() {
@@ -217,14 +219,17 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
             LogUtil.prinlnLongMsg("mPhotoList",JSON.toJSONString(mPhotoList));
-            if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
-                ToastMessage("请输入名称");
-                return;
-            }
-            if (mPhotoList.size() < mList.size()){
-                ToastMessage("请添加照片");
-                return;
+            if(!ListUtils.isEmpty(mList)){
+                if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
+                    ToastMessage("请输入名称");
+                    return;
+                }
+                if (mPhotoList.size() < mList.size()){
+                    ToastMessage("请添加照片");
+                    return;
+                }
             }
+
             BSetLocationBean model = new BSetLocationBean();
             model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));

app_modular/appme/src/main/java/com/uas/appme/settings/activity/CheckWagesActivity.java

@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
+import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
@@ -38,6 +39,7 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 
 import java.util.Calendar;
+import java.util.Date;
 
 /**
  * Created by FANGlh on 2017/11/10.
@@ -179,9 +181,26 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
 
         mTel.setText(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"user_phone"));
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
-//        emcode = MyApplication.getInstance().getLoginUserId();
-        emcode = "U0747";
+        emcode = CommonUtil.getEmcode();
+//        emcode = "U0747";
 
+
+
+        //默认显示查询时间
+        Date date = new Date(System.currentTimeMillis());
+        int year =  CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy"));
+        int month = CalendarUtil.getMonth(date);
+        String Smonth = "";
+        if (month < 10 && month > 1) {
+            Smonth = "0" + Integer.valueOf(month-1);
+        }else if (month == 1){
+            year = year-1;
+            Smonth = 12+"";
+        }else {
+            Smonth = month-1 + "";
+        }
+        mWagesDate.setText(year + "年" + Smonth+"月");
+        checkYear = year+""; checkMonth = Smonth;
     }
 
     @Override
@@ -189,7 +208,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
        int id =  v.getId();
         if (id == R.id.wages_date){
             DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH);
-            picker.setRange(2016, 2017);
+            picker.setRange(2016, CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")));
             picker.setSelectedItem(
                     Calendar.getInstance().get(Calendar.YEAR),
                     Calendar.getInstance().get(Calendar.MONTH) + 1);
@@ -323,7 +342,6 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 try {
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
-                        Log.i("HttpLogs","success = true1");
                         String ps = mWagesPasswordEt.getText().toString();
                         String vc = mWagesCodeEt.getText().toString();
                         String p = mTel.getText().toString();
@@ -334,7 +352,6 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                                 .putExtra("password",ps)
                                 .putExtra("vecode",vc)
                                 .putExtra("phone",p));
-                        Log.i("HttpLogs","success = true2");
                         finish();
                     }else if (o.toString().contains("reason")){
                         ToastMessage(JSON.parseObject(o.toString()).getString("reason"));

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FindWagePWActivity.java

@@ -133,7 +133,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                 mEyeTv.setImageResource(R.drawable.icon_show);
             }
         }else if (id == R.id.clearphone_tv){
-
+            mPhoneEt.setText("");
         }
     }
 
@@ -141,7 +141,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
         HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/changePassword.action")
-                .add("emcode", "U0747")
+                .add("emcode", CommonUtil.getEmcode())
                 .add("password",mSetpwEt.getText().toString())
                 .add("phone",mPhoneEt.getText().toString())
                 .add("em_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -357,7 +357,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                 mUserDepartmentEv.setText(department);
             }
         }
-        if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
+       /* if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
             if (resultCode == Activity.RESULT_OK) {
                 if (mNewPhotoUri != null) {
                     photoselect = mNewPhotoUri.getPath();
@@ -378,7 +378,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     updateChangeP = true;
                 }
             }
-        }
+        }*/
 
 
         else  if (requestCode == REQUEST_CODE_CAPTURE_CROP_PHOTO) {// 拍照返回再去裁减
@@ -410,6 +410,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     mCurrentFile = new File(mNewPhotoUri.getPath());
                     ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(), image_im);
                     photoselect = mCurrentFile.getPath();
+                    updateChangeP = true;
                 } else {
                     ToastUtil.showToast(this, R.string.c_crop_failed);
                 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/TableSetActivity.java

@@ -83,6 +83,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
 //            model.setAs_id("0");
             model.setAs_companyid(as_companyid);
             model.setAs_booknumber("");
+            model.setAs_maxperson("");
             tableList.add(model);
             myAdapter.notifyDataSetChanged();
         }else{
@@ -100,6 +101,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             model.setAs_type(JSON.parseObject(updateData).getString("as_type"));
             model.setAs_remark(JSON.parseObject(updateData).getString("as_remark"));
             model.setAs_booknumber(JSON.parseObject(updateData).getString("as_booknumber"));
+            model.setAs_maxperson(JSON.parseObject(updateData).getString("as_maxperson"));
             tableList.add(model);
             myAdapter.notifyDataSetChanged();
         }
@@ -136,6 +138,8 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 model.setAs_remark("");
                 model.setAs_id("0");
                 model.setAs_companyid(as_companyid);
+                model.setAs_maxperson("");
+                model.setAs_booknumber("");
                 tableList.add(model);
                 myAdapter.notifyDataSetChanged();
         }else if (id == R.id.save_bt){
@@ -226,7 +230,8 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
         if (!StringUtil.isEmpty(tableList.get(c_size-1).getAs_deskcode()) &&
                 !StringUtil.isEmpty(tableList.get(c_size-1).getAs_remark()) &&
                 !StringUtil.isEmpty(tableList.get(c_size-1).getAs_number()) &&
-                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_booknumber())){
+                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_booknumber())&&
+                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_maxperson())){
             canOrNot = true;
         }else {
             ToastMessage("请输全设置信息");
@@ -268,7 +273,11 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 tableView.number_et = (FormEditText) convertView.findViewById(R.id.number_et);
                 tableView.remark_et = (FormEditText) convertView.findViewById(R.id.remark_et);
                 tableView.days_et = (FormEditText) convertView.findViewById(R.id.days_et);
+                tableView.maxperson_et = (FormEditText) convertView.findViewById(R.id.maxperson_et);
                 convertView.setTag(tableView);
+
+                tableView.maxperson_et.setFocusable(false);
+                tableView.maxperson_et.setKeyListener(null);
                 tableView.type_et.setFocusable(false);
                 tableView.type_et.setKeyListener(null);
                 tableView.deskcode_et.setFocusable(false);
@@ -315,6 +324,12 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     doInput(4,position);
                 }
             });
+            tableView.maxperson_et.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    doInput(5,position);
+                }
+            });
 
             //showdata
             tableView.type_et.setText(modeList.get(position).getAs_type()+"");
@@ -322,11 +337,12 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             tableView.number_et.setText(modeList.get(position).getAs_number()+"");
             tableView.remark_et.setText(modeList.get(position).getAs_remark()+"");
             tableView.days_et.setText(modeList.get(position).getAs_booknumber());
+            tableView.maxperson_et.setText(modeList.get(position).getAs_maxperson()+"");
             return convertView;
         }
 
         class TableView{
-            FormEditText type_et,deskcode_et,number_et,remark_et,days_et;
+            FormEditText type_et,deskcode_et,number_et,remark_et,days_et,maxperson_et;
         }
     }
     private PopupWindow popupWindow = null;
@@ -359,9 +375,15 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
         }else if (type == 4){
             editname_et.setVisibility(View.GONE);
             editname_et2.setVisibility(View.VISIBLE);
-            title_tv.setText("请可被预约量/天");
+            title_tv.setText("请输入可被预约量/天");
             editname_et2.setHint(getString(R.string.common_input));
             editname_et2.setText(tableList.get(position).getAs_booknumber()+"");
+        }else if (type == 5){
+            editname_et.setVisibility(View.GONE);
+            editname_et2.setVisibility(View.VISIBLE);
+            title_tv.setText("请输入最多可坐人数");
+            editname_et2.setHint(getString(R.string.common_input));
+            editname_et2.setText(tableList.get(position).getAs_maxperson()+"");
         }
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
@@ -403,12 +425,20 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     }
                 }else if (type == 4){
                     if (StringUtil.isEmpty(editname_et2.getText().toString())){
-                        ToastMessage("请可被预约量/天");
+                        ToastMessage("请输入可被预约量/天");
                         return;
                     }else {
                         tableList.get(position).setAs_booknumber(editname_et2.getText().toString());
                         myAdapter.notifyDataSetChanged();
                     }
+                }else if (type == 5){
+                    if (StringUtil.isEmpty(editname_et2.getText().toString())){
+                        ToastMessage("请输入最多可坐人数");
+                        return;
+                    }else {
+                        tableList.get(position).setAs_maxperson(editname_et2.getText().toString());
+                        myAdapter.notifyDataSetChanged();
+                    }
                 }
                 popupWindow.dismiss();
             }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -1,20 +1,17 @@
 package com.uas.appme.settings.activity;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -26,6 +23,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
@@ -34,11 +32,11 @@ import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.time.wheel.DatePicker;
-import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -88,7 +86,14 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private String phone;
     private TextView wageDateTv;
     private LinearLayout noWageLl;
-    private Boolean haveData = false;
+    private Boolean haveData = true;
+    private TextView announcement_tv;
+    private int needSignature;
+    private JSONObject dataObject;
+    private int sl_result = -1;
+    private String sl_remark;
+    private LinearLayout error_ll;
+    private TextView error_tv;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -106,8 +111,35 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             if (salaryObject != null){
                 JSONArray configsArray = salaryObject.getJSONArray("configs");
                 JSONObject dataObject = salaryObject.getJSONObject("data");
+                if (dataObject.size() == 0) {
+                    showEnty();
+                    return;
+                }
+                String gonggao = dataObject.getString("sl_text");
+                if (!StringUtil.isEmpty(gonggao))
+                    announcement_tv.setText("通知公告："+gonggao);
+                else if (gonggao == null)
+                    announcement_tv.setText("暂无通知公告");
+
+                needSignature = dataObject.getInteger("sl_signature");
+                if (needSignature == 0) mBtnSignature.setText("确认签收");
+                sl_result = dataObject.getInteger("sl_result");
+                sl_remark = dataObject.getString("sl_remark");
+                if (!StringUtil.isEmpty(sl_remark) && sl_result == -1){
+                    error_ll.setVisibility(View.VISIBLE);
+                    error_tv.setText(sl_remark);
+                }else {
+                    error_ll.setVisibility(View.GONE);
+                }
+
+                if (sl_result == 1 || sl_result == -1)
+                    mBtnSignature.setVisibility(View.GONE);
+                else if (sl_result == 0 && haveData)
+                    mBtnSignature.setVisibility(View.VISIBLE);
+
+
                 sl_id = dataObject.getString("sl_id");
-                if (!ListUtils.isEmpty(configsArray) && dataObject != null){
+                if (!ListUtils.isEmpty(configsArray) && dataObject.size() > 0){
                     for (int i = 0; i < configsArray.size(); i++) {
                         String key = configsArray.getJSONObject(i).getString("Caption");
                         String field = configsArray.getJSONObject(i).getString("Field");
@@ -125,6 +157,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                             LogUtil.prinlnLongMsg("fanglh",JSON.toJSONString(kvModeList));
                             if (ListUtils.isEmpty(kvModeList))
                                 showEnty();
+                            else {
+                                noWageLl.setVisibility(View.GONE);
+                            }
                         }
                     }
                 }else{
@@ -137,22 +172,18 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-
-        if (!haveData)
-            mBtnSignature.setVisibility(View.VISIBLE);
-        else
-            mBtnSignature.setVisibility(View.GONE);
 }
 
     private void showEnty() {
         haveData = false;
         noWageLl.setVisibility(View.VISIBLE);
+        mBtnSignature.setVisibility(View.GONE);
+        Log.i("getEmSalary","showEnty");
     }
 
     private void initView() {
-        //        emcode = MyApplication.getInstance().getLoginUserId();
-        emcode = "U0747";
+                emcode = CommonUtil.getEmcode();
+//        emcode = "U0747";
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
         getSupportActionBar().setTitle("工资查询");
 
@@ -168,7 +199,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         wageDateTv = (TextView) findViewById(R.id.wage_date_tv);
         wageDateTv.setOnClickListener(this);
         noWageLl = (LinearLayout) findViewById(R.id.wage_nodata_ll);
-
+        announcement_tv = (TextView) findViewById(R.id.announcement);
+        error_ll = (LinearLayout) findViewById(R.id.error_ll);
+        error_tv = (TextView) findViewById(R.id.error_tv);
 
 //        findViewById(R.id.h_sign_tv).setOnClickListener(this);
         Intent hh =  getIntent();
@@ -198,7 +231,12 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.btn_signature){
-            showSiganWindow();
+            if (haveData && needSignature == 1)
+                showSiganWindow();
+            else if (haveData && needSignature == 0)
+                doNewSubmit(null,null);
+            else
+                ToastMessage("暂无工资条数据");
         }else if (v.getId() == R.id.clear_im){
             pathView.clear();
         }else if (v.getId() == R.id.cancel_tv){
@@ -259,6 +297,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void searchWage() {
+        if (!ListUtils.isEmpty(kvModeList)) {
+            kvModeList.clear();
+            myAdapter.notifyDataSetChanged();
+        }
         //        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
@@ -295,7 +337,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 .add("sl_id",sl_id)
                 .add("emcode",emcode)
                 .add("msg",msg_et.getText().toString())
-                .add("result",true)
+                .add("result","0")
                 .add("master", master)
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
@@ -314,7 +356,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
     private void doNewSubmit(Bitmap pathBm, String plainpath) {
         String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
-        byte[] ppp = getBitmapByte(pathBm);
         RequestParams params = new RequestParams();
         params.addBodyParameter("emcode", emcode);
         params.addBodyParameter("sl_id",sl_id);
@@ -338,6 +379,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
                     mBtnSignature.setText("已收签");
+                    mBtnSignature.setEnabled(false);
                     closePopupWindow();
                 }
                 progressDialog.dismiss();
@@ -431,6 +473,16 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         DisplayUtil.backgroundAlpha(this, 1f);
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        menu.clear();
+        if (!haveData || !StringUtil.isEmpty(sl_remark) || sl_result != -1 ) {
+
+        } else {
+            getMenuInflater().inflate(R.menu.wage_error, menu);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.wage_error, menu);
@@ -476,7 +528,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             }
         });
         popupWindow.showAtLocation(getWindow().getDecorView().
-                findViewById(android.R.id.content), Gravity.BOTTOM, 0, 0);
+                findViewById(android.R.id.content), Gravity.CENTER, 0, 0);
         DisplayUtil.backgroundAlpha(this, 0.4f);
     }