处理登录bug问题，dex方法数超载解决；商务消息完成；

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java

@@ -72,6 +72,13 @@ public class DBManager {
         sta.executeInsert();
     }
 
+    public void deleteB2b(B2BMsg data) {
+        String table = "B2BMSG";
+        String[] whereArgs = {String.valueOf(data.getId()), data.getMaster()};
+        String whereClause = "id=? and b2b_master=? ";
+        db.delete(table, whereClause, whereArgs);
+    }
+
     /**
      * @author Administrator
      * @功能:增加组织架构---批量

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

@@ -515,9 +515,9 @@ public class MessageFragment extends EasyFragment {
                 convertView = createConvertView(position);
             }
             if (position % 2 == 0) {
-                convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color1));
-            } else {
                 convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color2));
+            } else {
+                convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color1));
             }
             ImageView avatar_img = ViewHolder.get(convertView, R.id.avatar_img);
             TextView num_tv = ViewHolder.get(convertView, R.id.num_tv);

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.message.uas;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Handler;
@@ -14,10 +15,12 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -33,6 +36,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.B2BMsg;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.MasterDialog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -96,30 +100,62 @@ public class B2bMsgActivity extends BaseActivity {
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
+                final BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
+
               /*  String phone = CommonUtil.getSharedPreferences(B2bMsgActivity.this, "user_phone");
                 String password = CommonUtil.getSharedPreferences(B2bMsgActivity.this, "user_password");
                 String url = "http://www.ubtob.com/signin#/redirect/" + phone + "/" + password;
                 ViewUtil.WebLinks(B2bMsgActivity.this, url, "我的商务");*/
                 B2BMsg msg = new B2BMsg();
+                Log.i("Arison", "id=" + holder.id);
                 msg.setId(holder.id);
                 msg.setMaster(CommonUtil.getSharedPreferences(B2bMsgActivity.this, "erp_master"));
                 msg.setContent(holder.tv_content.getText().toString());
                 msg.setHasRead(1);
                 Log.i("Arison", "" + holder.tv_content.getText().toString());
-                DBManager db = new DBManager(B2bMsgActivity.this);
+                final DBManager db = new DBManager(B2bMsgActivity.this);
                 db.updateB2b(msg);
-                new Handler().post(new Runnable() {
+
+                holder.iv_delete.setOnClickListener(new View.OnClickListener() {
                     @Override
-                    public void run() {
-                        initData(false);
+                    public void onClick(View v) {
+                        new MaterialDialog.Builder(B2bMsgActivity.this).
+                                title("友情提示").content("您确定删除本条商务消息")
+                                .negativeText("取消")
+                                .positiveText("删除")
+                                .callback(new MaterialDialog.ButtonCallback() {
+                                    @Override
+                                    public void onPositive(MaterialDialog dialog) {
+                                        super.onPositive(dialog);
+                                        B2BMsg msg = new B2BMsg();
+                                        msg.setId(holder.id);
+                                        msg.setMaster(CommonUtil.getSharedPreferences(B2bMsgActivity.this, "erp_master"));
+                                        db.deleteB2b(msg);
+                                        refreshUi();
+                                    }
+
+                                    @Override
+                                    public void onNegative(MaterialDialog dialog) {
+                                        super.onNegative(dialog);
+                                    }
+                                }).show();
                     }
                 });
+                refreshUi();
 //                startActivity(new Intent(BusinessDetailActivty.this, BusinessDetailInfoActivity.class));
             }
         });
     }
 
+    private void refreshUi() {
+        new Handler().post(new Runnable() {
+            @Override
+            public void run() {
+                initData(false);
+            }
+        });
+    }
+
     public DBManager db;
 
     private void initData(boolean update) {
@@ -146,7 +182,10 @@ public class B2bMsgActivity extends BaseActivity {
 
             }
         } else {
-
+            if (mAdapter != null) {
+                mData.clear();
+                mAdapter.notifyDataSetChanged();
+            }
         }
         new Handler().postDelayed(new Runnable() {
             @Override
@@ -192,6 +231,7 @@ public class B2bMsgActivity extends BaseActivity {
                 holder.tv_content = (TextView) convertView.findViewById(R.id.b2b_msg_content);
                 holder.tv_time = (TextView) convertView.findViewById(R.id.b2b_msg_time);
                 holder.ll_root = (LinearLayout) convertView.findViewById(R.id.ll_root);
+                holder.iv_delete = (ImageView) convertView.findViewById(R.id.iv_delete);
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();
@@ -214,6 +254,7 @@ public class B2bMsgActivity extends BaseActivity {
             LinearLayout ll_root;
             TextView tv_content;
             TextView tv_time;
+            ImageView iv_delete;
 
         }
     }
@@ -222,5 +263,12 @@ public class B2bMsgActivity extends BaseActivity {
     protected void onDestroy() {
         super.onDestroy();
         db.closeDB();
+        unregisterReceiver(mUpdateReceiver);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        MsgBroadcast.broadcastMsgUiUpdate(this);
     }
 }

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

@@ -27,17 +27,16 @@
             android:textColor="#FF8E57"
             android:text="商务消息" />
 
-        <TextView
-            android:visibility="gone"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+        <ImageView
+            android:id="@+id/iv_delete"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_margin="5dp"
+            android:padding="10dp"
             android:gravity="center"
-            android:text="未读"
             android:layout_gravity="end|right|center_vertical"
-            android:background="@drawable/shape_crm_round_new"
+            android:src="@drawable/delete"
             android:textColor="@color/white" />
     </RelativeLayout>
 

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

@@ -338,7 +338,7 @@
         android:id="@+id/rl_b2b_business"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
-        android:background="@color/item_color2"
+        android:background="@color/item_color1"
         android:descendantFocusability="blocksDescendants"
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
@@ -358,7 +358,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/tingyue" />
+                android:src="@drawable/my_shangwu" />
 
             <TextView
                 android:id="@+id/b2b_num_tv"