Browse Source

修改朋友数据库

Bitliker 9 years ago
parent
commit
4b19bc2902
37 changed files with 130 additions and 114 deletions
  1. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/Friend.java
  2. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java
  3. 0 25
      WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/FriendHelper.java
  4. 3 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  5. 15 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java
  6. 17 20
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/AddTaskActivity.java
  7. 16 8
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java
  8. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/MyFriendActivity.java
  9. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java
  10. 0 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java
  11. 6 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java
  12. 9 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java
  13. BIN
      WeiChat/src/main/res/drawable-hdpi/add_friend.png
  14. BIN
      WeiChat/src/main/res/drawable-hdpi/add_task.png
  15. BIN
      WeiChat/src/main/res/drawable-hdpi/em_add_friend.png
  16. BIN
      WeiChat/src/main/res/drawable-hdpi/email.png
  17. BIN
      WeiChat/src/main/res/drawable-hdpi/guanzhu.png
  18. BIN
      WeiChat/src/main/res/drawable-hdpi/info_phone.png
  19. BIN
      WeiChat/src/main/res/drawable-hdpi/set_fans_u.png
  20. BIN
      WeiChat/src/main/res/drawable-xhdpi/add_friend.png
  21. BIN
      WeiChat/src/main/res/drawable-xhdpi/add_task.png
  22. BIN
      WeiChat/src/main/res/drawable-xhdpi/em_add_friend.png
  23. BIN
      WeiChat/src/main/res/drawable-xhdpi/email.png
  24. BIN
      WeiChat/src/main/res/drawable-xhdpi/guanzhu.png
  25. BIN
      WeiChat/src/main/res/drawable-xhdpi/info_phone.png
  26. BIN
      WeiChat/src/main/res/drawable-xhdpi/set_fans_u.png
  27. BIN
      WeiChat/src/main/res/drawable-xxhdpi/add_friend.png
  28. BIN
      WeiChat/src/main/res/drawable-xxhdpi/add_task.png
  29. BIN
      WeiChat/src/main/res/drawable-xxhdpi/em_add_friend.png
  30. BIN
      WeiChat/src/main/res/drawable-xxhdpi/email.png
  31. BIN
      WeiChat/src/main/res/drawable-xxhdpi/guanzhu.png
  32. BIN
      WeiChat/src/main/res/drawable-xxhdpi/info_phone.png
  33. BIN
      WeiChat/src/main/res/drawable-xxhdpi/set_fans_u.png
  34. 16 14
      WeiChat/src/main/res/layout/act_staff_query_list.xml
  35. 7 13
      WeiChat/src/main/res/layout/act_task_add.xml
  36. 14 12
      WeiChat/src/main/res/layout/activity_basic_info.xml
  37. 23 15
      WeiChat/src/main/res/layout/item_staff_tree.xml

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/Friend.java

@@ -92,7 +92,7 @@ public class Friend implements Serializable {
     private int status;// -1:黑名单;0:陌生人;1:单方关注;2:互为好友;8:系统号;9:非显示系统号
 
     @DatabaseField
-    private String privacy;// 隐私(现用于记录是否特别关注)
+    private String privacy;// 隐私(现用于记录邮箱)
 
     @DatabaseField
     private String remarkName;// 备注

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -955,6 +955,7 @@ public class FriendDao {
         friend.setDepart(entity.getEM_DEPART());
         friend.setPosition(entity.getEM_POSITION());
         friend.setEmCode(entity.getEM_CODE());
+        friend.setPrivacy(entity.getEM_EMAIL());
         friend.setCompanyId(0);
         friend.setRoomFlag(0);// 0朋友 1群组
         friend.setStatus(Friend.STATUS_UNKNOW);

+ 0 - 25
WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/FriendHelper.java

@@ -129,31 +129,6 @@ public class FriendHelper {
         }
     }
 
-    /**
-     * 添加特别关注
-     */
-    public static void removeGoodFriend(Friend friend) {
-        friend.setPrivacy("true");
-        FriendDao.getInstance().createOrUpdateFriend(friend);
-    }
-
-
-    /**
-     * 添加特别关注
-     */
-    public static boolean addPeculiarFriend(Friend friend) {
-        friend.setPrivacy("true");
-        return FriendDao.getInstance().createOrUpdateFriend(friend);
-    }
-
-    /**
-     * 移除特别关注
-     */
-    public static void removePeculiarFriend(Friend friend) {
-        friend.setPrivacy("false");
-        FriendDao.getInstance().createOrUpdateFriend(friend);
-    }
-
     /**
      * 在本地数据库表中出入一条关注记录,额外需要做的操作
      */

+ 3 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -216,6 +216,9 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             else if (checkedId == R.id.main_tab_five) {
                 if (mMeFragment == null) {
                     mMeFragment = new MeFragment();
+                    if (isUnReadWork){
+                        mMeFragment.setChangerRemain(false);
+                    }
                 }
                 changeFragment(mMeFragment, TAG_ME);//我
                 getSupportActionBar().setTitle(R.string.me);

+ 15 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -134,7 +134,6 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         ViewUtils.inject(this);
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
         initView();
-
         if (userId.equals("0")) {            //当imid不存在时候
             isMyInfo = false;
             loadOthersInfoFromDB();
@@ -422,6 +421,21 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                 loadOthersInfoFromNet();
             }
         });
+        if (getIntent() != null) {
+            Friend friend = (Friend) getIntent().getSerializableExtra("friend");
+            if (friend == null) {
+                Log.i("gongpengming", "为空的");
+                return;
+            }
+            String depart = friend.getDepart();
+            String position = friend.getPosition();
+            email_tv.setText(StringUtils.isEmpty(friend.getPrivacy()) ? "" : friend.getPrivacy());
+            if (!StringUtils.isEmpty(depart) && !StringUtils.isEmpty(position)) {
+                sub_tv.setText(depart + " > " + position);
+            } else {
+                sub_tv.setText(StringUtils.isEmpty(depart) ? "" : depart + (StringUtils.isEmpty(position) ? "" : position));
+            }
+        }
     }
 
     public void phoneAction(final String phone) {
@@ -638,7 +652,6 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
     }
 
-
     /**
      * 取消关注
      *

+ 17 - 20
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/AddTaskActivity.java

@@ -210,7 +210,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
                     saveTask(id);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    ViewUtil.ToastMessage(ct,msg.getData().getString("result"));
+                    ViewUtil.ToastMessage(ct, msg.getData().getString("result"));
                     break;
                 default:
                     break;
@@ -231,8 +231,8 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
     }
 
     /* (non-Javadoc)
-         * @see com.erp.base.BaseAcivity#initView()
-         */
+     * @see com.erp.base.BaseAcivity#initView()
+     */
     public void initView() {
         setContentView(R.layout.act_task_add);
         ViewUtils.inject(this);
@@ -268,7 +268,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
             @Override
             public void onDatePicked(String date) {
 //                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
-                et_task_startime.setText(date+":00:00");
+                et_task_startime.setText(date + ":00:00");
                 dialog.dismiss();
             }
         });
@@ -276,7 +276,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
             @Override
             public void onDatePicked(String date) {
 //                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
-                et_task_startime.setText(date+":00:00");
+                et_task_startime.setText(date + ":00:00");
                 dialog.dismiss();
             }
         });
@@ -304,7 +304,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
                 break;
             case R.id.bt_task_add:
                 if (!StringUtils.isEmpty(et_task_startime.getText().toString())
-                        && et_task_people.getTags().length>0
+                        && et_task_people.getTags().length > 0
                         && !StringUtils.isEmpty(et_task_remark.getText().toString())) {
                     boolean falg = ViewUtil.isCheckDateTime(
                             CommonUtil.getStringDate(System.currentTimeMillis()),
@@ -486,15 +486,13 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
         int type = cb_task_reply.isChecked() == true ? 1 : 0;
         String name = "来自" + CommonUtil.getSharedPreferences(ct, "erp_username") + "的任务";
         String formStore;
-        String[] people= et_task_people.getTags();
-        String resourcename="";
-        for (int i=0;i<people.length;i++)
-        {
-            if (i==people.length-1){
-                resourcename=resourcename+people[i].trim();
-            }
-            else{
-                resourcename=resourcename+people[i].trim()+",";
+        String[] people = et_task_people.getTags();
+        String resourcename = "";
+        for (int i = 0; i < people.length; i++) {
+            if (i == people.length - 1) {
+                resourcename = resourcename + people[i].trim();
+            } else {
+                resourcename = resourcename + people[i].trim() + ",";
             }
         }
 
@@ -503,7 +501,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
             formStore = "{'name':'" + name + "'"
                     + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
                     + "'enddate':'" + et_task_startime.getText().toString() + "',"
-                    + "'type':'" + type + "','resourcename':'" +resourcename + "',"
+                    + "'type':'" + type + "','resourcename':'" + resourcename + "',"
                     + "'description':'" + et_task_remark.getText().toString() + "'"
                     + "}";
         } else {
@@ -511,7 +509,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
             formStore = "{'name':'" + name + "'"
                     + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
                     + "'enddate':'" + et_task_startime.getText().toString() + "',"
-                    + "'type':'" + type + "','resourcename':'" +resourcename + "',"
+                    + "'type':'" + type + "','resourcename':'" + resourcename + "',"
                     + "'description':'" + et_task_remark.getText().toString() + "',"
                     + "'attachs':'" + id + "'"
                     + "}";
@@ -762,7 +760,6 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
     }
 
 
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -776,8 +773,8 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
                 }
                 if (resultCode == 1) {
                     String values = data.getStringExtra("employees");
-                    Log.i("fromStore",values);
-                    String[] tag_values=values.split(",");
+                    Log.i("fromStore", values);
+                    String[] tag_values = values.split(",");
                     et_task_people.setTags(tag_values);
                 }
                 break;

+ 16 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java

@@ -84,7 +84,7 @@ public class CompanyContactsActivity extends BaseActivity {
     private LayoutInflater mInflater;
     private Activity activity;
     @ViewInject(R.id.ll_list)
-    private LinearLayout ll_list ;
+    private LinearLayout ll_list;
     @ViewInject(R.id.hv_head_view)
     private HorizontalScrollView hscrollview;
     @ViewInject(R.id.rg_nav_content)
@@ -469,7 +469,6 @@ public class CompanyContactsActivity extends BaseActivity {
 
         /** @注释:右边列表的点击事件 */
         mlistleft.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 final DetailItemAdapter.ModelItem item = (DetailItemAdapter.ModelItem) view.getTag();
@@ -643,14 +642,14 @@ public class CompanyContactsActivity extends BaseActivity {
             rg_nav_content.addView(rb);
         }
     }
-    
+
 
     /**
      * @author Administrator
      * @功能:加载通讯录数据
      */
     public void LoadServerData(String master, String lastdate) {
-        if (StringUtils.isEmpty(master)){
+        if (StringUtils.isEmpty(master)) {
             reScrollView.setRefreshing(false);
             ll_content.setVisibility(View.GONE);
             rl_empty.setVisibility(View.VISIBLE);
@@ -755,7 +754,7 @@ public class CompanyContactsActivity extends BaseActivity {
                 EmployeesEntity eEntity = employeesEntities.get(i);
                 String em_code = eEntity.getEM_CODE();
                 String whichsys = eEntity.getWHICHSYS();
-                if (StringUtils.isEmpty(em_code))return;
+                if (StringUtils.isEmpty(em_code)) return;
                 if ("UPDATE".equals(eEntity.getFLAG())) {
                     List<EmployeesEntity> tempEntity = manager.select_getEmployee(new String[]{em_code, whichsys}, "em_code=? and whichsys=?");
                     if (tempEntity.isEmpty()) {
@@ -857,6 +856,8 @@ public class CompanyContactsActivity extends BaseActivity {
                 item.tv_name = (TextView) convertView.findViewById(R.id.tv_name);
                 item.tv_type = (TextView) convertView.findViewById(R.id.tv_name_type);
                 item.iv_enter = (ImageView) convertView.findViewById(R.id.iv_item_into);
+                item.add_friend = (ImageView) convertView.findViewById(R.id.add_friend);
+                item.phone = (ImageView) convertView.findViewById(R.id.phone);
                 convertView.setTag(item);
             } else {
                 item = (ModelItem) convertView.getTag();
@@ -869,27 +870,32 @@ public class CompanyContactsActivity extends BaseActivity {
                     item.isleaf = lists.get(position).getOr_isleaf();
                     item.tv_type.setText("部门");
                     item.tv_type.setVisibility(View.INVISIBLE);
+                    item.add_friend.setVisibility(View.GONE);
+                    item.phone.setVisibility(View.GONE);
                 } else {
                     item.tv_name.setText(employees.get(position - lists.size()).em_name);
                     item.or_id = employees.get(position - lists.size()).getEm_id();
                     item.isleaf = 1;
                     item.imid = employees.get(position - lists.size()).getEm_imid();
-                    // item.iv_enter.setVisibility(View.GONE);
                     item.tv_type.setText("联系人");
                     item.tv_type.setVisibility(View.INVISIBLE);
+                    item.add_friend.setVisibility(View.VISIBLE);
+                    item.phone.setVisibility(View.VISIBLE);
                 }
-
             } else if (lists != null) {
                 item.tv_name.setText(lists.get(position).getOr_name());
                 item.or_id = lists.get(position).getOr_id();
                 item.isleaf = lists.get(position).getOr_isleaf();
                 item.tv_type.setText("部门");
                 item.tv_type.setVisibility(View.INVISIBLE);
+                item.add_friend.setVisibility(View.GONE);
+                item.phone.setVisibility(View.GONE);
             } else if (employees != null) {
+                item.add_friend.setVisibility(View.VISIBLE);
+                item.phone.setVisibility(View.VISIBLE);
                 item.tv_name.setText(employees.get(position).em_name);
                 item.or_id = employees.get(position).getEm_id();
                 item.isleaf = 1;
-                // item.tv_name.setTextColor(ct.getResources().getColor(R.color.gray));
                 item.tv_type.setText("联系人");
                 item.imid = employees.get(position).getEm_imid();
                 item.tv_type.setVisibility(View.INVISIBLE);
@@ -917,6 +923,8 @@ public class CompanyContactsActivity extends BaseActivity {
             public ImageView iv_falg;
             public TextView tv_name;
             public ImageView iv_enter;
+            public ImageView add_friend;
+            public ImageView phone;
         }
     }
 }

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/MyFriendActivity.java

@@ -231,6 +231,7 @@ public class MyFriendActivity extends BaseActivity {
                 } else {
                     intent = new Intent(MyFriendActivity.this, BasicInfoActivity.class);
                     intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
+                    intent.putExtra("friend", friend);
                 }
                 startActivity(intent);
             }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java

@@ -62,7 +62,6 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
@@ -442,6 +441,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
             intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getPhone());
             intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
             intent.putExtra(AppConstant.EXTRA_NICK_NAME, friend.getNickName());
+            intent.putExtra("friend", friend);
         }
         startActivity(intent);
     }

+ 0 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -623,6 +623,4 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, what, null, null, "get");
     }
-
-
 }

+ 6 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -610,6 +610,12 @@ public class ViewUtil {
                     if (!params.containsKey("sessionId")) {
                         params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
                     }
+                    if (!params.containsKey("master")) {
+                        params.put("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+
+                    }
+                    if (!params.containsKey("sessionUser"))
+                        params.put("sessionUser", CommonUtil.getSharedPreferences(ct, "erp_username"));
                     if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_username"))
                             && headers != null) {
                         headers.put("sessionUser", CommonUtil.getSharedPreferences(ct, "erp_username"));

+ 9 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java

@@ -8,6 +8,7 @@ import android.util.Log;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
+import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
@@ -110,7 +111,14 @@ public class ViewUtil {
                     if (!params.containsKey("sessionId")) {
                         params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
                     }
-                    Log.i("result:", "url=" + url);
+                    if (!params.containsKey("master")) {
+                        params.put("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+
+                    }
+                    if (!params.containsKey("sessionUser"))
+                        params.put("sessionUser", CommonUtil.getSharedPreferences(ct, "erp_username"));
+                    if (AppConfig.DEBUG)
+                        Log.i("result:", "url=" + url);
                     HttpUtil.Response result = httpSendTask(url, params, headers, request);
                     if (result != null) {
                         prinltResponseInfo(result, url, params);

BIN
WeiChat/src/main/res/drawable-hdpi/add_friend.png


BIN
WeiChat/src/main/res/drawable-hdpi/add_task.png


BIN
WeiChat/src/main/res/drawable-hdpi/em_add_friend.png


BIN
WeiChat/src/main/res/drawable-hdpi/email.png


BIN
WeiChat/src/main/res/drawable-hdpi/guanzhu.png


BIN
WeiChat/src/main/res/drawable-hdpi/info_phone.png


BIN
WeiChat/src/main/res/drawable-hdpi/set_fans_u.png


BIN
WeiChat/src/main/res/drawable-xhdpi/add_friend.png


BIN
WeiChat/src/main/res/drawable-xhdpi/add_task.png


BIN
WeiChat/src/main/res/drawable-xhdpi/em_add_friend.png


BIN
WeiChat/src/main/res/drawable-xhdpi/email.png


BIN
WeiChat/src/main/res/drawable-xhdpi/guanzhu.png


BIN
WeiChat/src/main/res/drawable-xhdpi/info_phone.png


BIN
WeiChat/src/main/res/drawable-xhdpi/set_fans_u.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/add_friend.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/add_task.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/em_add_friend.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/email.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/guanzhu.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/info_phone.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/set_fans_u.png


+ 16 - 14
WeiChat/src/main/res/layout/act_staff_query_list.xml

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:ptr="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/refresh_top"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        ptr:ptrAnimationStyle="flip">
+<com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ptr="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/refresh_top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    ptr:ptrAnimationStyle="flip">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
+
         <include layout="@layout/erp_empty_view" />
+
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <HorizontalScrollView
                 android:id="@+id/hv_head_view"
@@ -37,7 +39,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="40dip"
                         android:background="#F2F2F2"
-                        android:orientation="horizontal"/>
+                        android:orientation="horizontal" />
                 </RelativeLayout>
             </HorizontalScrollView>
 
@@ -61,7 +63,7 @@
                     android:background="@color/white"
                     android:clipToPadding="false"
                     android:fadingEdge="none"
-                    android:scrollbars="none"/>
+                    android:scrollbars="none" />
 
                 <View
                     android:layout_width="1dp"
@@ -73,10 +75,10 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="5"
-                    android:scrollbars="none"/>
+                    android:scrollbars="none" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 
 
-    </com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout>
+</com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout>

+ 7 - 13
WeiChat/src/main/res/layout/act_task_add.xml

@@ -8,19 +8,13 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <LinearLayout
-            style="@style/form_relative_customer"
-            android:orientation="vertical">
-
-            <EditText
-                android:id="@+id/et_task_remark"
-                style="@style/form_relative_right_text"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginLeft="10dp"
-                android:hint="输入任务描述" />
-
-        </LinearLayout>
+        <EditText
+            android:id="@+id/et_task_remark"
+            style="@style/form_relative_right_text"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_marginLeft="10dp"
+            android:hint="输入任务描述" />
 
         <View
             android:layout_width="match_parent"

+ 14 - 12
WeiChat/src/main/res/layout/activity_basic_info.xml

@@ -18,24 +18,25 @@
             <TextView
                 android:id="@+id/do_next_tv"
                 android:layout_width="0dp"
-                android:drawablePadding="10dp"
-                android:drawableTop="@drawable/phone"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawablePadding="10dp"
+                android:drawableTop="@drawable/add_friend"
                 android:gravity="center"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_main"
-                android:layout_weight="1" />
+                android:textSize="@dimen/text_main" />
 
             <TextView
                 android:id="@+id/push_task_tv"
                 android:layout_width="0dp"
-                android:drawablePadding="10dp"
-                android:drawableTop="@drawable/phone"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawablePadding="10dp"
+                android:drawableTop="@drawable/add_task"
                 android:gravity="center"
+                android:text="发任务"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_main"
-                android:layout_weight="1" />
+                android:textSize="@dimen/text_main" />
         </LinearLayout>
 
 
@@ -59,13 +60,16 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center">
+
                     <ImageView
                         android:id="@+id/avatar_img"
                         android:layout_width="80dp"
+                        android:layout_centerHorizontal="true"
                         android:layout_height="80dp"
                         android:background="@drawable/account_avatar_bg"
                         android:contentDescription="@string/app_name"
                         android:src="@drawable/avatar_normal" />
+
                     <TextView
                         android:id="@+id/name_tv"
                         android:layout_width="wrap_content"
@@ -87,8 +91,6 @@
                         android:textSize="@dimen/text_main" />
 
 
-
-
                 </RelativeLayout>
             </FrameLayout>
 
@@ -128,7 +130,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_alignTop="@id/phone_tag"
-                    android:src="@drawable/phone" />
+                    android:src="@drawable/info_phone" />
             </RelativeLayout>
 
             <View
@@ -168,7 +170,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_alignTop="@id/email_tag"
-                    android:src="@drawable/phone" />
+                    android:src="@drawable/email" />
             </RelativeLayout>
 
             <View

+ 23 - 15
WeiChat/src/main/res/layout/item_staff_tree.xml

@@ -39,23 +39,10 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_marginLeft="10dp"
+            android:visibility="gone"
             android:textSize="13sp" />
     </RelativeLayout>
-    <!-- <ImageView
-        android:id="@+id/iv_item_phone"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_marginLeft="10dp"
-        android:visibility="gone"
-        android:background="@drawable/home_image_08" />-->
-    <!--<ImageView
-      android:id="@+id/iv_item_email"
-      android:layout_toLeftOf="@+id/iv_item_phone"
-      android:layout_width="50dp"
-      android:layout_height="50dp"
-      android:layout_marginLeft="10dp"
-      android:visibility="gone"
-      android:background="@drawable/home_image_08" />-->
+
     <ImageView
         android:id="@+id/iv_item_into"
         android:layout_width="35dp"
@@ -64,4 +51,25 @@
         android:layout_centerVertical="true"
         android:padding="3dp"
         android:src="@drawable/iconfont_jinru" />
+
+    <ImageView
+        android:id="@+id/add_friend"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/iv_item_into"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@id/iv_item_into"
+        android:padding="5dp"
+        android:src="@drawable/em_add_friend" />
+
+    <ImageView
+        android:id="@+id/phone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/iv_item_into"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@id/add_friend"
+        android:padding="5dp"
+        android:src="@drawable/info_phone" />
+
 </RelativeLayout>