fix bug

skWeiChatBaidu/src/main/java/com/liaobo/im/adapter/FriendSortAdapter.java

@@ -82,7 +82,7 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer {
             avatar_img.setVisibility(View.VISIBLE);
             avatar_imgS.setVisibility(View.GONE);
             if (friend.getUserId().equals(Friend.ID_SYSTEM_MESSAGE)) {
-                avatar_img.setImageResource(R.drawable.im_notice);
+                avatar_img.setImageResource(R.mipmap.icon);
             } else if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {
                 avatar_img.setImageResource(R.drawable.im_new_friends);
             } else if (friend.getIsDevice() == 1) {

skWeiChatBaidu/src/main/java/com/liaobo/im/helper/AvatarHelper.java

@@ -97,7 +97,7 @@ public class AvatarHelper {
         Integer ret = null;
         switch (userId) {
             case Friend.ID_SYSTEM_MESSAGE:
-                ret = R.drawable.im_notice;
+                ret = R.mipmap.icon;
                 break;
             case Friend.ID_NEW_FRIEND_MESSAGE:
                 ret = R.drawable.im_new_friends;
@@ -178,7 +178,7 @@ public class AvatarHelper {
 
     private boolean handlerSpecialAvatar(String userId, ImageView iv) {
         if (userId.equals(Friend.ID_SYSTEM_MESSAGE)) {
-            iv.setImageResource(R.drawable.im_notice);
+            iv.setImageResource(R.mipmap.icon);
             return true;
         } else if (userId.equals(Friend.ID_NEW_FRIEND_MESSAGE)) {
             iv.setImageResource(R.drawable.im_new_friends);

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/account/RegisterUserBasicInfoActivity.java

@@ -7,6 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -61,7 +62,12 @@ import org.apache.http.Header;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import de.greenrobot.event.Subscribe;
@@ -198,10 +204,10 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
         // 窗口的宽度
         int screenWidth = dm.widthPixels;
         // 设置头像宽高
-        LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) mAvatarImg.getLayoutParams();
-        linearParams.width = screenWidth;
-        linearParams.height = screenWidth;
-        mAvatarImg.setLayoutParams(linearParams);
+//        LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) mAvatarImg.getLayoutParams();
+//        linearParams.width = screenWidth;
+//        linearParams.height = screenWidth;
+//        mAvatarImg.setLayoutParams(linearParams);
 
         mAvatarImg.setOnClickListener(this);
         findViewById(R.id.sex_select_rl).setOnClickListener(this);
@@ -419,10 +425,10 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
             }
         }
 
-        if (!isSelectAvatar) {
-            DialogHelper.tip(this, getString(R.string.must_select_avatar_can_register));
-            return;
-        }
+//        if (!isSelectAvatar) {
+//            DialogHelper.tip(this, getString(R.string.must_select_avatar_can_register));
+//            return;
+//        }
 
         Map<String, String> params = new HashMap<>();
         // 前面页面传递的信息
@@ -493,9 +499,11 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
                         if (success) {
                             // 新注册的账号没有支付密码，
                             MyApplication.getInstance().initPayPassword(result.getData().getUserId(), 0);
+                            mCurrentFile = getDefaultAvatarFile();
+                            uploadAvatar(result.getData().getIsupdate(), mCurrentFile);
                             if (mCurrentFile != null && mCurrentFile.exists()) {
                                 // 选择了头像，那么先上传头像
-                                uploadAvatar(result.getData().getIsupdate(), mCurrentFile);
+
                                 return;
                             } else {
                                 // 没有选择头像，直接进入程序主页
@@ -618,6 +626,35 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
         });
         tipDialog.show();
     }
+    private File getDefaultAvatarFile(){
+        try {
+
+            InputStream inputStream = getAssets().open("default_avatar.png");
+
+            File appDir = new File(Environment.getExternalStorageDirectory(), "image");
+            if (!appDir.exists()) {
+                appDir.mkdir();
+            }
+            String avatarFileName =  "default_avatar.png";
+            File avatarFile = new File(appDir.getAbsolutePath(),avatarFileName);
+            if (avatarFile.exists()){
+                return avatarFile;
+            }
+            OutputStream outputStream = new FileOutputStream(avatarFile);
+            byte buffer[] = new byte[1024];
+            int length = 0;
+            while((length=inputStream.read(buffer)) > 0) {
+                outputStream.write(buffer,0,length);
+            }
+            outputStream.close();
+            inputStream.close();
+            return appDir;
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
     private void uploadAvatar(int isupdate, File file) {
         if (!file.exists()) {

skWeiChatBaidu/src/main/res/layout/activity_register_user_basic_info.xml

@@ -25,13 +25,14 @@
                 android:orientation="vertical">
 
                 <ImageView
+                    android:layout_margin="12dp"
                     android:id="@+id/avatar_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="168dp"
+                    android:layout_height="168dp"
                     android:layout_gravity="center_horizontal"
                     android:contentDescription="@string/app_name"
                     android:scaleType="fitXY"
-                    android:src="@drawable/avatar_normal" />
+                    android:src="@drawable/im_notice" />
 
                 <RelativeLayout
                     style="@style/IMTbleLine_UP"