修复测试bug

WeiChat/src/main/java/com/sk/weichat/adapter/FriendSortAdapter.java

@@ -2,13 +2,11 @@ package com.sk.weichat.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
 
@@ -16,7 +14,6 @@ import com.sk.weichat.R;
 import com.sk.weichat.bean.Friend;
 import com.sk.weichat.helper.AvatarHelper;
 import com.sk.weichat.sortlist.BaseSortModel;
-import com.sk.weichat.util.ViewAlphaUtil;
 import com.sk.weichat.util.ViewHolder;
 
 import java.util.HashMap;
@@ -69,7 +66,6 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer {
             isFrist = true;
         }
 //        if (isLog.get(position) == null || isLog.get(position).isEmpty()) {
-
 //            if (isFrist) {
 //                isLog.put(position, "true");
 //                RelativeLayout relativeLayout= (RelativeLayout) convertView.findViewById(R.id.rela);

WeiChat/src/main/java/com/sk/weichat/ui/circle/BasicInfoActivity.java

@@ -1,5 +1,7 @@
 package com.sk.weichat.ui.circle;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.ComponentName;
@@ -7,6 +9,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.text.InputFilter;
@@ -106,6 +109,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 		}
 	};
 
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	@SuppressLint("NewApi")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/CommonFragmentActivity.java

@@ -22,6 +22,7 @@ public class CommonFragmentActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_common_fragment);
+        getSupportActionBar().setTitle("我的群组");
         ViewUtils.inject(this);
         initView();
     }

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.java

@@ -377,6 +377,7 @@ public class CompanyContactsActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.act_staff_query_list);
         ViewUtils.inject(this);
+        getSupportActionBar().setTitle("企业通讯录");
         ct = this;
         manager = new DBManager(ct);
         mInflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/MyFriendActivity.java

@@ -83,6 +83,7 @@ public class MyFriendActivity extends BaseActivity  {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fragment_friend);
+        getSupportActionBar().setTitle("我的好友");
         mSortFriends = new ArrayList<BaseSortModel<Friend>>();
         mBaseComparator = new BaseComparator<Friend>();
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();

WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java

@@ -518,10 +518,10 @@ public class MessageFragment extends EasyFragment {
             } else {// 这是1个房间
                 if (TextUtils.isEmpty(friend.getRoomCreateUserId())) {
                     //					avatar_img.setImageResource(R.drawable.avatar_normal);
-                    avatar_img.setImageResource(R.drawable.friend_u);
+                    avatar_img.setImageResource(R.drawable.qunliao);
                 } else {
                     //					AvatarHelper.getInstance().displayAvatar(friend.getRoomCreateUserId(), avatar_img, true);// 目前在备注名放房间的创建者Id
-                    avatar_img.setImageResource(R.drawable.friend_u);
+                    avatar_img.setImageResource(R.drawable.qunliao);
                 }
             }
             nick_name_tv.setText(friend.getRemarkName() != null ? friend.getRemarkName() : friend.getNickName());

WeiChat/src/main/java/com/sk/weichat/ui/message/MucChatActivity.java

@@ -88,12 +88,12 @@ public class MucChatActivity extends ActionBackActivity
     private String mLoginUserId;
     private String mLoginNickName;
     private List<ChatMessage> mChatMessages;// 存储聊天消息
-    private Handler mHandler = new Handler(){
+    private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             //TODO 群聊时发送百度推送
-            if(msg.what==5){
-            }else{
+            if (msg.what == 5) {
+            } else {
             }
 
         }
@@ -255,7 +255,7 @@ public class MucChatActivity extends ActionBackActivity
         // TODO Auto-generated method stub
         super.onResume();
         /*
-		 * String roomName = MyApplication.getInstance().roomName;
+         * String roomName = MyApplication.getInstance().roomName;
 		 * updateUi(roomName);
 		 */
     }
@@ -271,6 +271,8 @@ public class MucChatActivity extends ActionBackActivity
         if (item.getItemId() == R.id.room_info) {
             Intent intent = new Intent(this, RoomInfoActivity.class);
             intent.putExtra(AppConstant.EXTRA_USER_ID, mUseId);
+            if (mNickName!=null&&mNickName.length()>0)
+            intent.putExtra(RoomInfoActivity.ROOM_NAME, mNickName);
             startActivity(intent);
             return true;
         }
@@ -493,7 +495,7 @@ public class MucChatActivity extends ActionBackActivity
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("text", JSON.toJSONString(str));
         params.put("body", body);
-        Log.i("push", "推送百度 from:" + from + "to:" + to + "body:" + body+"text:"+
+        Log.i("push", "推送百度 from:" + from + "to:" + to + "body:" + body + "text:" +
                 JSON.toJSONString(str));
         ViewUtil.httpSendRequest(this, url, params, mHandler, null, 5, null, null, "get");
     }
@@ -517,8 +519,8 @@ public class MucChatActivity extends ActionBackActivity
                 if (success && result.getData() != null) {
                     List<MucRoomMember> members = result.getData().getMembers();
                     int[] str = new int[members.size() - 1];
-                    for (int i = 0,j=0; i < members.size(); i++) {
-                        if (!members.get(i).getUserId().equals(MucChatActivity.this.mLoginUserId)){
+                    for (int i = 0, j = 0; i < members.size(); i++) {
+                        if (!members.get(i).getUserId().equals(MucChatActivity.this.mLoginUserId)) {
                             str[j] = Integer.parseInt(members.get(i).getUserId());
                             j++;
                         }

WeiChat/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java

@@ -95,13 +95,16 @@ public class RoomInfoActivity extends BaseActivity {
 
     private boolean mXmppBind;
     private CoreService mCoreService;
+    public final static String ROOM_NAME = "ROOMNAME";
 
     @Override
+
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_room_info);
         if (getIntent() != null) {
             mRoomJid = getIntent().getStringExtra(AppConstant.EXTRA_USER_ID);
+            getSupportActionBar().setTitle(getIntent().getStringExtra(ROOM_NAME));
         }
         if (TextUtils.isEmpty(mRoomJid)) {
             return;
@@ -111,10 +114,8 @@ public class RoomInfoActivity extends BaseActivity {
         if (mRoom == null || TextUtils.isEmpty(mRoom.getRoomId())) {
             return;
         }
-
         // 绑定服务
         mXmppBind = bindService(CoreService.getIntent(), mXmppServiceConnection, BIND_AUTO_CREATE);
-
         initView();
         loadMembers();
     }
@@ -559,7 +560,7 @@ public class RoomInfoActivity extends BaseActivity {
                 }
             } else {
                 // String id=ChatJID.getID(mOccupants.get(position).getJid());
-                tvName.setText( mMembers.get(position).getNickName());
+                tvName.setText(mMembers.get(position).getNickName());
                 AvatarHelper.getInstance().displayAvatar(mMembers.get(position).getUserId(), imageView, true);
                 if (doDel | doBannedVoice) {
                     button.setVisibility(View.VISIBLE);

WeiChat/src/main/res/drawable/bg_btn.xml

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:drawable="@color/btn_login_press" android:state_pressed="true"/>
-    <item android:drawable="@color/btn_login_nomarl" android:state_pressed="false"/>
-    <item android:drawable="@color/btn_login_nomarl"  />
+    <selector xmlns:android="http://schemas.android.com/apk/res/android">
+        <item android:state_pressed="true">
+            <shape>
+                <solid android:color="@color/btn_login_press" />
+                <corners android:radius="8dp" />
+                <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+            </shape>
+        </item>
+        <item>
+            <shape>
+                <solid android:color="@color/btn_login_nomarl" />
+                <corners android:radius="8dp" />
+                <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+            </shape>
+        </item>
 </selector>

WeiChat/src/main/res/drawable/btn_bg_public.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_login_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/btn_login_nomarl" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -10,6 +10,7 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/ic_top"
         android:fillViewport="true"
+        android:layout_above="@+id/bottom_include"
         android:scrollbars="none">
 
         <LinearLayout
@@ -61,6 +62,7 @@
     </com.sk.weichat.ui.erp.view.CustomerScrollView>
 
     <include
+        android:id="@+id/bottom_include"
         layout="@layout/act_bottom_item_detail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"