发布版本6.1.1

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_fix

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 14 16:46:57 CST 2017
-debugName=176
-versionName=624
-debugCode=176
-versionCode=163
+#Fri Dec 15 14:19:17 CST 2017
+debugName=186
+versionName=611
+debugCode=186
+versionCode=150

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"

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

@@ -1685,6 +1685,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                              }
                              if (desklist!=null){
                                  if (deskbook.size()==0){
+                                     tv_food_rooms.setHint(R.string.common_select);
                                      ll_seats_panel.setVisibility(View.GONE);
                                      food_seats_rl.setVisibility(View.GONE);
                                  }
@@ -1730,6 +1731,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);
                              }

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

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/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/FormListSelectActivity.java

@@ -269,7 +269,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             public void onPullUpToRefresh(
                     PullToRefreshBase<ListView> refreshView) {
                 cur++;
-//				rBar.setVisibility(View.VISIBLE);
                 String where = CommonUtil.getSharedPreferences(
                         FormListSelectActivity.this, "where");
                 String condition = CommonUtil.getSharedPreferences(
@@ -301,9 +300,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     new Thread(new GetSaleData(String.valueOf(cur), "10", where))
                             .start();
                 }
-//                if (!StringUtil.isEmpty(etSearch.toString())) {
-//                    etSearch.setText("");
-//                }
             }
         });
 
@@ -334,11 +330,8 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     } else {
                         mlistview.setMode(PullToRefreshBase.Mode.BOTH);
                         initData();
-//                        adapter.getFilter().filter("");
-//                        adapter.notifyDataSetChanged();
                     }
                 }
-                //  mlistview.setAdapter(adapter);
             }
         });
 
@@ -576,12 +569,11 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         params.put("sessionId", sessionId);
         String result = null;
         try {
-            result = client.sendPostRequest(CommonUtil.getAppBaseUrl(this)
-                    + "mobile/common/list.action", params);
+            result = client.sendPostRequest(CommonUtil.getAppBaseUrl(this) + "mobile/common/list.action", params);
             LogUtil.prinlnLongMsg("flsparams,flsresult", JSON.toJSONString(params) + ":" + result);
             if (result != null && rMap != null) {
-                //这里报销单相同参数第一次请求正常，下啦刷新报错不知道原因，只能这么处理
                 if (result.contains("exceptionInfo")) {
+                    //这里报销单相同参数第一次请求正常，下啦刷新报错不知道原因，只能这么处理
                     handler.sendEmptyMessage(1);
                     mlistview.onRefreshComplete();
                     return;
@@ -616,10 +608,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         }
 
     }
-
-    /**
-     * @注释：适配器
-     */
+    
     public class SaleAdapter extends BaseAdapter implements Filterable {
 
         private Context ct;
@@ -632,7 +621,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             this.inflater = LayoutInflater.from(ct);
             this.data = data;
             this.dMap = data;
-//            Log.d("SaleAdapter:", data.toString());
         }
 
         @Override
@@ -679,10 +667,8 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             dmap = (Map<String, Object>) dList.get(position);
 
             if (convertView == null) {
-                convertView = inflater.inflate(R.layout.act_sale_find_item,
-                        null);
-                LinearLayout ly = (LinearLayout) convertView
-                        .findViewById(R.id.ly_sale_view);
+                convertView = inflater.inflate(R.layout.act_sale_find_item, null);
+                LinearLayout ly = (LinearLayout) convertView.findViewById(R.id.ly_sale_view);
                 int showIndex = 0;
 
                 if (!data.isEmpty()) {
@@ -863,22 +849,18 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 protected void publishResults(CharSequence constraint,
                                               FilterResults results) {
                     data = (Map<String, Object>) results.values;
-                    LogUtil.d("遍历过后的数据：" + JSON.toJSONString(data));
                     rMap = data;//传递数据源
-                    if (adapter.getCount() == 0) {
-                        mEmptyLayout.showEmpty();
-                    }
+                    LogUtil.d("遍历过后的数据：" + JSON.toJSONString(data));
                     if (!StringUtil.isEmpty(constraint.toString())) {
                         //这里为什么这样做，主要是由于item是动态创建的，查询的数据的item高度大于其它item高度时，
                         //会发生错位问题，重新设置adaper就没有问题
-                        // Lg.d("listview 重置适配器");
-                        mlistview.setAdapter(adapter);
+                         mlistview.setAdapter(adapter);
                     } else {
                         adapter.notifyDataSetInvalidated();
-                        LogUtil.d("本地查询刷新。。。");
-                        //mlistview.getRefreshableView().setSelection(0);
                     }
-
+                    if (adapter.getCount() == 0) {
+                        mEmptyLayout.showEmpty();
+                    }
                 }
 
             };