Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/version.properties

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

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
@@ -11,7 +10,6 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -785,7 +783,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(R.layout.pop_crm_list, null);
-            ListView plist = (ListView) view.findViewById(R.id.mList);
+            ListView plist =  view.findViewById(R.id.mList);
             SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(),
                     R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
             plist.setAdapter(adapter);
@@ -825,8 +823,11 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                         startActivityForResult(intent, 0x20);
                 }
             });
-            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
-        }
+            popupWindow =new PopupWindow(view);
+//                    new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
+            popupWindow.setWidth(DisplayUtil.dip2px(ct,140));
+            popupWindow.setHeight(DisplayUtil.dip2px(ct,150));
+            }
         // 使其聚集
         popupWindow.setFocusable(true);
         // 设置允许在外点击消失
@@ -837,12 +838,12 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                 DisplayUtil.backgroundAlpha(OAActivity.this, 1f);
             }
         });
-        DisplayUtil.backgroundAlpha(this, 1f);
+        DisplayUtil.backgroundAlpha(this, 0.5f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
-        popupWindow.setBackgroundDrawable(new BitmapDrawable());
-        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.top_bubble));
+//        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
-        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
+        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth()-DisplayUtil.dip2px(ct,10), 0);
     }
 
     private List<Map<String, Object>> getPopData() {

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:clickable="true"
+    android:background="@drawable/select_weixin_list_item"
     android:layout_height="wrap_content">
     <TextView
         android:id="@+id/tv_item_name"
@@ -11,7 +13,6 @@
         android:textSize="14sp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/select_weixin_list_item"
         android:gravity="center"
         android:text="xxx" />
 </LinearLayout>

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

@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     app:cardElevation="@dimen/paddingMin"
-    android:background="@drawable/top_bubble"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shape_pop_ll"
-        android:orientation="vertical"
-        android:padding="0.5dp">
-
         <ListView
             android:id="@+id/mList"
-            style="@style/ListViewBasic"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:divider="@color/item_line"
-            android:dividerHeight="0.1dp"></ListView>
-    </LinearLayout>
-</android.support.v7.widget.CardView>
+            android:dividerHeight="@dimen/line"/>
+</FrameLayout>

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

@@ -63,8 +63,8 @@
                 android:textColor="@color/red" />
             <ImageView
                 android:id="@+id/voice_search_iv"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="10dp"
+                android:layout_height="16dp"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="20dp"
                 android:layout_marginTop="8dp"

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/ApprovalAdapter.java

@@ -497,7 +497,6 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     holder.valueEt.addTextChangedListener(new TextChangListener(holder, position));
             }
         } else {
-            LogUtil.i("gong","approval.getValues()="+approval.getValues());
             if (isWeb(approval.getValues())) {
                 setViewShowAble(true, holder.valueWeb);
                 setViewShowAble(false, holder.valueEt, holder.valueTv);