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

# Conflicts:
#	WeiChat/build.gradle

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

@@ -121,7 +121,7 @@ public class DbfindListActivity extends BaseActivity {
         setContentView(R.layout.act_list_dbfind_employee);
         ViewUtils.inject(this);
         ct = this;
-        getSupportActionBar().setTitle("查找");
+        getSupportActionBar().setTitle("选择同事");
         
         Intent intent=getIntent();
         int listViewMode=ListView.CHOICE_MODE_SINGLE;

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

@@ -132,7 +132,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.clear_cache_rl:
-                clearCache();
+                showclearDialog();
                 break;
             case R.id.use_help_rl: {  // 用户反馈
                 Intent intent = new Intent(mContext, FeedbackActivity.class);
@@ -195,7 +195,21 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         shareIntent.setType("image/*");
         startActivity(Intent.createChooser(shareIntent, "分享到"));
     }
+    //确认是否清空本地缓存
+    private  void showclearDialog(){
+        new AlertDialog
+                .Builder(mContext)
+                .setTitle("温馨提示")
+                .setMessage("是否确定清除本地缓存")
+                .setNegativeButton("取消",null)
+                .setPositiveButton("确认",new DialogInterface.OnClickListener(){
 
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        clearCache();
+                    }
+                }).create().show();
+    }
     private void clearCache() {
         String filePath = MyApplication.getInstance().mAppDir;
         //删除文件

WeiChat/src/main/res/drawable-hdpi/umeng_socialize_shareboard_item_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" android:state_pressed="false" android:state_window_focused="false"/>
+    <item android:drawable="@android:color/darker_gray" android:state_pressed="true" android:state_window_focused="true"/>
+    <item android:drawable="@android:color/darker_gray" android:state_focused="true"/>
+</selector>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="80dp"
+    android:layout_height="80dp"
+    android:background="@drawable/umeng_socialize_shareboard_item_background" >
+
+    <ImageView
+        android:id="@+id/umeng_socialize_shareboard_image"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="10dp"
+        android:layout_centerHorizontal="true"
+        android:scaleType="fitXY"
+        />
+	<TextView 
+	    android:layout_width="wrap_content"
+	    android:layout_height="20dp"
+	    android:id="@+id/umeng_socialize_shareboard_pltform_name"
+	    android:layout_alignParentBottom="true"
+	    android:layout_marginBottom="4dp"
+	    android:layout_centerHorizontal="true"
+	    android:layout_marginLeft="2dp"
+	    android:layout_marginRight="2dp"
+	    android:text="QQ空间"
+	    android:singleLine="true"
+	    android:textSize="11sp"
+	    android:gravity="center"/>
+</RelativeLayout>