5.11 好友名片缺乏userId

WeiChat/src/main/AndroidManifest.xml

@@ -222,8 +222,7 @@
             android:name="com.baidu.location.f"
             android:enabled="true"
             android:process=":remote" />
-
-        <meta-data
+  <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="KxANrz9HRWVqGGCm2cN8mXarpW0bBuYA" />
         <!-- 文件选择的activity -->

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

@@ -26,6 +26,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.ipaulpro.afilechooser.FileUtils;
@@ -775,6 +776,7 @@ public class ChatActivity extends ActionBackActivity
             return false;
         }
         if (mFriend.getUserId().compareToIgnoreCase(fromUserId) == 0) {// 是该人的聊天消息
+            Log.i("wang","单聊界面，新消息到来："+ JSON.toJSONString(message));
             mChatMessages.add(message);
             mChatContentView.notifyDataSetInvalidated(true);
             return true;

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

@@ -556,9 +556,6 @@ public class MessageFragment extends EasyFragment {
                 String numStr = friend.getUnReadNum() >= 99 ? "99+" : friend.getUnReadNum() + "";
                 num_tv.setText(numStr);
                 num_tv.setVisibility(View.VISIBLE);
-                if (friend.getUserId()==Friend.ID_ERP_ZHIHUI){
-                    content_tv.setText("您有" + numStr + "条新的消息");
-                }
             } else {
 //				if (friend.getUnReadNum()==0) {
 //					num_tv.setVisibility(View.VISIBLE);
@@ -761,7 +758,6 @@ public class MessageFragment extends EasyFragment {
                 case Constants.SUCCESS_LOGIN://公告
                     Log.i("MessageFragment", "接收公告");
                     updateGongGao(msg);
-
                     break;
                 case load_success_erpMsgNum://待办
                     getErpMsgNums(msg);
@@ -769,7 +765,6 @@ public class MessageFragment extends EasyFragment {
                 case Constants.LOAD_SUCCESS://通知
                     Log.i("MessageFragment", "接收通知");
                     updateNotice(msg);
-
                     break;
                 case Constants.SUCCESS_INITDATA://新闻
                     Log.i("MessageFragment", "接收新闻");
@@ -818,8 +813,8 @@ public class MessageFragment extends EasyFragment {
                     FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_GONGGAO);
                     FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, count);
                     FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_GONGGAO, count);
-                    updateZhihuMsg("您有新的消息");
                     updateGonggaoMsg("收到" + count + "条公告");
+                    updateZhihuMsg("通知,公告,新闻信息");
                 } else {
                     updateGonggaoMsg("暂无未读公告");
                     String owerId = MyApplication.getInstance().mLoginUser.getUserId();
@@ -870,10 +865,9 @@ public class MessageFragment extends EasyFragment {
                     FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NOTICE);
                     FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, count);
                     FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_NOTICE, count);
-                    updateZhihuMsg("您有新的消息");
                     updateNoticeMsg("收到" + count + "条通知");
+                    updateZhihuMsg("通知,公告,新闻信息");
                 } else {
-                    updateZhihuMsg("暂无消息");
                     updateNoticeMsg("暂无未读通知");
                     String owerId = MyApplication.getInstance().mLoginUser.getUserId();
                     FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NOTICE);
@@ -913,11 +907,11 @@ public class MessageFragment extends EasyFragment {
                    FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NEWS);
                    FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, count);
                    FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_NEWS, count);
-                   updateZhihuMsg("您有新的消息");
                    updateNewsMsg("收到" + count + "条新闻");
+                   updateZhihuMsg("通知,公告,新闻信息");
                } else {
-                   updateZhihuMsg("暂无消息");
                    updateNewsMsg("暂无未读新闻");
+                   updateZhihuMsg("通知,公告,新闻信息");
                    String owerId = MyApplication.getInstance().mLoginUser.getUserId();
                    FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NEWS);
                }

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

@@ -527,7 +527,7 @@ public class MucChatActivity extends ActionBackActivity
         }
         mHasSend = true;
         message.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));
-        if (isGroupChat && !TextUtils.isEmpty(mFriend.getRoomMyNickName())) {
+        if (isGroupChat && !TextUtils.isEmpty(mFriend.getRoomMyNickName())&&message.getType()!=XmppMessage.TYPE_CARD) {
             message.setFromUserName(mFriend.getRoomMyNickName());
         }
         ChatMessageDao.getInstance().saveNewSingleChatMessage(mLoginUserId, mUseId, message);
@@ -1000,7 +1000,7 @@ public class MucChatActivity extends ActionBackActivity
             ChatMessage message = new ChatMessage();
             message.setType(XmppMessage.TYPE_CARD);
             message.setFromUserName(card.getNickName());
-            message.setCardId(card.getUserId());
+            message.setCardId(card.getUserId());//
             message.setFromUserId(mLoginUserId);
             message.setMySend(true);
             message.setTimeSend(TimeUtils.sk_time_current_time());

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java

@@ -737,7 +737,22 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                             }
                         });
                     } else {
-                        locationViewHolder.chat_location.setVisibility(GONE);
+                        String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
+                        locationViewHolder.chat_location.setVisibility(VISIBLE);
+                        locationViewHolder.chat_address.setText(address);
+
+                        locationViewHolder.chat_location.setOnClickListener(new OnClickListener() {
+
+                            @Override
+                            public void onClick(View v) {
+                                // TODO Auto-generated method stub
+                                Intent intent = new Intent(mContext, BaiduMapActivity.class);
+                                intent.putExtra("latitude", Double.valueOf(message.getLocation_x()));
+                                intent.putExtra("longitude", Double.valueOf(message.getLocation_y()));
+                                intent.putExtra("userName", message.getFromUserName());
+                                mContext.startActivity(intent);
+                            }
+                        });
                     }
                     longView = locationViewHolder.chat_location;
                 }
@@ -1035,6 +1050,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                                 intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
                             } else {
                                 ViewUtil.ToastMessage(MyApplication.getInstance(), "不能查看名片！");
+                                intent.putExtra(AppConstant.EXTRA_USER_ID, message.getFromUserId());
                             }
                         } else {
                             Log.i("wang", "from me cardid=" + message.getCardId());

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XChatManager.java

@@ -125,7 +125,7 @@ public class XChatManager {
 		public void processMessage(Chat arg0, Message message) {
 			String from = message.getFrom();
 			String to = message.getTo();
-			Log.d("roamer","from:"+from+"to:"+to);
+			Log.i("roamer","message:"+JSON.toJSONString(message));
 			if (TextUtils.isEmpty(from) || TextUtils.isEmpty(to)) {
 				return;
 			}

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

@@ -14,9 +14,11 @@
             android:id="@+id/sendbd_send"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
+            android:layout_marginRight="10dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:text="发送"
+            android:gravity="center"
             android:textSize="@dimen/BigTextSize"
             />
         
@@ -26,6 +28,7 @@
             android:layout_height="fill_parent"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
+            android:gravity="center"
             android:text="定位"
             android:textSize="@dimen/BigTextSize"
             />

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }