Browse Source

no message

Junqin Wang 8 years ago
parent
commit
6b776d737c

+ 2 - 1
app/res/layout/area_groups_list_fragment.xml

@@ -17,7 +17,8 @@
             android:layout_height="wrap_content"
             android:background="@color/grey_light"
             android:gravity="center"
-            android:text="请输入群名字" />
+            android:text="请输入群名字"
+            android:visibility="gone"/>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/area_groups_recyclerview"

+ 10 - 11
app/res/layout/circle_of_friends_fragment.xml

@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main_content"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"
@@ -44,7 +43,7 @@
                     android:layout_marginLeft="40dp"
                     android:layout_marginBottom="40dp">
                     <ImageView
-                        android:id="@+id/activity_main_avatar"
+                        android:id="@+id/circle_avatar"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:textStyle="bold"
@@ -52,7 +51,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:text="冯超"
+                        android:text="用户昵称"
                         android:textSize="33sp"
                         android:gravity="center"
                         android:textColor="@android:color/white"
@@ -61,11 +60,11 @@
 
             </RelativeLayout>
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar_details"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:layout_collapseMode="pin" />
+            <!--<android.support.v7.widget.Toolbar-->
+                <!--android:id="@+id/toolbar_details"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="?attr/actionBarSize"-->
+                <!--app:layout_collapseMode="pin" />-->
         </android.support.design.widget.CollapsingToolbarLayout>
 
     </android.support.design.widget.AppBarLayout>
@@ -80,13 +79,13 @@
 
 
         <android.support.v7.widget.RecyclerView
-            android:id="@+id/activity_recyclerview"
+            android:id="@+id/circle_recyclerview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
     </LinearLayout>
 
     <android.support.design.widget.FloatingActionButton
-        android:id="@+id/activity_details_fab"
+        android:id="@+id/circle_fab"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         app:layout_anchor="@id/appbar"

+ 6 - 0
app/res/layout/circle_toolbar.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

+ 2 - 1
app/res/layout/main.xml

@@ -17,7 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:titleTextAppearance="@style/Toolbar.TitleText"/>
+            app:titleTextAppearance="@style/Toolbar.TitleText"
+            android:visibility="gone"/>
     </android.support.design.widget.AppBarLayout>
 
     <com.sheishuo.app.common.ui.viewpager.PagerSlidingTabStrip

File diff suppressed because it is too large
+ 14 - 0
app/src/com/sheishuo/app/common/beans/CircleBean.java


+ 1 - 0
app/src/com/sheishuo/app/main/activity/MainActivity.java

@@ -60,6 +60,7 @@ public class MainActivity extends SheishuoUI {
 
     private HomeFragment mainFragment;
 
+
     public static void start(Context context) {
         start(context, null);
     }

+ 10 - 7
app/src/com/sheishuo/app/main/fragment/CircleOfFriendsFragment.java

@@ -2,6 +2,7 @@ package com.sheishuo.app.main.fragment;
 
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,19 +18,21 @@ import com.sheishuo.app.main.model.MainTab;
 public class CircleOfFriendsFragment extends MainTabFragment {
 
     private FloatingActionButton fab;
+    private RecyclerView recyclerView;
+
 
     public CircleOfFriendsFragment(){
         setContainerId(MainTab.CIRCLE_OF_FRIENDS.fragmentId);
     }
     @Override
     protected void onInit() {
-        fab = (FloatingActionButton) getView().findViewById(R.id.activity_details_fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                System.out.println("FAB click");
-            }
-        });
+        findViews();
+
+    }
+
+    void findViews(){
+        fab = (FloatingActionButton) getView().findViewById(R.id.circle_fab);
+        recyclerView = (RecyclerView) getView().findViewById(R.id.circle_recyclerview);
     }
 
 

+ 31 - 20
app/src/com/sheishuo/app/main/fragment/HomeFragment.java

@@ -6,29 +6,13 @@ import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
-import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.netease.nim.uikit.NimUIKit;
-import com.netease.nim.uikit.session.SessionCustomization;
-import com.netease.nim.uikit.session.activity.TeamMessageActivity;
-import com.netease.nimlib.sdk.RequestCallback;
-import com.netease.nimlib.sdk.team.TeamService;
-import com.netease.nimlib.sdk.team.model.Team;
-import com.sheishuo.app.AccountCache;
-import com.sheishuo.app.SheishuoCache;
-import com.sheishuo.app.main.reminder.ReminderManager;
-import com.sheishuo.app.R;
-import com.sheishuo.app.common.ui.viewpager.FadeInOutPageTransformer;
-import com.sheishuo.app.common.ui.viewpager.PagerSlidingTabStrip;
-import com.sheishuo.app.main.adapter.MainTabPagerAdapter;
-import com.sheishuo.app.main.helper.SystemMessageUnreadManager;
-import com.sheishuo.app.main.model.MainTab;
-import com.sheishuo.app.main.reminder.ReminderItem;
 import com.netease.nim.uikit.common.fragment.TFragment;
 import com.netease.nim.uikit.common.ui.drop.DropCover;
 import com.netease.nim.uikit.common.ui.drop.DropManager;
@@ -40,11 +24,21 @@ import com.netease.nimlib.sdk.msg.SystemMessageObserver;
 import com.netease.nimlib.sdk.msg.SystemMessageService;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.RecentContact;
+import com.netease.nimlib.sdk.team.TeamService;
+import com.sheishuo.app.AccountCache;
+import com.sheishuo.app.R;
+import com.sheishuo.app.common.ui.viewpager.FadeInOutPageTransformer;
+import com.sheishuo.app.common.ui.viewpager.PagerSlidingTabStrip;
+import com.sheishuo.app.main.activity.MainActivity;
+import com.sheishuo.app.main.adapter.MainTabPagerAdapter;
+import com.sheishuo.app.main.helper.SystemMessageUnreadManager;
+import com.sheishuo.app.main.model.MainTab;
+import com.sheishuo.app.main.reminder.ReminderItem;
+import com.sheishuo.app.main.reminder.ReminderManager;
+import com.sheishuo.app.uikit_implements.SheishuoToolbarOptions;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by KN on 2017/7/17.
@@ -148,6 +142,7 @@ public class HomeFragment extends TFragment implements OnPageChangeListener, Rem
     }
 
 
+
     @Override
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
         // TO TABS
@@ -155,6 +150,7 @@ public class HomeFragment extends TFragment implements OnPageChangeListener, Rem
 
         // TO ADAPTER
         adapter.onPageScrolled(position);
+
     }
 
     @Override
@@ -164,12 +160,27 @@ public class HomeFragment extends TFragment implements OnPageChangeListener, Rem
 
         selectPage(position);
 
+        //朋友圈专用Toolbar
+        if (3==position){
+            getToolbar().setTitle("朋友圈");
+            getToolbar().setTitleTextColor(getResources().getColor(R.color.white));
+            getToolbar().setLogo(R.drawable._04_checked);
+        }
 
         navigationView.setSelectedItemId(navigationbarItemList.get(position));
-
         enableMsgNotification(false);
     }
 
+
+    public Toolbar getToolbar(){
+        return ((MainActivity)getActivity()).getToolBar();
+    }
+
+    public void setToolbar(SheishuoToolbarOptions options){
+
+    }
+
+
     @Override
     public void onPageScrollStateChanged(int state) {
         // TO TABS

+ 1 - 2
app/src/com/sheishuo/app/uikit_implements/SheishuoUI.java

@@ -51,8 +51,7 @@ public class SheishuoUI extends UI {
         toolbar = (Toolbar) findViewById(toolBarId);
         toolbar.setBackgroundColor(getResources().getColor(options.backgroundColor));
         toolbar.setTitleTextColor(getResources().getColor(options.titleColor));
-
-        setTransparentStatusBar();
+        //setTransparentStatusBar();
 
     }
 

Some files were not shown because too many files changed in this diff