朋友圈自己发表内容不显示红点

WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/RecordController.java

@@ -1,6 +1,8 @@
 package com.xzjmyk.pm.activity.audio;
 
+import android.app.Activity;
 import android.content.Context;
+import android.support.v7.app.AppCompatActivity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Toast;

WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/UploadService.java

@@ -26,16 +26,6 @@ public class UploadService {
 	private static final String BOUNDARY = "------WebKitFormBoundarywL3jvc3wm30NCvQt"; // 数据分隔线
 
 	/**
-	 * @param 只发送普通数据
-	 *            ,调用此方法
-	 * @param urlString
-	 *            对应的Php 页面
-	 * @param params
-	 *            需要发送的相关数据 包括调用的方法
-	 * @param filePath
-	 *            图片或文件手机上的地址 如:sdcard/photo/123.jpg
-	 * @param pic
-	 *            图片名称
 	 * @return Json
 	 */
 	public String uploadFile(String uploadUrl, Map<String, String> params, List<String> filePathList) {
@@ -132,6 +122,7 @@ public class UploadService {
 				e.printStackTrace();
 			}
 		}
+
 		return result;
 	}
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -164,8 +164,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (UPDATA_LIST == requestCode){
-            if (mBusinessCircleFragment!=null){
+        if (UPDATA_LIST == requestCode) {
+            if (mBusinessCircleFragment != null) {
                 mBusinessCircleFragment.onResult();
             }
         }
@@ -263,14 +263,18 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 if (success) {
                     List<CircleMessage> datas = result.getData();
                     if (datas != null && datas.size() > 0) { // 没有更多数据
-                        long newTime = datas.get(0).getTime();  //获取最新时间
+                        CircleMessage data = datas.get(0);
+                        long newTime = data.getTime();  //获取最新时间
                         long oldTime = PreferenceUtils.getLong(mContext, TIME_MAIN); //获取以前时间
-
                         if (newTime > oldTime) {//当有新消息
-                            Log.i("gongpengming", "newTime=" + newTime + "@@@ oldTime=" + oldTime);
-                            unWorkReadTV.setVisibility(View.VISIBLE);
-                            timeMin = newTime;
-                            isUnReadWork = true;
+                            if (!data.getUserId().equals(MyApplication.getInstance().mLoginUser.getUserId())) {
+                                unWorkReadTV.setVisibility(View.VISIBLE);
+                                timeMin = newTime;
+                                isUnReadWork = true;
+                            }else{
+                                 PreferenceUtils.putLong(mContext, TIME_MAIN,newTime); //获取以前时间
+                            }
+
                         } else {
                             unWorkReadTV.setVisibility(View.GONE);
                             isUnReadWork = false;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/CardcastActivity.java

@@ -58,15 +58,15 @@ public class CardcastActivity extends BaseActivity implements View.OnClickListen
 //        }
         roomFragment = new RoomFragment();
         friendFragment = new FriendFragment();
-        attentionFragment = new AttentionFragment();
+//        attentionFragment = new AttentionFragment();
         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(friendFragment);
+//        bt.add(R.id.fl, attentionFragment);
+//        bt.hide(attentionFragment);
         bt.commit();
 
 
@@ -189,18 +189,16 @@ public class CardcastActivity extends BaseActivity implements View.OnClickListen
 //                btnG.setClickable(false);
 //                btnAG.setClickable(true);
 
-                bt.hide(friendFragment);
-                bt.show(attentionFragment);
+//                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);
-
+//                bt.hide(attentionFragment);
+//                bt.show(friendFragment);
                 break;
         }
         bt.commit();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/FriendFragment.java

@@ -214,13 +214,12 @@ public class FriendFragment extends EasyFragment {
 			@Override
 			public void run() {
 				long startTime = System.currentTimeMillis();
-				final List<Friend> friends = FriendDao.getInstance().getAllFriends(mLoginUserId);
+				final List<Friend> friends = FriendDao.getInstance().getFriends(mLoginUserId);
 
 				long delayTime = 200 - (startTime - System.currentTimeMillis());// 保证至少200ms的刷新过程
 				if (delayTime < 0) {
 					delayTime = 0;
 				}
-
 				mHandler.postDelayed(new Runnable() {
 					@Override
 					public void run() {
@@ -231,6 +230,7 @@ public class FriendFragment extends EasyFragment {
 								BaseSortModel<Friend> mode = new BaseSortModel<Friend>();
 								mode.setBean(friends.get(i));
 								setSortCondition(mode);
+
 								mSortFriends.add(mode);
 							}
 							Collections.sort(mSortFriends, mBaseComparator);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -25,22 +25,22 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.helper.UploadService;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.xzjmyk.pm.activity.view.SquareCenterImageView;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyGridView;
+import com.xzjmyk.pm.activity.view.SquareCenterImageView;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
@@ -52,367 +52,362 @@ import java.util.Map;
 
 /**
  * 发布一条说说的Activity
- * 
- * 
  */
 public class SendShuoshuoActivity extends BaseActivity {
-	private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
-	private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
-	private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
-
-	private EditText mTextEdit;
-	private TextView mSelectImagePromptTv;
-	private View mSelectImgLayout;
-	private MyGridView mGridView;
-	private Button mReleaseBtn;
-
-	private ArrayList<String> mPhotoList;
-	private GridViewAdapter mAdapter;
-	private String mImageData;
-
-	private int mType;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_send_shuoshuo);
-		if (getIntent() != null) {
-			mType = getIntent().getIntExtra("type", 0);
-		}
-		mPhotoList = new ArrayList<String>();
-		mAdapter = new GridViewAdapter();
-		mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
-		initView();
-	}
-
-	private void initView() {
-		if (mType == 0) {
-			getSupportActionBar().setTitle(R.string.send_text);
-		} else {
-			getSupportActionBar().setTitle(R.string.send_image);
-		}
-		mTextEdit = (EditText) findViewById(R.id.text_edit);
-		mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
-		mSelectImgLayout = findViewById(R.id.select_img_layout);
-		mGridView = (MyGridView) findViewById(R.id.grid_view);
-		mReleaseBtn = (Button) findViewById(R.id.release_btn);
+    private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
+    private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
+    private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
+
+    private EditText mTextEdit;
+    private TextView mSelectImagePromptTv;
+    private View mSelectImgLayout;
+    private MyGridView mGridView;
+    private Button mReleaseBtn;
+
+    private ArrayList<String> mPhotoList;
+    private GridViewAdapter mAdapter;
+    private String mImageData;
+
+    private int mType;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_send_shuoshuo);
+        if (getIntent() != null) {
+            mType = getIntent().getIntExtra("type", 0);
+        }
+        mPhotoList = new ArrayList<String>();
+        mAdapter = new GridViewAdapter();
+        mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
+        initView();
+    }
+
+    private void initView() {
+        if (mType == 0) {
+            getSupportActionBar().setTitle(R.string.send_text);
+        } else {
+            getSupportActionBar().setTitle(R.string.send_image);
+        }
+        mTextEdit = (EditText) findViewById(R.id.text_edit);
+        mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
+        mSelectImgLayout = findViewById(R.id.select_img_layout);
+        mGridView = (MyGridView) findViewById(R.id.grid_view);
+        mReleaseBtn = (Button) findViewById(R.id.release_btn);
 //       ToastUtil.addEditTextNumChanged(SendShuoshuoActivity.this, mTextEdit, 200);//这里复制粘贴过多字数会在有些机型上出现bug
-		mGridView.setAdapter(mAdapter);
-
-		if (mType == 0) {
-			mSelectImagePromptTv.setVisibility(View.GONE);
-			mSelectImgLayout.setVisibility(View.GONE);
-		}
-
-		mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				int viewType = mAdapter.getItemViewType(position);
-
-				if (viewType == 1) {
-					showSelectPictureDialog();
-				} else {
-					showPictureActionDialog(position);
-				}
-			}
-		});
-
-		mReleaseBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
-					return;
-				}
-				if (mPhotoList.size() <= 0) {// 发文字
-					sendShuoshuo();
-				} else {// 布图片+文字
-					new UploadPhpto().execute();
-				}
-
-			}
-		});
-	}
-
-	private void showPictureActionDialog(final int position) {
-		String[] items = new String[] { getString(R.string.look_over), getString(R.string.delete) };
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.pictures)
-				.setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (which == 0) {// 查看
-							Intent intent = new Intent(SendShuoshuoActivity.this, MultiImagePreviewActivity.class);
-							intent.putExtra(AppConstant.EXTRA_IMAGES, mPhotoList);
-							intent.putExtra(AppConstant.EXTRA_POSITION, position);
-							intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
-							startActivity(intent);
-						} else {// 删除
-							deletePhoto(position);
-						}
-						dialog.dismiss();
-					}
-				});
-		builder.show();
-	}
-
-	private void deletePhoto(final int position) {
-		mPhotoList.remove(position);
-		mAdapter.notifyDataSetInvalidated();
-	}
-
-	private void showSelectPictureDialog() {
-		String[] items = new String[] { getString(R.string.c_take_picture), getString(R.string.c_photo_album) };
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (which == 0) {
-							takePhoto();
-						} else {
-							selectPhoto();
-						}
-						dialog.dismiss();
-					}
-				});
-		builder.show();
-	}
-
-	private void takePhoto() {
-		mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
-		CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
-	}
-
-	private void selectPhoto() {
-		CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
-			if (resultCode == Activity.RESULT_OK) {
-				if (mNewPhotoUri != null) {
-					mPhotoList.add(mNewPhotoUri.getPath());
-					mAdapter.notifyDataSetInvalidated();
-				} else {
-					ToastUtil.showToast(this, R.string.c_take_picture_failed);
-				}
-			}
-		} else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 选择一张图片,然后立即调用裁减
-			if (resultCode == Activity.RESULT_OK) {
-				if (data != null && data.getData() != null) {
-					String path = CameraUtil.getImagePathFromUri(this, data.getData());
-					mPhotoList.add(path);
-					mAdapter.notifyDataSetInvalidated();
-				} else {
-					ToastUtil.showToast(this, R.string.c_photo_album_failed);
-				}
-			}
-		}
-
-	}
-
-	// 发布一条说说
-	public void sendShuoshuo() {
-		Map<String, String> params = new HashMap<String, String>();
-
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-
-		// 消息类型：1=文字消息；2=图文消息；3=语音消息；4=视频消息；
-		if (TextUtils.isEmpty(mImageData)) {
-			params.put("type", "1");
-		} else {
-			params.put("type", "2");
-		}
-
-		// 消息标记：1：求职消息；2：招聘消息；3：普通消息；
-		params.put("flag", "3");
-
-		// 消息隐私范围 0=不可见；1=朋友可见；2=粉丝可见；3=广场
-		params.put("visible", "3");
-
-		params.put("text", mTextEdit.getText().toString());// 消息内容
-
-		if (!TextUtils.isEmpty(mImageData)) {
-			params.put("images", mImageData);
-		}
-
-		// 附加信息
-		params.put("model", DeviceInfoUtil.getModel());
-		params.put("osVersion", DeviceInfoUtil.getOsVersion());
-		params.put("serialNumber", DeviceInfoUtil.getDeviceId(mContext));
-
-		double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-		double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-
-		if (latitude != 0)
-			params.put("latitude", String.valueOf(latitude));
-		if (longitude != 0)
-			params.put("longitude", String.valueOf(longitude));
-
-		String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
-		if (!TextUtils.isEmpty(address))
-			params.put("location", address);
-
-		Area area = Area.getDefaultCity();
-		if (area != null) {
-			params.put("cityId", String.valueOf(area.getId()));// 城市Id
-		} else {
-			params.put("cityId", "0");
-		}
-
-		ProgressDialogUtil.show(mProgressDialog);
-		StringJsonObjectRequest<String> request = new StringJsonObjectRequest<String>(mConfig.MSG_ADD_URL,
-				new Response.ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ToastUtil.showErrorNet(SendShuoshuoActivity.this);
-						ProgressDialogUtil.dismiss(mProgressDialog);
-					}
-				}, new StringJsonObjectRequest.Listener<String>() {
-					@Override
-					public void onResponse(ObjectResult<String> result) {
-						boolean parserResult = Result.defaultParser(SendShuoshuoActivity.this, result, true);
-						if (parserResult) {
-							Intent intent = new Intent();
-							intent.putExtra(AppConstant.EXTRA_MSG_ID, result.getData());
-							setResult(RESULT_OK, intent);
-							finish();
-						}
-						ProgressDialogUtil.dismiss(mProgressDialog);
-					}
-				}, String.class, params);
-		addDefaultRequest(request);
-	}
-
-	private ProgressDialog mProgressDialog;
-
-	private class UploadPhpto extends AsyncTask<Void, Integer, Integer> {
-		@Override
-		protected void onPreExecute() {
-			super.onPreExecute();
-			ProgressDialogUtil.show(mProgressDialog);
-		}
-
-		/**
-		 * 上传的结果： <br/>
-		 * return 1 Token过期，请重新登陆 <br/>
-		 * return 2 上传出错<br/>
-		 * return 3 上传成功<br/>
-		 */
-		@Override
-		protected Integer doInBackground(Void... params) {
-			if (!LoginHelper.isTokenValidation()) {
-				return 1;
-			}
-			Map<String, String> mapParams = new HashMap<String, String>();
-			mapParams.put("userId", MyApplication.getInstance().mLoginUser.getUserId() + "");
-			mapParams.put("access_token", MyApplication.getInstance().mAccessToken);
-
-			String result = new UploadService().uploadFile(mConfig.UPLOAD_URL, mapParams, mPhotoList);
-			Log.d("roamer", "上传图片消息：" + result);
-			if (TextUtils.isEmpty(result)) {
-				return 2;
-			}
-
-			UploadFileResult recordResult = JSON.parseObject(result, UploadFileResult.class);
-			boolean success = Result.defaultParser(SendShuoshuoActivity.this, recordResult, true);
-			if (success) {
-				if (recordResult.getSuccess() != recordResult.getTotal()) {// 上传丢失了某些文件
-					return 2;
-				}
-				if (recordResult.getData() != null) {
-					UploadFileResult.Data data = recordResult.getData();
-					if (data.getImages() != null && data.getImages().size() > 0) {
-						mImageData = JSON.toJSONString(data.getImages(), UploadFileResult.sImagesFilter);
-					}
-
-					Log.d("roamer", "mImageData:" + mImageData);
-					return 3;
-				} else {// 没有文件数据源，失败
-					return 2;
-				}
-			} else {
-				return 2;
-			}
-		}
-
-		@Override
-		protected void onPostExecute(Integer result) {
-			super.onPostExecute(result);
-			if (result == 1) {
-				ProgressDialogUtil.dismiss(mProgressDialog);
-				startActivity(new Intent(SendShuoshuoActivity.this, LoginActivity.class));
-			} else if (result == 2) {
-				ProgressDialogUtil.dismiss(mProgressDialog);
-				ToastUtil.showToast(SendShuoshuoActivity.this, getString(R.string.upload_failed));
-			} else {
-				sendShuoshuo();
-			}
-		}
-
-	}
-
-	private class GridViewAdapter extends BaseAdapter {
-
-		@Override
-		public int getCount() {
-			if (mPhotoList.size() >= 9) {
-				return 9;
-			}
-			return mPhotoList.size() + 1;
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return position;
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public int getViewTypeCount() {
-			return 2;
-		}
-
-		@Override
-		public int getItemViewType(int position) {
-			if (mPhotoList.size() == 0) {
-				return 1;// View Type 1代表添加更多的视图
-			} else if (mPhotoList.size() < 9) {
-				if (position < mPhotoList.size()) {
-					return 0;// View Type 0代表普通的ImageView视图
-				} else {
-					return 1;
-				}
-			} else {
-				return 0;
-			}
-		}
-
-		@Override
-		public View getView(final int position, View convertView, ViewGroup parent) {
-			if (getItemViewType(position) == 0) {// 普通的视图
-				SquareCenterImageView imageView = new SquareCenterImageView(SendShuoshuoActivity.this);
-				imageView.setScaleType(ScaleType.CENTER_CROP);
-				String url = mPhotoList.get(position);
-				if (url == null) {
-					url = "";
-				}
-				ImageLoader.getInstance().displayImage(Uri.fromFile(new File(url)).toString(), imageView);
-				return imageView;
-			} else {
-				View view = LayoutInflater.from(SendShuoshuoActivity.this).inflate(R.layout.layout_circle_add_more_item,
-						parent, false);
-				ImageView iconImageView = (ImageView) view.findViewById(R.id.icon_image_view);
-				TextView voiceTextTv = (TextView) view.findViewById(R.id.text_tv);
-				iconImageView.setBackgroundResource(R.drawable.add_picture);
-				voiceTextTv.setText(R.string.circle_add_image);
-				return view;
-			}
-		}
-
-	}
+        mGridView.setAdapter(mAdapter);
+
+        if (mType == 0) {
+            mSelectImagePromptTv.setVisibility(View.GONE);
+            mSelectImgLayout.setVisibility(View.GONE);
+        }
+
+        mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                int viewType = mAdapter.getItemViewType(position);
+
+                if (viewType == 1) {
+                    showSelectPictureDialog();
+                } else {
+                    showPictureActionDialog(position);
+                }
+            }
+        });
+
+        mReleaseBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
+                    return;
+                }
+                if (mPhotoList.size() <= 0) {// 发文字
+                    sendShuoshuo();
+                } else {// 布图片+文字
+                    new UploadPhpto().execute();
+                }
+
+            }
+        });
+    }
+
+    private void showPictureActionDialog(final int position) {
+        String[] items = new String[]{getString(R.string.look_over), getString(R.string.delete)};
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.pictures)
+                .setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {// 查看
+                            Intent intent = new Intent(SendShuoshuoActivity.this, MultiImagePreviewActivity.class);
+                            intent.putExtra(AppConstant.EXTRA_IMAGES, mPhotoList);
+                            intent.putExtra(AppConstant.EXTRA_POSITION, position);
+                            intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
+                            startActivity(intent);
+                        } else {// 删除
+                            deletePhoto(position);
+                        }
+                        dialog.dismiss();
+                    }
+                });
+        builder.show();
+    }
+
+    private void deletePhoto(final int position) {
+        mPhotoList.remove(position);
+        mAdapter.notifyDataSetInvalidated();
+    }
+
+    private void showSelectPictureDialog() {
+        String[] items = new String[]{getString(R.string.c_take_picture), getString(R.string.c_photo_album)};
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            takePhoto();
+                        } else {
+                            selectPhoto();
+                        }
+                        dialog.dismiss();
+                    }
+                });
+        builder.show();
+    }
+
+    private void takePhoto() {
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+        CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+    }
+
+    private void selectPhoto() {
+        CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
+            if (resultCode == Activity.RESULT_OK) {
+                if (mNewPhotoUri != null) {
+                    mPhotoList.add(mNewPhotoUri.getPath());
+                    mAdapter.notifyDataSetInvalidated();
+                } else {
+                    ToastUtil.showToast(this, R.string.c_take_picture_failed);
+                }
+            }
+        } else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 选择一张图片,然后立即调用裁减
+            if (resultCode == Activity.RESULT_OK) {
+                if (data != null && data.getData() != null) {
+                    String path = CameraUtil.getImagePathFromUri(this, data.getData());
+                    mPhotoList.add(path);
+                    mAdapter.notifyDataSetInvalidated();
+                } else {
+                    ToastUtil.showToast(this, R.string.c_photo_album_failed);
+                }
+            }
+        }
+
+    }
+
+    // 发布一条说说
+    public void sendShuoshuo() {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+
+        // 消息类型：1=文字消息；2=图文消息；3=语音消息；4=视频消息；
+        if (TextUtils.isEmpty(mImageData)) {
+            params.put("type", "1");
+        } else {
+            params.put("type", "2");
+        }
+
+        // 消息标记：1：求职消息；2：招聘消息；3：普通消息；
+        params.put("flag", "3");
+
+        // 消息隐私范围 0=不可见；1=朋友可见；2=粉丝可见；3=广场
+        params.put("visible", "3");
+
+        params.put("text", mTextEdit.getText().toString());// 消息内容
+
+        if (!TextUtils.isEmpty(mImageData)) {
+            params.put("images", mImageData);
+        }
+
+        // 附加信息
+        params.put("model", DeviceInfoUtil.getModel());
+        params.put("osVersion", DeviceInfoUtil.getOsVersion());
+        params.put("serialNumber", DeviceInfoUtil.getDeviceId(mContext));
+
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+
+        if (latitude != 0)
+            params.put("latitude", String.valueOf(latitude));
+        if (longitude != 0)
+            params.put("longitude", String.valueOf(longitude));
+
+        String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
+        if (!TextUtils.isEmpty(address))
+            params.put("location", address);
+
+        Area area = Area.getDefaultCity();
+        if (area != null) {
+            params.put("cityId", String.valueOf(area.getId()));//城市Id
+        } else {
+            params.put("cityId", "0");
+        }
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<String> request = new StringJsonObjectRequest<String>(mConfig.MSG_ADD_URL,
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ToastUtil.showErrorNet(SendShuoshuoActivity.this);
+                        ProgressDialogUtil.dismiss(mProgressDialog);
+                    }
+                }, new StringJsonObjectRequest.Listener<String>() {
+            @Override
+            public void onResponse(ObjectResult<String> result) {
+                boolean parserResult = Result.defaultParser(SendShuoshuoActivity.this, result, true);
+                if (parserResult) {
+                    Intent intent = new Intent();
+                    intent.putExtra(AppConstant.EXTRA_MSG_ID, result.getData());
+                    setResult(RESULT_OK, intent);
+                    finish();
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, String.class, params);
+        addDefaultRequest(request);
+    }
+
+    private ProgressDialog mProgressDialog;
+
+    private class UploadPhpto extends AsyncTask<Void, Integer, Integer> {
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            ProgressDialogUtil.show(mProgressDialog);
+        }
+
+        /**
+         * 上传的结果： <br/>
+         * return 1 Token过期，请重新登陆 <br/>
+         * return 2 上传出错<br/>
+         * return 3 上传成功<br/>
+         */
+        @Override
+        protected Integer doInBackground(Void... params) {
+            if (!LoginHelper.isTokenValidation()) {
+                return 1;
+            }
+            Map<String, String> mapParams = new HashMap<String, String>();
+            mapParams.put("userId", MyApplication.getInstance().mLoginUser.getUserId() + "");
+            mapParams.put("access_token", MyApplication.getInstance().mAccessToken);
+            String result = new UploadService().uploadFile(mConfig.UPLOAD_URL, mapParams, mPhotoList);
+            Log.d("roamer", "上传图片消息：" + result);
+            if (TextUtils.isEmpty(result)) {
+                return 2;
+            }
+
+            UploadFileResult recordResult = JSON.parseObject(result, UploadFileResult.class);
+            boolean success = Result.defaultParser(SendShuoshuoActivity.this, recordResult, true);
+            if (success) {
+                if (recordResult.getSuccess() != recordResult.getTotal()) {// 上传丢失了某些文件
+                    return 2;
+                }
+                if (recordResult.getData() != null) {
+                    UploadFileResult.Data data = recordResult.getData();
+                    if (data.getImages() != null && data.getImages().size() > 0) {
+                        mImageData = JSON.toJSONString(data.getImages(), UploadFileResult.sImagesFilter);
+                    }
+
+                    Log.d("roamer", "mImageData:" + mImageData);
+                    return 3;
+                } else {// 没有文件数据源，失败
+                    return 2;
+                }
+            } else {
+                return 2;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Integer result) {
+            super.onPostExecute(result);
+            if (result == 1) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                startActivity(new Intent(SendShuoshuoActivity.this, LoginActivity.class));
+            } else if (result == 2) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                ToastUtil.showToast(SendShuoshuoActivity.this, getString(R.string.upload_failed));
+            } else {
+                sendShuoshuo();
+            }
+        }
+
+    }
+
+    private class GridViewAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            if (mPhotoList.size() >= 9) {
+                return 9;
+            }
+            return mPhotoList.size() + 1;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return position;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 2;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            if (mPhotoList.size() == 0) {
+                return 1;// View Type 1代表添加更多的视图
+            } else if (mPhotoList.size() < 9) {
+                if (position < mPhotoList.size()) {
+                    return 0;// View Type 0代表普通的ImageView视图
+                } else {
+                    return 1;
+                }
+            } else {
+                return 0;
+            }
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            if (getItemViewType(position) == 0) {// 普通的视图
+                SquareCenterImageView imageView = new SquareCenterImageView(SendShuoshuoActivity.this);
+                imageView.setScaleType(ScaleType.CENTER_CROP);
+                String url = mPhotoList.get(position);
+                if (url == null) {
+                    url = "";
+                }
+                ImageLoader.getInstance().displayImage(Uri.fromFile(new File(url)).toString(), imageView);
+                return imageView;
+            } else {
+                View view = LayoutInflater.from(SendShuoshuoActivity.this).inflate(R.layout.layout_circle_add_more_item,
+                        parent, false);
+                ImageView iconImageView = (ImageView) view.findViewById(R.id.icon_image_view);
+                TextView voiceTextTv = (TextView) view.findViewById(R.id.text_tv);
+                iconImageView.setBackgroundResource(R.drawable.add_picture);
+                voiceTextTv.setText(R.string.circle_add_image);
+                return view;
+            }
+        }
+
+    }
 
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -68,14 +68,10 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         setting_rl.setOnClickListener(this);
         my_friend_rl.setOnClickListener(this);
 
-//        ViewAlphaUtil.setViewAlpha(my_data_rl);
-//        ViewAlphaUtil.setViewAlpha(rl_uas_sys);
-//        ViewAlphaUtil.setViewAlpha(goods_find);
         if (MainActivity.isUnReadWork)
             iv_remain.setVisibility(View.VISIBLE);
         else
             iv_remain.setVisibility(View.GONE);
-
     }
 
     @Override
@@ -88,8 +84,11 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 ct.startActivity(new Intent(ct, ErpMenActivity.class));
                 break;
             case R.id.my_friend_rl:
+
+
                 iv_remain.setVisibility(View.GONE);
                 MainActivity.isUnReadWork = false;
+
                 Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
                 intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
                 if (MainActivity.timeMin != -1 && MainActivity.timeMin != PreferenceUtils.getLong(getActivity(), MainActivity.TIME_MAIN)){

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

@@ -12,10 +12,10 @@
 
         <TextView
             android:id="@+id/tv_back"
-            android:clickable="true"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="15dp"
+            android:clickable="true"
             android:drawableLeft="@drawable/btn_back"
             android:gravity="center_vertical"
             android:text="我的关注"
@@ -25,7 +25,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <RadioButton
                 android:id="@+id/btn_mutual"
@@ -34,8 +35,7 @@
                 android:background="@drawable/bg_aguanzu"
                 android:button="@null"
                 android:checked="true"
-                android:clickable="true"
-              />
+                android:clickable="true" />
 
             <RadioButton
                 android:id="@+id/btn_Unilateral"
@@ -44,8 +44,7 @@
                 android:layout_toRightOf="@+id/btn_guanzu"
                 android:background="@drawable/bg_guanzu"
                 android:button="@null"
-                android:clickable="false"
-           />
+                android:clickable="false" />
         </RadioGroup>
     </RelativeLayout>
 

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

@@ -26,6 +26,8 @@
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
             android:hint="@string/search"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="10dp"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />

WeiChat/src/main/res/values/strings.xml

@@ -169,7 +169,7 @@
     <string name="cancel_attention_succ">取消关注成功</string>
     <string name="delete_all_succ">彻底删除成功</string>
     <string name="new_friend">新的朋友</string>
-    <string name="add_attention">加关注</string>
+    <string name="add_attention">加为好友</string>
     <string name="wait_verification">等待验证</string>
     <string name="add_attention_succ">加关注成功</string>
     <string name="add_attention_failed">加关注失败，你已被对方加入黑名单</string>