1 改bug420 修复首页消息不一致的情况；通知公告二级菜单消息重复导致；

WeiChat/src/main/java/com/sk/weichat/db/dao/FriendDao.java

@@ -362,13 +362,16 @@ public class FriendDao {
 	}
 
 
-	/* 获取消息模块未读数量总和 */
+	/* 获取消息模块未读数量总和
+	 * 去除二级菜单 新闻，通知，公告的消息标识
+	 * */
 	public int getMsgUnReadNumTotal(String ownerId) {
 		try {
 			QueryBuilder<Friend, Integer> builder = friendDao.queryBuilder();
 			builder.selectRaw("sum(unReadNum)");
 			// 条件 好友status2，显示系统号8
-			builder.where().eq("ownerId", ownerId).and().ge("status", 2).and().le("status", 8);
+			builder.where().eq("ownerId", ownerId).and().ge("status", 2).and().le("status", 8)
+			.and().notIn("nickName","公告","新闻","通知");
 			GenericRawResults<String[]> results = friendDao.queryRaw(builder.prepareStatementString());
 			if (results != null) {
 				String[] first = results.getFirstResult();

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

@@ -25,116 +25,116 @@ import com.sk.weichat.ui.erp.view.EmptyLayout;
  * @author :LiuJie 2015年6月17日 下午5:23:22
  * @注释:logsDispaly 日志信息展示
  */
-public class LogsDisplayActivty extends BaseActivity implements OnClickListener{
-	
-
-	@ViewInject(R.id.lv_logs)
-	private ListView lv_logs;
-	public EmptyLayout mEmptyLayout;
-	Context ct;
-	
-	private LogsAdapter adapter;
-
-	@Override
-	public void onClick(View v) {
-	    switch (v.getId()) {
-		default:
-			break;
-		}
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		initView();
-		initData();
-	}
-
-	public void initView() {
-      setContentView(R.layout.act_log_list_view);
-      ViewUtils.inject(this);
-		ct=this;
-		getSupportActionBar().setTitle("操作日志");
-		mEmptyLayout=new EmptyLayout(this,lv_logs);
-	}
-
-	public void initData() {
-      Intent intent=getIntent();
-	  List<LogsEntity> logsList=(List<LogsEntity>) intent.getSerializableExtra("logslist");
-	  System.out.println("size:"+logsList.size());
-	  if (adapter==null) {
-		 adapter=new LogsAdapter(ct, logsList);
-		 lv_logs.setAdapter(adapter);
-		  if(adapter.getCount()==0){
-			  mEmptyLayout.setEmptyMessage("暂无数据!");
-		      mEmptyLayout.showEmpty();
-		    }
-	  }else{
-		adapter.notifyDataSetChanged();
-	  }
-	  
-	}
-
-	public class LogsAdapter extends BaseAdapter{
-		
-		private Context ct;
-		@SuppressWarnings("unused")
-		private LayoutInflater inflater;
-		private List<LogsEntity> list;
-		
-		public LogsAdapter(Context ct,List<LogsEntity> list) {
-			this.ct=ct;
-			this.list=list;
-			this.inflater = LayoutInflater.from(ct);
-		}
-
-		@Override
-		public int getCount() {
-			return list!=null?list.size():0;
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return list.get(position);
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public View getView(int position, View view, ViewGroup parent) {
-			Logs logs=null; 
-			if (view==null) {
-				logs=new Logs();
-				view=LayoutInflater.from(ct).inflate(R.layout.item_logs_view, parent,false);
-				logs.man=(TextView) view.findViewById(R.id.tv_man_value);
-				logs.date=(TextView) view.findViewById(R.id.tv_date_value);
-				logs.content=(TextView) view.findViewById(R.id.tv_content_value);
-				logs.result=(TextView) view.findViewById(R.id.tv_result_value);
-				
-				view.setTag(logs);
-			}else{
-				logs=(Logs) view.getTag();
-			}
-			
-			logs.man.setText(list.get(position).getMl_man());
-			logs.date.setText(new  SimpleDateFormat("yyyy-MM-mm HH:mm:ss").format(list.get(position).getMl_date()));
-			logs.content.setText(list.get(position).getMl_content());
-			logs.result.setText(list.get(position).getMl_result());
-			
-			return view;
-		}
-		
-		class Logs{
-            public TextView man;     
-            public TextView date;   
-            public TextView content;   
-            public TextView result;        
-		 }
-		
-		
-	}
-	
+public class LogsDisplayActivty extends BaseActivity implements OnClickListener {
+
+
+    @ViewInject(R.id.lv_logs)
+    private ListView lv_logs;
+    public EmptyLayout mEmptyLayout;
+    Context ct;
+
+    private LogsAdapter adapter;
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            default:
+                break;
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+    }
+
+    public void initView() {
+        setContentView(R.layout.act_log_list_view);
+        ViewUtils.inject(this);
+        ct = this;
+        getSupportActionBar().setTitle("操作日志");
+        mEmptyLayout = new EmptyLayout(this, lv_logs);
+    }
+
+    public void initData() {
+        Intent intent = getIntent();
+        List<LogsEntity> logsList = (List<LogsEntity>) intent.getSerializableExtra("logslist");
+        System.out.println("size:" + logsList.size());
+        if (adapter == null) {
+            adapter = new LogsAdapter(ct, logsList);
+            lv_logs.setAdapter(adapter);
+            if (adapter.getCount() == 0) {
+                mEmptyLayout.setEmptyMessage("暂无数据!");
+                mEmptyLayout.showEmpty();
+            }
+        } else {
+            adapter.notifyDataSetChanged();
+        }
+
+    }
+
+    public class LogsAdapter extends BaseAdapter {
+
+        private Context ct;
+        @SuppressWarnings("unused")
+        private LayoutInflater inflater;
+        private List<LogsEntity> list;
+
+        public LogsAdapter(Context ct, List<LogsEntity> list) {
+            this.ct = ct;
+            this.list = list;
+            this.inflater = LayoutInflater.from(ct);
+        }
+
+        @Override
+        public int getCount() {
+            return list != null ? list.size() : 0;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return list.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View view, ViewGroup parent) {
+            Logs logs = null;
+            if (view == null) {
+                logs = new Logs();
+                view = LayoutInflater.from(ct).inflate(R.layout.item_logs_view, parent, false);
+                logs.man = (TextView) view.findViewById(R.id.tv_man_value);
+                logs.date = (TextView) view.findViewById(R.id.tv_date_value);
+                logs.content = (TextView) view.findViewById(R.id.tv_content_value);
+                logs.result = (TextView) view.findViewById(R.id.tv_result_value);
+
+                view.setTag(logs);
+            } else {
+                logs = (Logs) view.getTag();
+            }
+
+            logs.man.setText(list.get(position).getMl_man());
+            logs.date.setText(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(list.get(position).getMl_date()));
+            logs.content.setText(list.get(position).getMl_content());
+            logs.result.setText(list.get(position).getMl_result());
+
+            return view;
+        }
+
+        class Logs {
+            public TextView man;
+            public TextView date;
+            public TextView content;
+            public TextView result;
+        }
+
+
+    }
+
 }

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

@@ -104,6 +104,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 					break;
 			   case LOG_SUCCESS:
 				String reString = msg.getData().getString("result");
+				   Log.i("liujie",reString);
 				Map<String, Object> rMap = FlexJsonUtil.fromJson(reString);
 				List<LogsEntity> logsList = FlexJsonUtil
 						.fromJsonArray(FlexJsonUtil.toJson(rMap.get("logs")),

build.gradle

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