no message

app/res/layout/circle_new_tweeting.xml

@@ -10,8 +10,6 @@
         android:id="@+id/new_tweet_appbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -49,22 +47,30 @@
         android:orientation="horizontal"
         android:scrollbarAlwaysDrawHorizontalTrack="true"
         app:layout_constraintLeft_toLeftOf="@+id/new_tweet_content"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+        android:id="@+id/horizontalScrollView">
 
-        <LinearLayout
-            android:id="@+id/new_tweet_img_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/new_tweet_add_imgs"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:src="@drawable/circle_new_tweet_img" />
-        </LinearLayout>
     </HorizontalScrollView>
 
+    <GridLayout
+        android:id="@+id/new_tweet_img_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginStart="7dp"
+        android:columnCount="5"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toRightOf="@+id/horizontalScrollView"
+        app:layout_constraintTop_toBottomOf="@+id/horizontalScrollView">
+
+        <ImageView
+            android:id="@+id/new_tweet_add_imgs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/circle_new_tweet_img" />
+    </GridLayout>
+
 
     <LinearLayout
         android:id="@+id/linearLayout2"

app/res/layout/trade_change_priority.xml

@@ -52,7 +52,8 @@
             android:text="一天可发布三条"
             android:textAlignment="center"
             android:textColor="@android:color/holo_red_dark"
-            android:textSize="10sp" />
+            android:textSize="10sp"
+            android:visibility="gone"/>
 
     </LinearLayout>
 

app/src/com/sheishuo/app/core_module/circle/activity/NewTweetingActivity.java

@@ -13,6 +13,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.GridLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -24,6 +25,7 @@ import com.netease.nim.uikit.common.media.picker.model.PhotoInfo;
 import com.netease.nim.uikit.common.ui.dialog.DialogMaker;
 import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog;
 import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialogHelper;
+import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.netease.nim.uikit.session.activity.WatchPictureActivity;
 import com.netease.nim.uikit.session.constant.Extras;
 import com.sheishuo.app.R;
@@ -53,7 +55,7 @@ public class NewTweetingActivity extends SheishuoUI {
     private BaseToolbar toolbar;
     private EditText tweetContent;
     private TextView locationTV;
-    private LinearLayout imgsLayout;
+    private GridLayout imgsLayout;
     private ImageView addImg;
     private NewTweetPresenter presenter;
     private List<String> selectedPhotoPathList;
@@ -64,6 +66,7 @@ public class NewTweetingActivity extends SheishuoUI {
 //    private static MainActivity activity;
 
     private int maxNumImages = 9;
+    private int imgSize;
 
     public static void start(Context context) {
         start(context, null);
@@ -106,13 +109,15 @@ public class NewTweetingActivity extends SheishuoUI {
         toolbar = (BaseToolbar) findViewById(R.id.new_tweet_toolbar);
         tweetContent = (EditText) findViewById(R.id.new_tweet_content);
         locationTV = (TextView) findViewById(R.id.new_tweet_location_tv);
-        imgsLayout = (LinearLayout) findViewById(R.id.new_tweet_img_layout);
+        imgsLayout = (GridLayout) findViewById(R.id.new_tweet_img_layout);
         addImg = (ImageView) findViewById(R.id.new_tweet_add_imgs);
         checkBoxShowLoc = (CheckBox) findViewById(R.id.check_show_loc);
     }
 
     private void init() {
 
+        imgSize = (ImgUtil.getScreenWidth(context) - ScreenUtil.dip2px(16)) / 5;
+
         presenter = new NewTweetPresenter(this);
 
         toolbar.setTitle("发布");
@@ -153,11 +158,17 @@ public class NewTweetingActivity extends SheishuoUI {
         //初始化照片添加监听事件
         selectedPhotoPathList = new ArrayList<>();
         photoIds = new ArrayList<>();
+
+        GridLayout.LayoutParams layoutParams = (GridLayout.LayoutParams)addImg.getLayoutParams();
+        layoutParams.width = imgSize;
+        layoutParams.height = imgSize;
+        addImg.setLayoutParams(layoutParams);
         addImg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
                 PickImageHelper.PickImageOption option = new PickImageHelper.PickImageOption();
+                option.multiSelectMaxCount = 10 - imgsLayout.getChildCount();
                 PickImageHelper.pickImage(context, 0, option);
 
             }
@@ -216,7 +227,6 @@ public class NewTweetingActivity extends SheishuoUI {
 
     private ImageView createImageView(final String filePath)
     {
-        int imgSize = (int) ImgUtil.convertDpToPixel(60, context);
         selectedPhotoPathList.add(filePath);
 
         final ImageView imageView = new ImageView(this);
@@ -269,10 +279,10 @@ public class NewTweetingActivity extends SheishuoUI {
 
     private void checkAddImg()
     {
-        if(imgsLayout.getChildCount() >= maxNumImages + 1)
-            addImg.setVisibility(View.GONE);
-        else
-            addImg.setVisibility(View.VISIBLE);
+//        if(imgsLayout.getChildCount() >= maxNumImages + 1)
+//            addImg.setVisibility(View.GONE);
+//        else
+//            addImg.setVisibility(View.VISIBLE);
     }
 
     public void publish()

app/src/com/sheishuo/app/core_module/sheishuo/view/ui/TeamSettingsActivity.java

@@ -254,8 +254,16 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
         quitBtn.setOnClickListener(this);
 
         //加载类型
-        if (!isSystemTeam(team)) {
+        if (!SheishuoTeamMessageActivity.isSystemTeam(team)) {
             getTeamIntroductionTitleTV.setText("群公告");
+            if(team.getCreator().equals(AccountCache.getAccount().getId()))
+            {
+                quitBtn.setText("解散该群");
+            }
+            else
+            {
+                quitBtn.setText("退出该群");
+            }
         }
 
 
@@ -324,7 +332,13 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
                 showSelector(com.netease.nim.uikit.R.string.set_head_image, REQUEST_PICK_ICON);
                 break;
             case R.id.team_settings_quit_btn:
-                getTeamService().quitTeam(teamRoomId);
+                if(team.getCreator().equals(AccountCache.getAccount().getId()))
+                {
+                    getTeamService().dismissTeam(teamRoomId);
+                }
+                else {
+                    getTeamService().quitTeam(teamRoomId);
+                }
                 finish();
                 break;
             case R.id.team_settings_room_name_layout:
@@ -458,7 +472,7 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
 
     private void requestSystemTeamIntro()
     {
-        if(!isSystemTeam(team))
+        if(!SheishuoTeamMessageActivity.isSystemTeam(team))
             return;
 
         if(systemTeamIntro != null)
@@ -652,27 +666,6 @@ public class TeamSettingsActivity extends SheishuoUI implements View.OnClickList
 
 
     /**
-     * 判断是否为系统群
-     *
-     * @param team
-     * @return
-     */
-    public boolean isSystemTeam(Team team) {
-        if (team.getName().contains("国家")
-                || team.getName().contains("省")
-                || team.getName().contains("市")
-                || team.getName().contains("区")
-                || team.getName().contains("县")
-                || team.getName().contains("自治")
-                || team.getName().contains("特别行政区")) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
      * 清空聊天记录确认对话框
      */
     private void showClearChatHistoryDialog(){

app/src/com/sheishuo/app/core_module/trade/view/ui/activity/TradePublishActivity.java

@@ -18,6 +18,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.GridLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
@@ -33,6 +34,7 @@ import com.netease.nim.uikit.common.media.picker.model.PhotoInfo;
 import com.netease.nim.uikit.common.ui.dialog.DialogMaker;
 import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog;
 import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialogHelper;
+import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.netease.nim.uikit.session.activity.WatchPictureActivity;
 import com.netease.nim.uikit.session.constant.Extras;
 import com.sheishuo.app.R;
@@ -82,7 +84,8 @@ public class TradePublishActivity extends SheishuoUI {
 
     private TextView priorityTipTV,priorityTV,emptyTipTV,balanceTV,rechargeTV;
 
-    private LinearLayout photosLayout,tradeLayout,parentLayout;
+    private LinearLayout tradeLayout,parentLayout;
+    private GridLayout photosLayout;
 
     private String photosStr = "";
 
@@ -132,12 +135,13 @@ public class TradePublishActivity extends SheishuoUI {
         photosLayout = findView(R.id.gift_panel_photos_layout);
         balanceTV = findView(R.id.gift_panel_balance_TV);
         rechargeTV = findView(R.id.gift_panel_recharge_TV);
+        addImg = findView(R.id.gift_panel_add_img);
     }
 
 
     void init() {
 
-        imgSize = ImgUtil.getScreenWidth(context) / 9;
+        imgSize = (ImgUtil.getScreenWidth(context) - ScreenUtil.dip2px(16)) / 5;
 
         //设置父Layout
         parentLayout.setOnClickListener(new View.OnClickListener() {
@@ -258,19 +262,19 @@ public class TradePublishActivity extends SheishuoUI {
 
 
         //初始化photosLayout
-        addImg = new ImageView(this);
-        addImg.setAdjustViewBounds(true);
-        addImg.setImageResource(R.drawable.add_group_members);
-        addImg.setLayoutParams(new ViewGroup.LayoutParams(imgSize, imgSize));
+//        addImg = new ImageView(this);
+//        addImg.setAdjustViewBounds(true);
+//        addImg.setImageResource(R.drawable.add_group_members);
+//        addImg.setLayoutParams(new ViewGroup.LayoutParams(imgSize, imgSize));
         addImg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 PickImageHelper.PickImageOption option = new PickImageHelper.PickImageOption();
-                option.multiSelectMaxCount = 10 - photosLayout.getChildCount();
+                option.multiSelectMaxCount = 9 - photosLayout.getChildCount();
                 PickImageHelper.pickImage(context, 0, option);
             }
         });
-        photosLayout.addView(addImg);
+//        photosLayout.addView(addImg);
 
         UpdatePriorityProgress(1);
     }
@@ -362,7 +366,7 @@ public class TradePublishActivity extends SheishuoUI {
 
     private void checkAddImg()
     {
-        if(photosLayout.getChildCount() >= 9 + 1)
+        if(photosLayout.getChildCount() >= 9)
             addImg.setVisibility(View.GONE);
         else
             addImg.setVisibility(View.VISIBLE);

app/src/com/sheishuo/app/main/fragment/SessionListFragment.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -30,6 +31,7 @@ import com.netease.nimlib.sdk.auth.AuthServiceObserver;
 import com.netease.nimlib.sdk.auth.ClientType;
 import com.netease.nimlib.sdk.auth.OnlineClient;
 import com.netease.nimlib.sdk.msg.MsgService;
+import com.netease.nimlib.sdk.msg.SystemMessageService;
 import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
@@ -194,10 +196,13 @@ public class SessionListFragment extends MainTabFragment {
 
     private void updateRequestBadge()
     {
-        if(ContactsListActivity.requestBean == null)
-            return;
+        int count = 0;
+        if(ContactsListActivity.requestBean != null)
+        {
+            count = ContactsListActivity.requestBean.getD().size();
+        }
+        count += NIMClient.getService(SystemMessageService.class).querySystemMessageUnreadCountBlock();
 
-        int count = ContactsListActivity.requestBean.getD().size();
         dropFake.setText(""+count);
         dropFake.setVisibility(count>0?View.VISIBLE:View.GONE);
     }
@@ -234,20 +239,27 @@ public class SessionListFragment extends MainTabFragment {
             toolbar.setTitle("朋友");
 
             RelativeLayout relativeLayout = new RelativeLayout(getContext());
-            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ScreenUtil.dip2px(48), ScreenUtil.dip2px(48));
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ScreenUtil.dip2px(38), ScreenUtil.dip2px(48));
             relativeLayout.setLayoutParams(layoutParams);
 
+            LinearLayout linearLayout = new LinearLayout(getContext());
+            LinearLayout.LayoutParams linearParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+            linearParams.gravity = Gravity.CENTER;
+            linearLayout.setLayoutParams(linearParams);
+            relativeLayout.addView(linearLayout);
+
             ImageView listIcon = new ImageView(getContext());
             listIcon.setImageResource(R.drawable.friends_contacts_list_ico);
             LinearLayout.LayoutParams iconLayoutParams = new LinearLayout.LayoutParams(ScreenUtil.dip2px(28), ScreenUtil.dip2px(28));
-            iconLayoutParams.setMargins(ScreenUtil.dip2px(10), ScreenUtil.dip2px(10), ScreenUtil.dip2px(10), ScreenUtil.dip2px(10));
+//            iconLayoutParams.setMargins(ScreenUtil.dip2px(0), ScreenUtil.dip2px(0), ScreenUtil.dip2px(0), ScreenUtil.dip2px(0));
+            iconLayoutParams.gravity = Gravity.CENTER;
             listIcon.setLayoutParams(iconLayoutParams);
             listIcon.setEnabled(false);
-            relativeLayout.addView(listIcon);
+            linearLayout.addView(listIcon);
 
             dropFake = new DropFake(getContext(), null);
             LinearLayout.LayoutParams dropFakeLayoutParams = new LinearLayout.LayoutParams(ScreenUtil.dip2px(28), ScreenUtil.dip2px(28));
-            dropFakeLayoutParams.setMargins(ScreenUtil.dip2px(20), ScreenUtil.dip2px(0), ScreenUtil.dip2px(0), ScreenUtil.dip2px(10));
+            dropFakeLayoutParams.setMargins(ScreenUtil.dip2px(10), ScreenUtil.dip2px(0), ScreenUtil.dip2px(0), ScreenUtil.dip2px(10));
             dropFake.setLayoutParams(dropFakeLayoutParams);
             dropFake.setVisibility(View.GONE);
             dropFake.setEnabled(false);

uikit/res/drawable/nim_message_button_bottom_add_selector.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/nim_message_input_plus_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/nim_message_input_plus_pressed" android:state_focused="true"/>
-    <item android:drawable="@drawable/nim_message_input_plus"/>
-
+    <item android:state_pressed="true" android:drawable="@drawable/nim_message_input_plus_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/nim_message_input_plus_pressed" />
+    <item android:drawable="@drawable/nim_message_input_plus" />
 </selector>

uikit/res/layout/gift_panel.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -130,7 +131,8 @@
             android:enabled="false"
             android:text="一天可发布三条"
             android:textColor="@android:color/holo_red_dark"
-            android:textSize="10sp" />
+            android:textSize="10sp"
+            android:visibility="gone" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -147,6 +149,13 @@
                 android:textColor="@color/green_4DC0A4"
                 android:visibility="gone" />
 
+            <ImageView
+                android:id="@+id/gift_panel_add_img"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginRight="10dp"
+                app:srcCompat="@drawable/add_group_members" />
+
             <EditText
                 android:id="@+id/gift_panel_gift_message_ET"
                 android:layout_width="0dp"
@@ -154,7 +163,7 @@
                 android:layout_marginRight="5dp"
                 android:layout_weight="7"
                 android:background="@drawable/nim_progress_bar_background"
-                android:hint=""
+                android:hint="输入内容"
                 android:maxLines="3" />
 
             <Button
@@ -175,19 +184,23 @@
             android:enabled="false"
             android:text="长按图片可删除"
             android:textColor="@android:color/holo_red_dark"
-            android:textSize="10sp" />
+            android:textSize="10sp"
+            android:visibility="gone" />
+
+        <GridLayout
+            android:id="@+id/gift_panel_photos_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:columnCount="5"
+            android:orientation="horizontal">
+
+        </GridLayout>
 
         <HorizontalScrollView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
-            <LinearLayout
-                android:id="@+id/gift_panel_photos_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
 
-            </LinearLayout>
         </HorizontalScrollView>
     </LinearLayout>