合并代码

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -118,7 +118,7 @@ public class CompanyContactsActivity extends BaseActivity {
     private final int LOAD_SUCCESS_EMPLOYEE = 4;
     private final int LOAD_SUCCESS_EMPLOYEEINFO = 3;
     private Handler mHandler = new Handler() {
-        public void handleMessage( Message msg) {
+        public void handleMessage(Message msg) {
             HrorgsEntity hEntity;
             switch (msg.what) {
                 case UPDATE_CHANGE_MASTER:
@@ -144,6 +144,7 @@ public class CompanyContactsActivity extends BaseActivity {
                     List<HrorgsEntity> hrorgsEntities = JSON.parseArray(jsonobject.getString("hrorgs"), HrorgsEntity.class);
                     List<EmployeesEntity> employeesEntities = JSON.parseArray(jsonobject.getString("employees"), EmployeesEntity.class);
                     master = CommonUtil.getSharedPreferences(ct, "erp_master");
+                    if (manager == null || !manager.getDb().isOpen()) return;
                     HrorgsEntity hrEntity = manager.select_getRootData(new String[]{master}, "whichsys=?");
                     boolean isFristLoad = true;//是否第一次加载
                     if (hrEntity != null) {

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

@@ -2,12 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
     android:orientation="vertical">
 
     <RelativeLayout
-        android:background="@drawable/bg_bar"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="48dp"
+        android:background="@drawable/bg_bar"
         android:orientation="horizontal"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
@@ -16,16 +18,15 @@
 
         <com.xzjmyk.pm.activity.view.ClearEditText
             android:id="@+id/edt_search"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_centerHorizontal="true"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
             android:hint="@string/search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
-            android:textSize="15sp" />
+            android:textSize="15sp"/>
 
     </RelativeLayout>
     <com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout