修改聊天界面备份

WeiChat/src/main/java/com/sk/weichat/ui/cardcast/CardcastActivity.java

@@ -1,25 +1,20 @@
 package com.sk.weichat.ui.cardcast;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBar.Tab;
+import android.util.Log;
 import android.view.View;
 import android.widget.RadioButton;
 
 import com.sk.weichat.R;
 import com.sk.weichat.bean.message.NewFriendMessage;
-import com.sk.weichat.broadcast.CardcastUiUpdateUtil;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.xmpp.CoreService;
 import com.sk.weichat.xmpp.CoreService.CoreServiceBinder;
@@ -28,7 +23,7 @@ import com.sk.weichat.xmpp.CoreService.CoreServiceBinder;
  * 我的名片盒
  */
 @SuppressWarnings("deprecation")
-public class CardcastActivity extends BaseActivity {
+public class CardcastActivity extends BaseActivity implements View.OnClickListener {
 
     private TabListener<FriendFragment> mFriend;
     private TabListener<AttentionFragment> mAttention;
@@ -41,7 +36,6 @@ public class CardcastActivity extends BaseActivity {
     private FriendFragment friendFragment;
     private AttentionFragment attentionFragment;
     private RoomFragment roomFragment;
-    private FragmentTransaction bt;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -66,49 +60,53 @@ public class CardcastActivity extends BaseActivity {
         roomFragment = new RoomFragment();
         friendFragment = new FriendFragment();
         attentionFragment = new AttentionFragment();
-        btnG = (RadioButton) findViewById(R.id.btn_guanzu);
-        btnAG = (RadioButton) findViewById(R.id.btn_aguanzu);
-        FragmentManager fm = getSupportFragmentManager();
-        bt = fm.beginTransaction();
+        findViewById(R.id.btn_mutual).setOnClickListener(this);
+        findViewById(R.id.tv_back).setOnClickListener(this);
+        findViewById(R.id.btn_Unilateral).setOnClickListener(this);
+
+        FragmentTransaction bt = getSupportFragmentManager().beginTransaction();
         bt.add(R.id.fl, friendFragment);
         bt.add(R.id.fl, attentionFragment);
-        bt.hide(roomFragment);
+        bt.hide(friendFragment);
         bt.commit();
-        findViewById(R.id.tv_back).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                CardcastActivity.this.finish();
-            }
-        });
-        btnG.setOnClickListener(new View.OnClickListener() {
-            @SuppressLint("NewApi")
-            @Override
-            public void onClick(View view) {
-                btnG.setClickable(false);
-                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu_pass));
-                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu));
-                btnAG.setClickable(true);
-                bt = getSupportFragmentManager().beginTransaction();
-                bt.hide(friendFragment);
-                bt.show(attentionFragment);
-                bt.commit();
 
-            }
-        });
-        btnAG.setOnClickListener(new View.OnClickListener() {
-            @SuppressLint("NewApi")
-            @Override
-            public void onClick(View view) {
-                btnAG.setClickable(false);
-                btnG.setClickable(true);
-                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu));
-                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu_pass));
-                bt = getSupportFragmentManager().beginTransaction();
-                bt.hide(attentionFragment);
-                bt.show(friendFragment);
-                bt.commit();
-            }
-        });
+
+//                new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                CardcastActivity.this.finish();
+//            }
+//        });
+
+//                new View.OnClickListener() {
+//            @SuppressLint("NewApi")
+//            @Override
+//            public void onClick(View view) {
+//                btnG.setClickable(false);
+//                btnAG.setClickable(true);
+//                Log.i("gongpengming", "btn_aguanzu and show the pager attentionFragment");
+//                bt = getSupportFragmentManager().beginTransaction();
+//
+//                bt.hide(friendFragment);
+//                bt.show(attentionFragment);
+//                bt.commit();
+//
+//            }
+//        });
+
+//                new View.OnClickListener() {
+//            @SuppressLint("NewApi")
+//            @Override
+//            public void onClick(View view) {
+//                btnAG.setClickable(false);
+//                btnG.setClickable(true);
+//                Log.i("gongpengming", "btn_guanzu and show the pager friendFragment");
+//                bt = getSupportFragmentManager().beginTransaction();
+//                bt.hide(attentionFragment);
+//                bt.show(friendFragment);
+//                bt.commit();
+//            }
+//        });
 
 //        Tab tab = actionBar.newTab().setText(R.string.focus_on_each_other).setTabListener(mFriend);
 //        actionBar.addTab(tab);
@@ -147,15 +145,15 @@ public class CardcastActivity extends BaseActivity {
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mBind) {
-            unregisterReceiver(mUpdateReceiver);
-            unbindService(mServiceConnection);
-        }
-    }
+//    @Override
+//    protected void onDestroy() {
+//        super.onDestroy();
+//
+//        if (mBind) {
+//            unregisterReceiver(mUpdateReceiver);
+//            unbindService(mServiceConnection);
+//        }
+//    }
 
     void sendNewFriendMessage(String toUserId, NewFriendMessage message) {
         if (mBind && mXmppService != null) {
@@ -163,22 +161,52 @@ public class CardcastActivity extends BaseActivity {
         }
     }
 
-    private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(CardcastUiUpdateUtil.ACTION_UPDATE_UI)) {
-                if (mAttention.getFragment() != null) {
-                    mAttention.getFragment().update();
-                }
-                if (mFriend.getFragment() != null) {
-                    mFriend.getFragment().update();
-                }
-                if (mRoom.getFragment() != null) {
-                    mRoom.getFragment().update();
-                }
-            }
+//    private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
+//        @Override
+//        public void onReceive(Context context, Intent intent) {
+//            if (intent.getAction().equals(CardcastUiUpdateUtil.ACTION_UPDATE_UI)) {
+//                if (mAttention.getFragment() != null) {
+//                    mAttention.getFragment().update();
+//                }
+//                if (mFriend.getFragment() != null) {
+//                    mFriend.getFragment().update();
+//                }
+//                if (mRoom.getFragment() != null) {
+//                    mRoom.getFragment().update();
+//                }
+//            }
+//        }
+//    };
+
+    @Override
+    public void onClick(View view) {
+        FragmentTransaction bt = getSupportFragmentManager().beginTransaction();
+        switch (view.getId()) {
+            case R.id.tv_back:
+                finish();
+                break;
+            case R.id.btn_mutual://相互
+                Log.i("gongpengming", "btn_mutual and show the pager attentionFragment");
+//                btnG.setClickable(false);
+//                btnAG.setClickable(true);
+
+                bt.hide(friendFragment);
+                bt.show(attentionFragment);
+                break;
+            case R.id.btn_Unilateral://单方
+                Log.i("gongpengming", "btn_guanzu and show the pager friendFragment");
+
+//                btnAG.setClickable(false);
+//                btnG.setClickable(true);
+
+                bt.hide(attentionFragment);
+                bt.show(friendFragment);
+
+                break;
         }
-    };
+        bt.commit();
+
+    }
 
     public static class TabListener<T extends Fragment> implements ActionBar.TabListener {
         private Fragment mFragment;

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

@@ -48,7 +48,6 @@ import com.sk.weichat.util.CameraUtil;
 import com.sk.weichat.util.Constants;
 import com.sk.weichat.util.TimeUtils;
 import com.sk.weichat.util.ToastUtil;
-import com.sk.weichat.util.ViewAlphaUtil;
 import com.sk.weichat.view.ChatBottomView;
 import com.sk.weichat.view.ChatBottomView.ChatBottomListener;
 import com.sk.weichat.view.ChatContentView;
@@ -198,11 +197,13 @@ public class ChatActivity extends ActionBackActivity
 
     private void initView() {
         String remarkName = mFriend.getRemarkName();
+        //TODO 修改顶栏
         if (remarkName == null) {
             getSupportActionBar().setTitle(mFriend.getNickName());
         } else {
             getSupportActionBar().setTitle(remarkName);
         }
+
         findViewById(R.id.root_view);
         mAuthStateTipTv = (TextView) findViewById(R.id.auth_state_tip);
         mChatContentView = (ChatContentView) findViewById(R.id.chat_content_view);

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

@@ -217,7 +217,6 @@ public class MessageFragment extends EasyFragment {
                 refreshUI();
             }
         });
-
         mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {

WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserListActivity.java

@@ -50,7 +50,7 @@ public class UserListActivity extends BaseActivity {
         getSupportActionBar().setTitle(R.string.search);
         if (getIntent() != null) {
             mKeyWord = getIntent().getStringExtra("key_word");
-            mSex = getIntent().getIntExtra("sex", -1);
+            mSex = getIntent().getIntExtra("sex", 2);
             mMinAge = getIntent().getIntExtra("min_age", 0);
             mMaxAge = getIntent().getIntExtra("max_age", 0);
             mShowTime = getIntent().getIntExtra("show_time", 0);
@@ -107,7 +107,7 @@ public class UserListActivity extends BaseActivity {
         if (!TextUtils.isEmpty(mKeyWord)) {
             params.put("nickname", mKeyWord);
         }
-        if (mSex !=-1) {
+        if (mSex !=2) {
             params.put("sex", String.valueOf(mSex));
         }
 

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

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/aguanzu_pass" android:state_pressed="true" />
-    <item android:drawable="@drawable/aguanzu_pass" android:state_checkable="false" />
-    <item android:drawable="@drawable/aguanzu_pass" android:state_checked="true" />
-    <item android:drawable="@drawable/aguanzu" android:state_checked="false" />
-    <item android:drawable="@drawable/aguanzu" android:state_checkable="true" />
-    <item android:drawable="@drawable/aguanzu"   />
+    <item android:drawable="@drawable/aguanzu_pass" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/aguanzu" />
+
 </selector>

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/guanzu_pass" android:state_pressed="true" />
-    <item android:drawable="@drawable/guanzu_pass" android:state_selected="true"/>
-    <item android:drawable="@drawable/guanzu" android:state_selected="false"/>
+    <item android:drawable="@drawable/guanzu_pass" android:state_checked="true" android:state_enabled="true" />
     <item android:drawable="@drawable/guanzu" />
 </selector>

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

@@ -7,7 +7,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#f2f2f2"
+        android:background="@drawable/bg_main"
         android:fillViewport="true">
 
         <LinearLayout
@@ -24,10 +24,6 @@
                     style="@style/form_relative_customer"
                     android:visibility="gone">
 
-                    <ImageView
-                        android:id="@+id/iv_order_no"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_order_no" />
 
                     <TextView
                         android:id="@+id/TextView01"
@@ -118,10 +114,6 @@
                     style="@style/form_relative_customer"
                     android:visibility="gone">
 
-                    <ImageView
-                        android:id="@+id/iv_set_i"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_write_bule" />
 
                     <TextView
                         android:id="@+id/tv_set_t"

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

@@ -28,20 +28,21 @@
             android:orientation="horizontal">
 
             <RadioButton
-                android:id="@+id/btn_aguanzu"
+                android:id="@+id/btn_mutual"
                 android:layout_width="70dp"
                 android:layout_height="35dp"
-                android:background="@drawable/aguanzu_pass"
+                android:background="@drawable/bg_aguanzu"
                 android:button="@null"
+                android:checked="true"
                 android:clickable="true"
               />
 
             <RadioButton
-                android:id="@+id/btn_guanzu"
+                android:id="@+id/btn_Unilateral"
                 android:layout_width="70dp"
                 android:layout_height="35dp"
                 android:layout_toRightOf="@+id/btn_guanzu"
-                android:background="@drawable/guanzu"
+                android:background="@drawable/bg_guanzu"
                 android:button="@null"
                 android:clickable="false"
            />