5.11 自动创建管理群；

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "com.xzjmyk.pm.activity"
-        minSdkVersion 9
+        minSdkVersion 8
         targetSdkVersion 22
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7

WeiChat/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="35"
-    android:versionName="3.5" >
+    android:versionCode="36"
+    android:versionName="3.6" >
 
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="22" />
-
+b
     <!-- 拨打电话 -->
     <uses-permission android:name="android.permission.CALL_PHONE" />
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -38,7 +38,7 @@ public class BdLocationHelper {
 		mLocationClient = new LocationClient(context); // 声明LocationClient类
 		mLocationClient.registerLocationListener(mMyLocationListener); // 注册监听函数
 		LocationClientOption option = new LocationClientOption();
-		option.setLocationMode(LocationMode.Battery_Saving);// 设置定位模式
+		option.setLocationMode(LocationMode.Hight_Accuracy);// 设置定位模式
 		option.setCoorType("bd09ll");// 返回的定位结果是百度经纬度,默认值gcj02
 		option.setScanSpan(5000);// 设置发起定位请求的间隔时间为10s
 		option.setIsNeedAddress(true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/FriendSortAdapter.java

@@ -14,6 +14,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ViewHolder;
 
 import java.util.HashMap;
@@ -97,6 +98,8 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer {
                 avatar_img.setImageResource(R.drawable.im_notice);
             } else if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友的头像
                 avatar_img.setImageResource(R.drawable.im_new_friends);
+            } else if( Integer.valueOf(friend.getUserId())==0){
+               avatar_img.setImageResource(com.xzjmyk.pm.activity.R.drawable.avatar_normal);
             } else {// 其他
                 if (isRefeshed) {
                     AvatarHelper.getInstance().display(friend.getUserId(), avatar_img, true, true);//设定为每次刷新都会去删除缓存重新获取数据

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

@@ -11,12 +11,15 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.groupchat.AutoCreateChatFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 
 public class CommonFragmentActivity extends BaseActivity {
 
     @ViewInject(R.id.fl_content)
     private FrameLayout fl_content;
+    private int type;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -32,10 +35,21 @@ public class CommonFragmentActivity extends BaseActivity {
      * @author：Administrator on 2016/2/17 10:34
      */
     public void initView() {
-        GroupChatFragment groupChatFrament = new GroupChatFragment();
-        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        fragmentTransaction.replace(R.id.fl_content, groupChatFrament);
-        fragmentTransaction.commit();
+        type=getIntent().getIntExtra("type", Constants.TYPE_CHAT_All);
+        switch (type){
+          case Constants.TYPE_CHAT_All:
+              GroupChatFragment groupChatFrament = new GroupChatFragment();
+              FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+              fragmentTransaction.replace(R.id.fl_content, groupChatFrament);
+              fragmentTransaction.commit();
+              break;
+         case Constants.TYPE_CHAT_MANAGE:
+             AutoCreateChatFragment manageChatFrament = new AutoCreateChatFragment();
+             fragmentTransaction = getSupportFragmentManager().beginTransaction();
+             fragmentTransaction.replace(R.id.fl_content, manageChatFrament);
+             fragmentTransaction.commit();
+            break;
+       }
     }
 
 

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

@@ -13,7 +13,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 34;//数据库版本号
+    private static final int DATABASE_VERSION = 36;//数据库版本号
     public static String dataBaseName = "erp.db";//数据库名称
     public Context context;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -94,4 +94,11 @@ public class Constants {
         String baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
         return baseUrl;
     }
+    
+    /**
+     * @desc:常量
+     * @author：Administrator on 2016/5/13 10:21
+     */
+    public final static int TYPE_CHAT_MANAGE=2;
+    public final static int TYPE_CHAT_All=1;
 }

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

@@ -551,6 +551,7 @@ public class MucChatActivity extends ActionBackActivity
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("text", JSON.toJSONString(str));
         params.put("body", body);
+        params.put("roomid",mFriend.getRoomId());
         Log.i("push", "推送百度 from:" + from + "to:" + to + "body:" + body + "text:" +
                 JSON.toJSONString(str));
         ViewUtil.httpSendRequest(this, url, params, mHandler, null, 5, null, null, "get");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/nearby/UserSearchActivity.java

@@ -53,7 +53,7 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
     }
 
     private void reset() {
-        mSex = 0;
+        mSex = 2;
         mMinAge = 0;
         mMaxAge = 200;
         mShowTime = 0;

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

@@ -66,7 +66,7 @@
     <string name="please_input_keyword">请输入关键字</string>
 
     <!-- SpalshActivity -->
-    <string name="login">登陆</string>
+    <string name="login">登录</string>
     <string name="register">注册</string>
     <!-- LoginActivity -->
     <string name="user_telphone_login">使用手机号登录</string>