修改朋友数据库

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -769,8 +769,6 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
                             ((MainActivity) mContext).getBusinessCircleFragment().showCommentEnterView(messagePosition,
                                     comment.getUserId(), comment.getNickName(), toShowName);
                         }
-                        // show(messagePosition, comment.getUserId(),
-                        // comment.getNickName(),toShowName);
                     }
                 }
             });

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

@@ -115,13 +115,16 @@ public class Friend implements Serializable {
     @DatabaseField
     private int roomTalkTime;// wi在这个房间的禁言时间
 
-
+    @DatabaseField
     private String emCode;
 
+    @DatabaseField
     private String phone;//手机号码
 
+    @DatabaseField
     private String depart;//部门
 
+    @DatabaseField
     private String position;//职位
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -26,13 +26,21 @@ import com.xzjmyk.pm.activity.bean.message.XmppMessage;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.db.SQLiteRawUtil;
 import com.xzjmyk.pm.activity.sp.TableVersionSp;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.xmpp.listener.ChatMessageListener;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import static com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.ct;
+
 /**
  * 访问朋友数据的Dao
  */
@@ -69,9 +77,6 @@ public class FriendDao {
         OpenHelperManager.releaseHelper();
     }
 
-    public void checkSystemFriend(String ownerId) {
-
-    }
 
     /**
      * 检测4个系统号是否存在
@@ -648,7 +653,7 @@ public class FriendDao {
         }
 
 		/*
-		 * else if (type == XmppMessage.MSG_TYPE_DELSEE) {// 取消关注 if (!message.isMySend()) content = "有人取消关注了你"; } else if (type == XmppMessage.MSG_TYPE_DELALL) {// 新朋友提示 if
+         * else if (type == XmppMessage.MSG_TYPE_DELSEE) {// 取消关注 if (!message.isMySend()) content = "有人取消关注了你"; } else if (type == XmppMessage.MSG_TYPE_DELALL) {// 新朋友提示 if
 		 * (!message.isMySend()) content = "有人彻底删除了你"; }else if (type == XmppMessage.MSG_TYPE_BLACK) {// 被人拉黑 if (!message.isMySend()) { content =
 		 * context.getString(R.string.be_add_blacklist); } }
 		 */
@@ -898,6 +903,13 @@ public class FriendDao {
         }
     }
 
+
+    private Friend getFriendByUserId(String userId) {
+
+return null;
+    }
+
+
     /**
      * 用户数据更新，下载关注的用户（包括好友和关注）时候调用
      */
@@ -906,7 +918,14 @@ public class FriendDao {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                checkSystemFriend(loginUserId);
+                DBManager manager = new DBManager(MyApplication.getInstance());
+                String master = CommonUtil.getSharedPreferences(ct, "erp_master");
+                List<EmployeesEntity> emList = null;
+                if (!StringUtils.isEmpty(master)) {
+                    emList = manager.select_getEmployee(new String[]{master}, "whichsys=?");
+                } else {
+                    emList = new ArrayList<>();
+                }
                 int tableVersion = TableVersionSp.getInstance(MyApplication.getInstance()).getFriendTableVersion(loginUserId);
                 int newVersion = tableVersion + 1;
                 if (attentionUsers != null && attentionUsers.size() > 0) {
@@ -927,6 +946,19 @@ public class FriendDao {
                         if (friend == null) {
                             friend = new Friend();
                         }
+                        if (!ListUtils.isEmpty(emList)) {
+                            for (EmployeesEntity e : emList) {
+                                if (userId.equals(String.valueOf(e.getEm_IMID()))) {
+                                    Log.i("gongpengming", "userId=" + userId);
+                                    friend.setPhone(e.getEM_MOBILE());
+                                    friend.setDepart(e.getEM_DEPART());
+                                    friend.setPosition(e.getEM_POSITION());
+                                    friend.setEmCode(e.getEM_CODE());
+                                    Log.i("gongpengming", "emList=" + emList.size());
+                                    break;
+                                }
+                            }
+                        }
                         friend.setTimeCreate(attentionUser.getCreateTime());
                         friend.setOwnerId(attentionUser.getUserId());
                         friend.setUserId(attentionUser.getToUserId());
@@ -1101,7 +1133,6 @@ public class FriendDao {
                 }
             }
         }
-
         ).start();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -499,7 +499,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         new Thread(new Runnable() {
             @Override
             public void run() {
-                FriendDao.getInstance().checkSystemFriend(userId);
                 initMsgUnReadTips(userId);
             }
         }).start();
@@ -563,7 +562,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         saveOfflineTime();
         MyApplication.getInstance().unregisterNetWorkObserver(this);
         ListenerManager.getInstance().removeAuthStateChangeListener(this);
-        if (true) {
+        if (mBind) {
             unbindService(mXmppServiceConnection);
         }
         unregisterReceiver(mUpdateUnReadReceiver);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -63,7 +63,7 @@ import java.util.Map;
  * @SVN版本号: $Rev$
  * @修改人: $Author$
  * @修改时间: $Date$
- * @修改的内容: TODO
+ * @修改的内容:
  */
 public class DataDownloadActivity extends BaseActivity {
 
@@ -89,14 +89,20 @@ public class DataDownloadActivity extends BaseActivity {
             switch (msg.what) {
                 case LOAD_COMPANY_DATA:
                     Log.i("newdata", "handleMessage:" + msg.getData().getString("result"));
-                    company_download_status = STATUS_SUCCESS;
-                    endDownload();
                     writeData(msg);//写入缓存
+                    company_download_status = STATUS_SUCCESS;
+                    if (address_user_download_status != STATUS_SUCCESS) {// 没有成功，就下载
+                        address_user_download_status = STATUS_NO_RESULT;// 初始化下载状态
+                        downloadAddressBook();
+                    }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Log.i("newdata", "handleMessage:" + msg.getData().getString("result"));
                     company_download_status = STATUS_FAILED;
-                    endDownload();
+                    if (address_user_download_status != STATUS_SUCCESS) {// 没有成功，就下载
+                        address_user_download_status = STATUS_NO_RESULT;// 初始化下载状态
+                        downloadAddressBook();
+                    }
                     break;
             }
         }
@@ -110,10 +116,8 @@ public class DataDownloadActivity extends BaseActivity {
         //实体类
         List<HrorgsEntity> hrorgsEntities = JSON.parseArray(jsonobject.getString("hrorgs"), HrorgsEntity.class);
         List<EmployeesEntity> employeesEntities = JSON.parseArray(jsonobject.getString("employees"), EmployeesEntity.class);
-
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");
         HrorgsEntity hrEntity = manager.select_getRootData(new String[]{master}, "whichsys=?");
-
         boolean isFristLoad = true;//是否第一次加载
         if (hrEntity != null) {
             isFristLoad = false;
@@ -166,12 +170,6 @@ public class DataDownloadActivity extends BaseActivity {
         if (circle_msg_download_status != STATUS_SUCCESS) {// 没有成功，就下载
             circle_msg_download_status = STATUS_NO_RESULT;// 初始化下载状态
             downloadCircleMessage();
-
-        }
-
-        if (address_user_download_status != STATUS_SUCCESS) {// 没有成功，就下载
-            address_user_download_status = STATUS_NO_RESULT;// 初始化下载状态
-            downloadAddressBook();
         }
 
         if (user_info_download_status != STATUS_SUCCESS) {// 没有成功，就下载
@@ -197,7 +195,6 @@ public class DataDownloadActivity extends BaseActivity {
      * @author：Arison on 2016/9/22
      */
     public void downloadCompanysContact() {
-
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");
         String commpany = CommonUtil.getSharedPreferences(ct, "erp_commpany");
         String lastdate = "";
@@ -250,7 +247,6 @@ public class DataDownloadActivity extends BaseActivity {
     private void downloadCircleMessage() {
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", MyApplication.getInstance().mAccessToken);
-
         StringJsonArrayRequest<CircleMessage> request = new StringJsonArrayRequest<CircleMessage>(
                 mConfig.DOWNLOAD_CIRCLE_MESSAGE, new ErrorListener() {
             @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -42,20 +42,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private EditText mPhoneNumberEdit;
     private EditText mPasswordEdit;
 
-
-    private Handler mhandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case Constants.LOAD_SUCCESS:
-                    String result = msg.getData().getString("result");
-                    Log.i("LoginApp", "result:" + result);
-
-                    break;
-            }
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -114,11 +100,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             ToastMessage("密码不能为空");
             return;
         }
-//        if (true) {
-//            login_manage(phoneNumber, password);//登录管理平台
-//            return;
-//        }
-
         // 加密之后的密码
         final String digestPwd = new String(Md5Util.toMD5(password));
         final String requestTag = "login";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -20,21 +20,20 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.AddAttentionResult;
-import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.AttentionUser;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.User;
@@ -52,10 +51,8 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
@@ -72,18 +69,32 @@ import java.util.regex.Pattern;
  * 聊天点头像查看个人基本资料
  *
  * @author Dean Tao
+ * @update gongpengming 2016/10/19
  */
 public class BasicInfoActivity extends BaseActivity implements NewFriendListener {
-    private ImageView mAvatarImg;
-    private RelativeLayout tel_rl;
-    private TextView mNameTv;
-    private TextView mSexTv;
-    private TextView mBirthdayTv;
-    private TextView mCityTv;
-    private TextView tel_text;
-    private Button mNextStepBtn;
-    private Button mLookLocationBtn;
+    @ViewInject(R.id.max_img)
+    private ImageView max_img;
+    @ViewInject(R.id.avatar_img)
+    private ImageView avatar_img;
+    @ViewInject(R.id.phone_img)
+    private ImageView phone_img;
+    @ViewInject(R.id.email_img)
+    private ImageView email_img;
+    @ViewInject(R.id.name_tv)
+    private TextView name_tv;
+    @ViewInject(R.id.sub_tv)
+    private TextView sub_tv;
+    @ViewInject(R.id.phone_tv)
+    private TextView phone_tv;
+    @ViewInject(R.id.email_tv)
+    private TextView email_tv;
+    @ViewInject(R.id.do_next_tv)
+    private TextView do_next_tv;
+    @ViewInject(R.id.push_task_tv)
+    private TextView push_task_tv;
+    @ViewInject(R.id.data_load_view)
     private DataLoadView mDataLoadView;
+
     private User mUser;
     private Friend mFriend;// 如果这个用户是当前登陆者的好友或者关注着，那么该值有意义
     private ProgressDialog mProgressDialog;
@@ -119,6 +130,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         }
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         setContentView(R.layout.activity_basic_info);
+        getSupportActionBar().setTitle(R.string.basic_info);
+        ViewUtils.inject(this);
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
         initView();
 
@@ -240,12 +253,12 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         if (getIntent() != null) {
             code = getIntent().getStringExtra(AppConstant.EXTRA_NICK_CODE);
         }
-        mNameTv.setText(userName);
-        tel_text.setText(code);
-        mNextStepBtn.setText("该用户暂未开通app");
-        mNextStepBtn.setClickable(false);
-        mNextStepBtn.setPressed(true);
-        mLookLocationBtn.setVisibility(View.GONE);
+        name_tv.setText(userName);
+        phone_tv.setText(code);
+        do_next_tv.setText("该用户暂未开通app");
+        do_next_tv.setClickable(false);
+        do_next_tv.setPressed(true);
+        push_task_tv.setVisibility(View.GONE);
     }
 
     private void loadOthersInfoFromNet() {
@@ -300,87 +313,71 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         }
 
         // 设置头像
-        AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), mAvatarImg, false);
+        AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), max_img, false);
+        AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), avatar_img, false);
         // 判断是否有备注名,有就显示
         if (mFriend != null) {
             if (StringUtils.isEmpty(userName)) {
                 if (mFriend.getRemarkName() != null) {
-                    mNameTv.setText(mFriend.getRemarkName());
+                    name_tv.setText(mFriend.getRemarkName());
                 } else {
-                    mNameTv.setText(mUser.getNickName());
+                    name_tv.setText(mUser.getNickName());
 
                 }
             } else {
-                mNameTv.setText(userName);
+                name_tv.setText(userName);
             }
             mFriend.setRemarkName(userName);
         } else {
             Log.i("LoginInfo", "设置当前用户的名字");
             //mNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
             if (StringUtils.isEmpty(userName)) {
-                mNameTv.setText(mUser.getNickName());//陌生人也显示正确名字
+                name_tv.setText(mUser.getNickName());//陌生人也显示正确名字
             } else {
-                mNameTv.setText(userName);
+                name_tv.setText(userName);
             }
         }
 
-        mSexTv.setText(mUser.getSex() == 0 ? R.string.sex_woman : R.string.sex_man);
-        if (mUser.getSex() == -1) mSexTv.setText("未填写");
-        mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mUser.getBirthday()));
-        mCityTv.setText(Area.getProvinceCityString(mUser.getProvinceId(), mUser.getCityId()));
-        tel_text.setText(mUser.getTelephone());
+//        mSexTv.setText(mUser.getSex() == 0 ? R.string.sex_woman : R.string.sex_man);
+//        if (mUser.getSex() == -1) mSexTv.setText("未填写");
+//        mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mUser.getBirthday()));
+//        mCityTv.setText(Area.getProvinceCityString(mUser.getProvinceId(), mUser.getCityId()));
+        phone_tv.setText(mUser.getTelephone());
         // ActionBtn 的初始化
         if (isMyInfo) {// 如果是我自己，不显示ActionBtn
-            mNextStepBtn.setVisibility(View.GONE);
-            mLookLocationBtn.setVisibility(View.GONE);
+            do_next_tv.setVisibility(View.GONE);
+            push_task_tv.setVisibility(View.GONE);
         } else {
-            mNextStepBtn.setVisibility(View.VISIBLE);
+            do_next_tv.setVisibility(View.VISIBLE);
             if (mFriend == null) {
-                mNextStepBtn.setText(R.string.add_attention);
-                mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                do_next_tv.setText(R.string.add_attention);
+                do_next_tv.setOnClickListener(new AddAttentionListener());
             } else {
                 switch (mFriend.getStatus()) {
                     case Friend.STATUS_BLACKLIST:// 在黑名单中，显示移除黑名单
-                        mNextStepBtn.setText(R.string.remove_blacklist);
-                        mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
+                        do_next_tv.setText(R.string.remove_blacklist);
+                        do_next_tv.setOnClickListener(new RemoveBlacklistListener());
                         break;
                     case Friend.STATUS_ATTENTION:// 已经是关注了，显示打招呼
-                        mNextStepBtn.setText(R.string.say_hello);
-                        mNextStepBtn.setOnClickListener(new SayHelloListener());
+                        do_next_tv.setText(R.string.say_hello);
+                        do_next_tv.setOnClickListener(new SayHelloListener());
                         break;
                     case Friend.STATUS_FRIEND:// 已经是朋友了，显示发消息
-                        mNextStepBtn.setText(R.string.send_msg);
-                        mNextStepBtn.setOnClickListener(new SendMsgListener());
+                        do_next_tv.setText(R.string.send_msg);
+                        do_next_tv.setOnClickListener(new SendMsgListener());
                         break;
                     default:// 其他（理论上不可能的哈，容错）
-                        mNextStepBtn.setText(R.string.add_attention);
-                        mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                        do_next_tv.setText(R.string.add_attention);
+                        do_next_tv.setOnClickListener(new AddAttentionListener());
                         break;
                 }
             }
-
-            mLookLocationBtn.setVisibility(View.VISIBLE);
-            mLookLocationBtn.setOnClickListener(new View.OnClickListener() {
+            push_task_tv.setVisibility(View.VISIBLE);
+            push_task_tv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-//					double latitude = 0;
-//					double longitude = 0;
-//					if (mUser != null && mUser.getLoginLog() != null) {
-//						latitude = mUser.getLoginLog().getLatitude();
-//						longitude = mUser.getLoginLog().getLongitude();
-//					}
-//					// latitude = 22.534023677879738;
-//					// longitude = 114.06090214848518;
-//					if (latitude == 0 || longitude == 0) {
-//						ToastUtil.showToast(mContext, "该好友未公开位置信息");
-//					}
-//					Intent intent = new Intent(mContext, BaiduMapActivity.class);
-//					intent.putExtra("userName", mUser.getNickName());
-//					intent.putExtra("latitude", latitude);
-//					intent.putExtra("longitude", longitude);
-//					startActivity(intent);
                     Intent mIntent = new Intent(BasicInfoActivity.this, AddTaskActivity.class);
-                    mIntent.putExtra("people", mNameTv.getText().toString());
+                    mIntent.putExtra("people", name_tv.getText().toString());
                     startActivity(mIntent);
                 }
             });
@@ -402,53 +399,29 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.basic_info);
-        mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
-        mNameTv = (TextView) findViewById(R.id.name_tv);
-        mSexTv = (TextView) findViewById(R.id.sex_tv);
-        mBirthdayTv = (TextView) findViewById(R.id.birthday_tv);
-        mCityTv = (TextView) findViewById(R.id.city_tv);
-        tel_text = (TextView) findViewById(R.id.tel_tv);
-        tel_rl = (RelativeLayout) findViewById(R.id.tel_rl);
-        tel_rl.setOnClickListener(new View.OnClickListener() {
+
+        phone_img.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (!com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(tel_text.getText().toString())) {
+                if (!StringUtils.isEmpty(phone_tv.getText().toString())) {
                     String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
                     Pattern regex = Pattern.compile(check);
-                    Matcher matcher = regex.matcher(tel_text.getText().toString());
+                    Matcher matcher = regex.matcher(phone_tv.getText().toString());
                     boolean isMatched = matcher.matches();
                     if (isMatched) {
-                        phoneAction(tel_text.getText().toString());
+                        phoneAction(phone_tv.getText().toString());
                     } else {
                         ViewUtil.ShowMessageTitle(BasicInfoActivity.this, "手机格式不正确！");
                     }
-
                 }
             }
         });
-        mDataLoadView = (DataLoadView) findViewById(R.id.data_load_view);
         mDataLoadView.setLoadingEvent(new DataLoadView.LoadingEvent() {
             @Override
             public void load() {
                 loadOthersInfoFromNet();
             }
         });
-        mAvatarImg.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // Intent intent = new Intent(PersonalInfoActivity.this,
-                // BusinessCircleActivity.class);
-                // intent.putExtra(Constant.EXTRA_CIRCLE_TYPE,
-                // Constant.CIRCLE_TYPE_PERSONAL_SPACE);
-                // intent.putExtra(Constant.EXTRA_USER_ID, mUser.getUserId());
-                // intent.putExtra(Constant.EXTRA_NICK_NAME,
-                // mUser.getNickName());
-                // startActivity(intent);
-            }
-        });
-        mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
-        mLookLocationBtn = (Button) findViewById(R.id.look_location_btn);
     }
 
     public void phoneAction(final String phone) {
@@ -539,8 +512,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         // 提示加关注成功
                         ToastUtil.showToast(mContext, R.string.add_attention_succ);
                         // 更新界面
-                        mNextStepBtn.setText(R.string.say_hello);
-                        mNextStepBtn.setOnClickListener(new SayHelloListener());
+                        do_next_tv.setText(R.string.say_hello);
+                        do_next_tv.setOnClickListener(new SayHelloListener());
                         // 由陌生关系变为关注了,那么右上角更多操作可以显示了
                         initFriendMoreAction();
                         // 更新名片盒
@@ -559,8 +532,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         // 提示加好友成功
                         ToastUtil.showToast(mContext, R.string.add_friend_succ);
                         // 更新界面
-                        mNextStepBtn.setText(R.string.send_msg);
-                        mNextStepBtn.setOnClickListener(new SendMsgListener());
+                        do_next_tv.setText(R.string.send_msg);
+                        do_next_tv.setOnClickListener(new SendMsgListener());
                         // 由陌生或者关注变为好友了,那么右上角更多操作可以显示了
                         initFriendMoreAction();
                         // 更新名片盒
@@ -665,11 +638,6 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
     }
 
-    /*设置对嘎好友特别关注*/
-    private void setMoreAttention(Friend friend) {
-        boolean b = FriendHelper.addPeculiarFriend(friend);
-        Crouton.makeText(ct, "添加特别关注" + (b ? "成功" : "失败"));
-    }
 
     /**
      * 取消关注
@@ -758,8 +726,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     showMenu = false;
                     invalidateOptionsMenu();
                     // Action Btn设置为打招呼
-                    mNextStepBtn.setText(R.string.add_attention);
-                    mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                    do_next_tv.setText(R.string.add_attention);
+                    do_next_tv.setOnClickListener(new AddAttentionListener());
                 }
                 ProgressDialogUtil.dismiss(mProgressDialog);
             }
@@ -820,8 +788,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     updateAllCardcastUi();
 
                     // Action Btn设置为打招呼
-                    mNextStepBtn.setText(R.string.remove_blacklist);
-                    mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
+                    do_next_tv.setText(R.string.remove_blacklist);
+                    do_next_tv.setOnClickListener(new RemoveBlacklistListener());
 
 							/* 发送加入黑名单的通知 */
                     if (friend.getStatus() == Friend.STATUS_FRIEND) {// 之前是好友，需要发消息让那个人不能看我的商务圈
@@ -869,8 +837,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
                     switch (currentStatus) {
                         case Friend.STATUS_ATTENTION:
-                            mNextStepBtn.setText(R.string.say_hello);
-                            mNextStepBtn.setOnClickListener(new SayHelloListener());
+                            do_next_tv.setText(R.string.say_hello);
+                            do_next_tv.setOnClickListener(new SayHelloListener());
                             NewFriendMessage message1 = NewFriendMessage.createWillSendMessage(
                                     MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_NEWSEE, null, friend);
                             mXmppService.sendNewFriendMessage(friend.getUserId(), message1);
@@ -878,17 +846,16 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                             FriendHelper.addAttentionExtraOperation(friend.getOwnerId(), friend.getUserId());
                             break;
                         case Friend.STATUS_FRIEND:
-                            mNextStepBtn.setText(R.string.send_msg);
-                            mNextStepBtn.setOnClickListener(new SendMsgListener());
-
+                            do_next_tv.setText(R.string.send_msg);
+                            do_next_tv.setOnClickListener(new SendMsgListener());
                             NewFriendMessage message2 = NewFriendMessage.createWillSendMessage(
                                     MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_FRIEND, null, mUser);
                             mXmppService.sendNewFriendMessage(mUser.getUserId(), message2);
                             FriendHelper.addFriendExtraOperation(friend.getOwnerId(), friend.getUserId());
                             break;
                         default:// 其他，理论上不可能
-                            mNextStepBtn.setText(R.string.add_attention);
-                            mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                            do_next_tv.setText(R.string.add_attention);
+                            do_next_tv.setOnClickListener(new AddAttentionListener());
                             break;
                     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java

@@ -20,22 +20,21 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.AddAttentionResult;
-import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.AttentionUser;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.User;
@@ -53,7 +52,6 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.DataLoadView;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
@@ -78,16 +76,29 @@ import java.util.regex.Pattern;
  */
 public class CardInfoActivity extends BaseActivity implements NewFriendListener {
 
-    private ImageView mAvatarImg;
-    private RelativeLayout tel_rl;
-    private TextView mNameTv;
-    private TextView mSexTv;
-    private TextView mBirthdayTv;
-    private TextView mCityTv;
-    private TextView tel_text;
-    private Button mNextStepBtn;
-    private Button mLookLocationBtn;
+    @ViewInject(R.id.max_img)
+    private ImageView max_img;
+    @ViewInject(R.id.avatar_img)
+    private ImageView avatar_img;
+    @ViewInject(R.id.phone_img)
+    private ImageView phone_img;
+    @ViewInject(R.id.email_img)
+    private ImageView email_img;
+    @ViewInject(R.id.name_tv)
+    private TextView name_tv;
+    @ViewInject(R.id.sub_tv)
+    private TextView sub_tv;
+    @ViewInject(R.id.phone_tv)
+    private TextView phone_tv;
+    @ViewInject(R.id.email_tv)
+    private TextView email_tv;
+    @ViewInject(R.id.do_next_tv)
+    private TextView do_next_tv;
+    @ViewInject(R.id.push_task_tv)
+    private TextView push_task_tv;
+    @ViewInject(R.id.data_load_view)
     private DataLoadView mDataLoadView;
+
     private User mUser;
     private Friend mFriend;// 如果这个用户是当前登陆者的好友或者关注着，那么该值有意义
     private ProgressDialog mProgressDialog;
@@ -118,7 +129,6 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         super.onCreate(savedInstanceState);
         this.getWindow().invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL);
         if (getIntent() != null) {
-//            userId = getIntent().getStringExtra(AppConstant.EXTRA_USER_ID);
             userName = getIntent().getStringExtra(AppConstant.EXTRA_NICK_NAME);
         }
         if (userName != null) {
@@ -128,6 +138,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         }
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         setContentView(R.layout.activity_basic_info);
+        ViewUtils.inject(this);
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
         initView();
         ListenerManager.getInstance().addNewFriendListener(this);
@@ -283,12 +294,12 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         if (getIntent() != null) {
             code = getIntent().getStringExtra(AppConstant.EXTRA_NICK_CODE);
         }
-        mNameTv.setText(userName);
-        tel_text.setText(code);
-        mNextStepBtn.setText("该用户暂未开通app");
-        mNextStepBtn.setClickable(false);
-        mNextStepBtn.setPressed(true);
-        mLookLocationBtn.setVisibility(View.GONE);
+        name_tv.setText(userName);
+        phone_tv.setText(code);
+        do_next_tv.setText("该用户暂未开通app");
+        do_next_tv.setClickable(false);
+        do_next_tv.setPressed(true);
+        push_task_tv.setVisibility(View.GONE);
     }
 
     private void loadOthersInfoFromNet() {
@@ -344,87 +355,72 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
         }
 
         // 设置头像
-        AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), mAvatarImg, false);
+        AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), max_img, false);
+        AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), avatar_img, false);
         // 判断是否有备注名,有就显示
         if (mFriend != null) {
             if (StringUtils.isEmpty(userName)) {
                 if (mFriend.getRemarkName() != null) {
-                    mNameTv.setText(mFriend.getRemarkName());
+                    name_tv.setText(mFriend.getRemarkName());
                 } else {
-                    mNameTv.setText(mUser.getNickName());
+                    name_tv.setText(mUser.getNickName());
 
                 }
             } else {
-                mNameTv.setText(userName);
+                name_tv.setText(userName);
             }
             mFriend.setRemarkName(userName);
         } else {
             Log.i("LoginInfo", "设置当前用户的名字");
             //mNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
             if (StringUtils.isEmpty(userName)) {
-                mNameTv.setText(mUser.getNickName());//陌生人也显示正确名字
+                name_tv.setText(mUser.getNickName());//陌生人也显示正确名字
             } else {
-                mNameTv.setText(userName);
+                name_tv.setText(userName);
             }
         }
 
-        mSexTv.setText(mUser.getSex() == 0 ? R.string.sex_woman : R.string.sex_man);
-        if (mUser.getSex() == -1) mSexTv.setText("未填写");
-        mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mUser.getBirthday()));
-        mCityTv.setText(Area.getProvinceCityString(mUser.getProvinceId(), mUser.getCityId()));
-        tel_text.setText(mUser.getTelephone());
+//        mSexTv.setText(mUser.getSex() == 0 ? R.string.sex_woman : R.string.sex_man);
+//        if (mUser.getSex() == -1) mSexTv.setText("未填写");
+//        mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mUser.getBirthday()));
+//        mCityTv.setText(Area.getProvinceCityString(mUser.getProvinceId(), mUser.getCityId()));
+        phone_tv.setText(mUser.getTelephone());
         // ActionBtn 的初始化
         if (isMyInfo) {// 如果是我自己，不显示ActionBtn
-            mNextStepBtn.setVisibility(View.GONE);
-            mLookLocationBtn.setVisibility(View.GONE);
+            do_next_tv.setVisibility(View.GONE);
+            push_task_tv.setVisibility(View.GONE);
         } else {
-            mNextStepBtn.setVisibility(View.VISIBLE);
+            do_next_tv.setVisibility(View.VISIBLE);
             if (mFriend == null) {
-                mNextStepBtn.setText(R.string.add_attention);
-                mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                do_next_tv.setText(R.string.add_attention);
+                do_next_tv.setOnClickListener(new AddAttentionListener());
             } else {
                 switch (mFriend.getStatus()) {
                     case Friend.STATUS_BLACKLIST:// 在黑名单中，显示移除黑名单
-                        mNextStepBtn.setText(R.string.remove_blacklist);
-                        mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
+                        do_next_tv.setText(R.string.remove_blacklist);
+                        do_next_tv.setOnClickListener(new RemoveBlacklistListener());
                         break;
                     case Friend.STATUS_ATTENTION:// 已经是关注了，显示打招呼
-                        mNextStepBtn.setText(R.string.say_hello);
-                        mNextStepBtn.setOnClickListener(new SayHelloListener());
+                        do_next_tv.setText(R.string.say_hello);
+                        do_next_tv.setOnClickListener(new SayHelloListener());
                         break;
                     case Friend.STATUS_FRIEND:// 已经是朋友了，显示发消息
-                        mNextStepBtn.setText(R.string.send_msg);
-                        mNextStepBtn.setOnClickListener(new SendMsgListener());
+                        do_next_tv.setText(R.string.send_msg);
+                        do_next_tv.setOnClickListener(new SendMsgListener());
                         break;
                     default:// 其他（理论上不可能的哈，容错）
-                        mNextStepBtn.setText(R.string.add_attention);
-                        mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                        do_next_tv.setText(R.string.add_attention);
+                        do_next_tv.setOnClickListener(new AddAttentionListener());
                         break;
                 }
             }
 
-            mLookLocationBtn.setVisibility(View.VISIBLE);
-            mLookLocationBtn.setOnClickListener(new View.OnClickListener() {
+            push_task_tv.setVisibility(View.VISIBLE);
+            push_task_tv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-//					double latitude = 0;
-//					double longitude = 0;
-//					if (mUser != null && mUser.getLoginLog() != null) {
-//						latitude = mUser.getLoginLog().getLatitude();
-//						longitude = mUser.getLoginLog().getLongitude();
-//					}
-//					// latitude = 22.534023677879738;
-//					// longitude = 114.06090214848518;
-//					if (latitude == 0 || longitude == 0) {
-//						ToastUtil.showToast(mContext, "该好友未公开位置信息");
-//					}
-//					Intent intent = new Intent(mContext, BaiduMapActivity.class);
-//					intent.putExtra("userName", mUser.getNickName());
-//					intent.putExtra("latitude", latitude);
-//					intent.putExtra("longitude", longitude);
-//					startActivity(intent);
                     Intent mIntent = new Intent(CardInfoActivity.this, AddTaskActivity.class);
-                    mIntent.putExtra("people", mNameTv.getText().toString());
+                    mIntent.putExtra("people", name_tv.getText().toString());
                     startActivity(mIntent);
                 }
             });
@@ -447,23 +443,17 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
 
     private void initView() {
         getSupportActionBar().setTitle(R.string.basic_info);
-        mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
-        mNameTv = (TextView) findViewById(R.id.name_tv);
-        mSexTv = (TextView) findViewById(R.id.sex_tv);
-        mBirthdayTv = (TextView) findViewById(R.id.birthday_tv);
-        mCityTv = (TextView) findViewById(R.id.city_tv);
-        tel_text = (TextView) findViewById(R.id.tel_tv);
-        tel_rl = (RelativeLayout) findViewById(R.id.tel_rl);
-        tel_rl.setOnClickListener(new View.OnClickListener() {
+
+        phone_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (!com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(tel_text.getText().toString())) {
+                if (!com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(phone_tv.getText().toString())) {
                     String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
                     Pattern regex = Pattern.compile(check);
-                    Matcher matcher = regex.matcher(tel_text.getText().toString());
+                    Matcher matcher = regex.matcher(phone_tv.getText().toString());
                     boolean isMatched = matcher.matches();
                     if (isMatched) {
-                        phoneAction(tel_text.getText().toString());
+                        phoneAction(phone_tv.getText().toString());
                     } else {
                         ViewUtil.ShowMessageTitle(CardInfoActivity.this, "手机格式不正确！");
                     }
@@ -471,28 +461,13 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                 }
             }
         });
-        mDataLoadView = (DataLoadView) findViewById(R.id.data_load_view);
         mDataLoadView.setLoadingEvent(new DataLoadView.LoadingEvent() {
             @Override
             public void load() {
                 loadOthersInfoFromNet();
             }
         });
-        mAvatarImg.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // Intent intent = new Intent(PersonalInfoActivity.this,
-                // BusinessCircleActivity.class);
-                // intent.putExtra(Constant.EXTRA_CIRCLE_TYPE,
-                // Constant.CIRCLE_TYPE_PERSONAL_SPACE);
-                // intent.putExtra(Constant.EXTRA_USER_ID, mUser.getUserId());
-                // intent.putExtra(Constant.EXTRA_NICK_NAME,
-                // mUser.getNickName());
-                // startActivity(intent);
-            }
-        });
-        mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
-        mLookLocationBtn = (Button) findViewById(R.id.look_location_btn);
+
     }
 
     public void phoneAction(final String phone) {
@@ -583,8 +558,8 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                         // 提示加关注成功
                         ToastUtil.showToast(mContext, R.string.add_attention_succ);
                         // 更新界面
-                        mNextStepBtn.setText(R.string.say_hello);
-                        mNextStepBtn.setOnClickListener(new SayHelloListener());
+                        do_next_tv.setText(R.string.say_hello);
+                        do_next_tv.setOnClickListener(new SayHelloListener());
                         // 由陌生关系变为关注了,那么右上角更多操作可以显示了
                         initFriendMoreAction();
                         // 更新名片盒
@@ -603,8 +578,8 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                         // 提示加好友成功
                         ToastUtil.showToast(mContext, R.string.add_friend_succ);
                         // 更新界面
-                        mNextStepBtn.setText(R.string.send_msg);
-                        mNextStepBtn.setOnClickListener(new SendMsgListener());
+                        do_next_tv.setText(R.string.send_msg);
+                        do_next_tv.setOnClickListener(new SendMsgListener());
                         // 由陌生或者关注变为好友了,那么右上角更多操作可以显示了
                         initFriendMoreAction();
                         // 更新名片盒
@@ -796,8 +771,8 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                     showMenu = false;
                     invalidateOptionsMenu();
                     // Action Btn设置为打招呼
-                    mNextStepBtn.setText(R.string.add_attention);
-                    mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                    do_next_tv.setText(R.string.add_attention);
+                    do_next_tv.setOnClickListener(new AddAttentionListener());
                 }
                 ProgressDialogUtil.dismiss(mProgressDialog);
             }
@@ -858,8 +833,8 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                     updateAllCardcastUi();
 
                     // Action Btn设置为打招呼
-                    mNextStepBtn.setText(R.string.remove_blacklist);
-                    mNextStepBtn.setOnClickListener(new RemoveBlacklistListener());
+                    do_next_tv.setText(R.string.remove_blacklist);
+                    do_next_tv.setOnClickListener(new RemoveBlacklistListener());
 
 							/* 发送加入黑名单的通知 */
                     if (friend.getStatus() == Friend.STATUS_FRIEND) {// 之前是好友，需要发消息让那个人不能看我的商务圈
@@ -907,8 +882,8 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
 
                     switch (currentStatus) {
                         case Friend.STATUS_ATTENTION:
-                            mNextStepBtn.setText(R.string.say_hello);
-                            mNextStepBtn.setOnClickListener(new SayHelloListener());
+                            do_next_tv.setText(R.string.say_hello);
+                            do_next_tv.setOnClickListener(new SayHelloListener());
                             NewFriendMessage message1 = NewFriendMessage.createWillSendMessage(
                                     MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_NEWSEE, null, friend);
                             mXmppService.sendNewFriendMessage(friend.getUserId(), message1);
@@ -916,8 +891,8 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                             FriendHelper.addAttentionExtraOperation(friend.getOwnerId(), friend.getUserId());
                             break;
                         case Friend.STATUS_FRIEND:
-                            mNextStepBtn.setText(R.string.send_msg);
-                            mNextStepBtn.setOnClickListener(new SendMsgListener());
+                            do_next_tv.setText(R.string.send_msg);
+                            do_next_tv.setOnClickListener(new SendMsgListener());
 
                             NewFriendMessage message2 = NewFriendMessage.createWillSendMessage(
                                     MyApplication.getInstance().mLoginUser, XmppMessage.TYPE_FRIEND, null, mUser);
@@ -925,8 +900,8 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
                             FriendHelper.addFriendExtraOperation(friend.getOwnerId(), friend.getUserId());
                             break;
                         default:// 其他，理论上不可能
-                            mNextStepBtn.setText(R.string.add_attention);
-                            mNextStepBtn.setOnClickListener(new AddAttentionListener());
+                            do_next_tv.setText(R.string.add_attention);
+                            do_next_tv.setOnClickListener(new AddAttentionListener());
                             break;
                     }
 

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

@@ -9,116 +9,120 @@ import android.widget.ScrollView;
 
 public class CustomerScrollView extends ScrollView {
 
-	/**@annotation：阻尼系数的scrollview 上面的案例，没有阻尼效果！ */
-	Context mContext;
-	private View mView;
-	private float touchY;
-	private int scrollY = 0;
-	private boolean handleStop = false;
-	private int eachStep = 0;
-
-	private static final int MAX_SCROLL_HEIGHT = 600;// 最大滑动距离
-	private static final float SCROLL_RATIO = 0.4f;// 阻尼系数,越小阻力就越大
-
-	public CustomerScrollView(Context context) {
-		super(context);
-		this.mContext = context;
-	}
-
-	public CustomerScrollView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		this.mContext = context;
-	}
-
-	public CustomerScrollView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		this.mContext = context;
-	}
-
-
-	@Override
-	protected void onFinishInflate() {
-		   super.onFinishInflate();
-			if (getChildCount() > 0) {
-				this.mView = getChildAt(0);
-			}
-	}
-
-	@Override
-	public boolean onInterceptTouchEvent(MotionEvent arg0) {
-		if (arg0.getAction() == MotionEvent.ACTION_DOWN) {
-			touchY = arg0.getY();
-		}
-		return super.onInterceptTouchEvent(arg0);
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent ev) {
-		if (mView == null) {
-			return super.onTouchEvent(ev);
-		} else {
-			commonOnTouchEvent(ev);
-		}
-		return super.onTouchEvent(ev);
-	}
-
-	private void commonOnTouchEvent(MotionEvent ev) {
-		int action = ev.getAction();
-		switch (action) {
-		case MotionEvent.ACTION_UP:
-			if (mView.getScrollY() != 0) {
+    /**
+     * @annotation：阻尼系数的scrollview 上面的案例，没有阻尼效果！
+     */
+    Context mContext;
+    private View mView;
+    private float touchY;
+    private int scrollY = 0;
+    private boolean handleStop = false;
+    private int eachStep = 0;
+
+    private static final int MAX_SCROLL_HEIGHT = 600;// 最大滑动距离
+    private static final float SCROLL_RATIO = 0.4f;// 阻尼系数,越小阻力就越大
+
+    public CustomerScrollView(Context context) {
+        super(context);
+        this.mContext = context;
+    }
+
+    public CustomerScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.mContext = context;
+    }
+
+    public CustomerScrollView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        this.mContext = context;
+    }
+
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        if (getChildCount() > 0) {
+            this.mView = getChildAt(0);
+        }
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent arg0) {
+        if (arg0.getAction() == MotionEvent.ACTION_DOWN) {
+            touchY = arg0.getY();
+        }
+        return super.onInterceptTouchEvent(arg0);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (mView == null) {
+            return super.onTouchEvent(ev);
+        } else {
+            commonOnTouchEvent(ev);
+        }
+        return super.onTouchEvent(ev);
+    }
+
+    private void commonOnTouchEvent(MotionEvent ev) {
+        int action = ev.getAction();
+        switch (action) {
+            case MotionEvent.ACTION_UP:
+                if (mView.getScrollY() != 0) {
 //				System.out.println("ACTION_UP y="+mView.getScrollY());
-				handleStop = true;
-				animation();
-			}
-			break;
-		case MotionEvent.ACTION_MOVE:
-			float nowY = ev.getY();
-			int deltaY = (int) (touchY - nowY);
-			touchY = nowY;
-			if (isNeedMove()) {
-				int offset = mView.getScrollY();
-				if (offset < MAX_SCROLL_HEIGHT && offset > -MAX_SCROLL_HEIGHT) {
-					mView.scrollBy(0, (int) (deltaY * SCROLL_RATIO));
-					handleStop = false;
-				}
-			}
-			
-			break;
-		default:
-			break;
-		}
-	} 
-
-	private boolean isNeedMove() {
-		int viewHight = mView.getMeasuredHeight();
-		int srollHight = getHeight();
-		int offset = viewHight - srollHight;
-		int scrollY = getScrollY();
-		if (scrollY == 0 || scrollY == offset) {
-			return true;
-		}
-		return false;
-	}
-	
-	private void animation() {
-		scrollY = mView.getScrollY();
-		eachStep = scrollY / 10;
-		resetPositionHandler.sendEmptyMessage(0);
-	}
-
-	Handler resetPositionHandler = new Handler() {
-		public void handleMessage(android.os.Message msg) {
-			/**@annotation：与运算符  两个都要为true */
-			if (scrollY != 0 && handleStop) {
-				//System.out.println("eachStep="+eachStep);
-				scrollY -= eachStep;
-				if ((eachStep < 0 && scrollY > 0)||(eachStep > 0 && scrollY < 0)) {
-					scrollY = 0;
-				}
-				mView.scrollTo(0, scrollY);
-				this.sendEmptyMessageDelayed(0, 5);
-			}
-		};
-	};
+                    handleStop = true;
+                    animation();
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                float nowY = ev.getY();
+                int deltaY = (int) (touchY - nowY);
+                touchY = nowY;
+                if (isNeedMove()) {
+                    int offset = mView.getScrollY();
+                    if (offset < MAX_SCROLL_HEIGHT && offset > -MAX_SCROLL_HEIGHT) {
+                        mView.scrollBy(0, (int) (deltaY * SCROLL_RATIO));
+                        handleStop = false;
+                    }
+                }
+
+                break;
+            default:
+                break;
+        }
+    }
+
+    private boolean isNeedMove() {
+        int viewHight = mView.getMeasuredHeight();
+        int srollHight = getHeight();
+        int offset = viewHight - srollHight;
+        int scrollY = getScrollY();
+        if (scrollY == 0 || scrollY == offset) {
+            return true;
+        }
+        return false;
+    }
+
+    private void animation() {
+        scrollY = mView.getScrollY();
+        eachStep = scrollY / 10;
+        resetPositionHandler.sendEmptyMessage(0);
+    }
+
+    Handler resetPositionHandler = new Handler() {
+        public void handleMessage(android.os.Message msg) {
+            /**@annotation：与运算符 两个都要为true */
+            if (scrollY != 0 && handleStop) {
+                //System.out.println("eachStep="+eachStep);
+                scrollY -= eachStep;
+                if ((eachStep < 0 && scrollY > 0) || (eachStep > 0 && scrollY < 0)) {
+                    scrollY = 0;
+                }
+                mView.scrollTo(0, scrollY);
+                this.sendEmptyMessageDelayed(0, 5);
+            }
+        }
+
+        ;
+    };
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -945,14 +945,14 @@ public class MessageFragment extends EasyFragment {
                             AllProcess.class);
                 } catch (Exception e) {
                 }
-                int task_num = 0, pagin_num = 0, daiban_num = 0;
+                int task_num = 0, daiban_num = 0;
                 for (int i = 0; i < allProcesses.size(); i++) {
                     if (allProcesses.get(i).getTypecode().contains("task")) {//我的任务
                         if (!allProcesses.get(i).getTypecode().equals("projecttask") && !allProcesses.get(i).getTypecode().equals("worktask"))
                             task_num++;
                     } else if (allProcesses.get(i).getTypecode().contains("dingyue")) {//订阅
                         if ("0".equals(allProcesses.get(i).getStatus().trim())) {
-                            pagin_num++;
+
                         }
                     } else {
                         daiban_num++;
@@ -962,8 +962,6 @@ public class MessageFragment extends EasyFragment {
                 handler.sendEmptyMessage(TASK_MSG);
                 DAIBAN_count = daiban_num;
                 handler.sendEmptyMessage(DAIBAN_MSG);
-//                SUBRICE_count = pagin_num;
-//                handler.sendEmptyMessage(SUBRICE_MSG);
             }
         }
     }

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"
@@ -25,8 +24,8 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line"
-                    android:layout_marginTop="16dp"/>
+                    android:layout_marginTop="16dp"
+                    android:background="@color/item_line" />
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_man"
@@ -43,12 +42,12 @@
 
                     <TextView
                         android:id="@+id/et_extra_starttime"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:hint="2016-10-11 17:00"
                         style="@style/IMTbleLine_TextValue"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_toLeftOf="@+id/Start_time_img"
-                        />
+                        android:hint="2016-10-11 17:00" />
+
                     <ImageView
                         android:id="@+id/Start_time_img"
                         android:layout_width="@dimen/next_width"
@@ -62,8 +61,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line"
-                    />
+                    android:background="@color/item_line" />
 
                 <RelativeLayout
                     android:id="@+id/ry_set_endTime"
@@ -75,16 +73,16 @@
                         style="@style/form_relative_left_text"
                         android:text="结束时间"
                         android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main"  />
+                        android:textSize="@dimen/text_main" />
 
                     <TextView
                         android:id="@+id/et_extra_endtime"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:hint="2016-10-12 17:00"
                         style="@style/IMTbleLine_TextValue"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_toLeftOf="@+id/end_time_img"
-                        />
+                        android:hint="2016-10-12 17:00" />
+
                     <ImageView
                         android:id="@+id/end_time_img"
                         android:layout_width="@dimen/next_width"
@@ -99,12 +97,12 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line"
-                    />
+                    android:background="@color/item_line" />
+
                 <RelativeLayout
-                    android:layout_marginTop="8dp"
                     android:id="@+id/ry_leave_reason"
                     style="@style/form_relative_customer"
+                    android:layout_marginTop="8dp"
                     android:background="@color/item_color2">
 
 
@@ -116,18 +114,19 @@
 
 
                 </RelativeLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line"
-                    />
+                    android:background="@color/item_line" />
+
                 <EditText
                     android:id="@+id/et_extra_remark"
                     android:layout_width="match_parent"
                     android:layout_height="250dp"
-                    android:hint="     请输入工作任务"
                     android:gravity="top|left"
-                    android:textSize="12sp"/>
+                    android:hint="     请输入工作任务"
+                    android:textSize="12sp" />
             </LinearLayout>
 
             <LinearLayout

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

@@ -8,179 +8,180 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ScrollView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/do_next_tv"
+                android:layout_width="0dp"
+                android:drawablePadding="10dp"
+                android:drawableTop="@drawable/phone"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/avatar_img"
-                    android:layout_width="160dp"
-                    android:layout_height="160dp"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="10dp"
-                    android:background="@drawable/account_avatar_bg"
-                    android:contentDescription="@string/app_name"
-                    android:paddingBottom="5.0dip"
-                    android:paddingLeft="4.0dip"
-                    android:paddingRight="6.0dip"
-                    android:paddingTop="5.0dip"
-                    android:src="@drawable/avatar_normal" />
+                android:gravity="center"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_main"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/push_task_tv"
+                android:layout_width="0dp"
+                android:drawablePadding="10dp"
+                android:drawableTop="@drawable/phone"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_main"
+                android:layout_weight="1" />
+        </LinearLayout>
 
-                <RelativeLayout
-                    style="@style/IMTbleLine"
-                    android:layout_marginTop="10dp">
 
-                    <TextView
-                        android:id="@+id/name_text"
-                        style="@style/IMTbleLine_TextKey"
-                        android:drawableLeft="@drawable/resume_empty_icon"
-                        android:drawablePadding="5dp"
-                        android:text="@string/name_align" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/name_tv"
-                        style="@style/IMTbleLine_TextValue"
-                        android:layout_toLeftOf="@+id/name_arrow_img"
-                        android:layout_toRightOf="@+id/name_text" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="250dp">
 
-                    <ImageView
-                        android:id="@+id/name_arrow_img"
-                        style="@style/IMTbleLine_ArrowImg"
-                        android:contentDescription="@string/app_name"
-                        android:visibility="invisible" />
-                </RelativeLayout>
+                <ImageView
+                    android:id="@+id/max_img"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:alpha="0.16"
+                    android:scaleType="fitXY" />
 
                 <RelativeLayout
-                    android:id="@+id/sex_rl"
-                    style="@style/IMTbleLine_UP">
-
-                    <TextView
-                        android:id="@+id/sex_text"
-                        style="@style/IMTbleLine_TextKey"
-                        android:drawableLeft="@drawable/resume_empty_icon"
-                        android:drawablePadding="5dp"
-                        android:text="@string/sex_align" />
-
-                    <TextView
-                        android:id="@+id/sex_tv"
-                        style="@style/IMTbleLine_TextValue"
-                        android:layout_toLeftOf="@+id/sex_arrow_img"
-                        android:layout_toRightOf="@+id/sex_text" />
-
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center">
                     <ImageView
-                        android:id="@+id/sex_arrow_img"
-                        style="@style/IMTbleLine_ArrowImg"
+                        android:id="@+id/avatar_img"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:background="@drawable/account_avatar_bg"
                         android:contentDescription="@string/app_name"
-                        android:visibility="invisible" />
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/birthday_rl"
-                    style="@style/IMTbleLine">
-
+                        android:src="@drawable/avatar_normal" />
                     <TextView
-                        android:id="@+id/birthday_text"
-                        style="@style/IMTbleLine_TextKey"
-                        android:drawableLeft="@drawable/resume_empty_icon"
-                        android:drawablePadding="5dp"
-                        android:text="@string/birthday" />
+                        android:id="@+id/name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/avatar_img"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="10dp"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <TextView
-                        android:id="@+id/birthday_tv"
-                        style="@style/IMTbleLine_TextValue"
-                        android:layout_toLeftOf="@+id/birthday_arrow_img"
-                        android:layout_toRightOf="@+id/birthday_text" />
-
-                    <ImageView
-                        android:id="@+id/birthday_arrow_img"
-                        style="@style/IMTbleLine_ArrowImg"
-                        android:contentDescription="@string/app_name"
-                        android:visibility="invisible" />
-                </RelativeLayout>
+                        android:id="@+id/sub_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/name_tv"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="10dp"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
-                <RelativeLayout
-                    android:id="@+id/city_rl"
-                    style="@style/IMTbleLine_UP">
 
-                    <TextView
-                        android:id="@+id/city_text"
-                        style="@style/IMTbleLine_TextKey"
-                        android:drawableLeft="@drawable/resume_empty_icon"
-                        android:drawablePadding="5dp"
-                        android:text="@string/residence_align" />
 
-                    <TextView
-                        android:id="@+id/city_tv"
-                        style="@style/IMTbleLine_TextValue"
-                        android:layout_toLeftOf="@+id/city_arrow_img"
-                        android:layout_toRightOf="@+id/city_text" />
 
-                    <ImageView
-                        android:id="@+id/city_arrow_img"
-                        style="@style/IMTbleLine_ArrowImg"
-                        android:contentDescription="@string/app_name"
-                        android:visibility="invisible" />
                 </RelativeLayout>
+            </FrameLayout>
 
-                <RelativeLayout
-                    android:id="@+id/tel_rl"
-                    style="@style/IMTbleLine">
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
 
-                    <TextView
-                        android:id="@+id/tel_text"
-                        style="@style/IMTbleLine_TextKey"
-                        android:drawableLeft="@drawable/resume_empty_icon"
-                        android:drawablePadding="5dp"
-                        android:text="@string/telephone" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/item_height"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
+
+                <TextView
+                    android:id="@+id/phone_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="手机"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/phone_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="30dp"
+                    android:layout_toRightOf="@id/phone_tag"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
 
-                    <TextView
-                        android:id="@+id/tel_tv"
-                        style="@style/IMTbleLine_TextValue"
-                        android:layout_toLeftOf="@+id/tel_arrow_img"
-                        android:layout_toRightOf="@+id/tel_text" />
+                <ImageView
+                    android:id="@+id/phone_img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignTop="@id/phone_tag"
+                    android:src="@drawable/phone" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
 
-                    <ImageView
-                        android:id="@+id/tel_arrow_img"
-                        style="@style/IMTbleLine_ArrowImg"
-                        android:contentDescription="@string/app_name"
-                        android:visibility="invisible" />
-                </RelativeLayout>
 
-                <Button
-                    android:id="@+id/next_step_btn"
-                    android:layout_width="fill_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginRight="40dp"
-                    android:layout_marginTop="9dp"
-                    android:background="@drawable/bg_btn"
-                    android:gravity="center"
-                    android:textColor="@color/white" />
-
-                <Button
-                    android:id="@+id/look_location_btn"
-                    android:layout_width="fill_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginRight="40dp"
-                    android:background="@drawable/bg_btn"
-                    android:gravity="center"
-                    android:text="@string/look_friend_location"
-                    android:textColor="@color/white" />
-            </LinearLayout>
-        </ScrollView>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/item_height"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
+
+                <TextView
+                    android:id="@+id/email_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="邮箱"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/email_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="30dp"
+                    android:layout_toRightOf="@id/email_tag"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/email_img"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignTop="@id/email_tag"
+                    android:src="@drawable/phone" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+        </LinearLayout>
 
         <com.xzjmyk.pm.activity.view.DataLoadView
             android:id="@+id/data_load_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:visibility="gone" />
     </RelativeLayout>
 
 </LinearLayout>

WeiChat/src/main/res/values/strings.xml

@@ -329,7 +329,7 @@
     <string name="delete_failed">删除失败</string>
     <string name="select_failed">选取失败</string>
     <!-- BasicInfo -->
-    <string name="basic_info">基本资料</string>
+    <string name="basic_info">个人资料</string>
     <string name="name_align">昵&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;称</string>
     <string name="sex_align">性&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;别</string>
     <string name="birthday">出生日期</string>