[增加]主页功能按钮移至Menu按钮点击悬浮窗中

app/src/main/AndroidManifest.xml

@@ -276,7 +276,7 @@
         <activity
                 android:name="com.sheep.gamegroup.view.activity.ActAudit"
                 android:screenOrientation="portrait"
-                android:theme="@style/AppActionTheme"/>
+                android:theme="@style/AppTheme"/>
         <activity
                 android:name="com.sheep.gamegroup.view.activity.GameTaskOrderListAct"
                 android:screenOrientation="portrait"

app/src/main/java/com/sheep/gamegroup/module/guide/NewbieGuideHelper.java

@@ -164,7 +164,7 @@ public class NewbieGuideHelper {
         return GuidePage.newInstance()//创建一个实例
                 .addHighLightWithOptions(ActMain.tabBtn1.get(), HighLight.Shape.CIRCLE, new HighlightOptions.Builder().setRelativeGuide(relativeGuide3).useMaxSize(false).build())
                 //.addHighLightWithOptions(FgtMainHeader.msgRef.get(), HighLight.Shape.CIRCLE, new HighlightOptions.Builder().setRelativeGuide(relativeGuide2).useMaxSize(true).build())
-//                .addHighLightWithOptions(FgtHome.newsRef.get(), HighLight.Shape.OVAL, new HighlightOptions.Builder().setRelativeGuide(relativeGuide1).useMaxSize(false).setOffsetLeft(0.2f).setOffsetWidth(0.6f).build())
+                //.addHighLightWithOptions(FgtHome.newsRef.get(), HighLight.Shape.OVAL, new HighlightOptions.Builder().setRelativeGuide(relativeGuide1).useMaxSize(false).setOffsetLeft(0.2f).setOffsetWidth(0.6f).build())
                 .setEnterAnimation(enterAnimation)//进入动画
                 .setExitAnimation(exitAnimation);//退出动画;
     }
@@ -212,6 +212,7 @@ public class NewbieGuideHelper {
         return GuidePage.newInstance()//创建一个实例
                 .addHighLightWithOptions(FgtPersonalCenter.myMoneyRef.get(), HighLight.Shape.RECTANGLE, new HighlightOptions.Builder().setRelativeGuide(relativeGuide).build())
                 .setLayoutRes(R.layout.newbie_guide_cancel)
+                .setLayoutRes(R.layout.newbie_guide_cancel)
                 .setOnLayoutInflatedListener(new OnBackgroundListener())
                 .setEnterAnimation(enterAnimation)//进入动画
                 .setExitAnimation(exitAnimation);//退出动画

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtHome.java

@@ -1,49 +1,25 @@
 package com.sheep.gamegroup.module.home.fragment;
 
-import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
-
-import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActMsg;
-import com.sheep.gamegroup.view.dialog.DialogNotificationOfArrival;
 import com.sheep.gamegroup.view.fragment.FgtFind;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-
 import java.lang.ref.WeakReference;
-import java.util.Locale;
-
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-import rx.functions.Action1;
 
 public class FgtHome extends BaseFragment {
 

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtMainHeader.java

@@ -61,6 +61,8 @@ public class FgtMainHeader extends BaseFragment {
     @BindView(R.id.view_anchor)
     View anchorView;
 
+    public static WeakReference<View> downloadRef;
+    public static WeakReference<View> msgRef;
     TextView tv_msg_count;
     TextView tv_download_count;
 
@@ -232,6 +234,8 @@ public class FgtMainHeader extends BaseFragment {
         menuPopWindow.setFocusable(true);
         tv_msg_count = menuContentView.findViewById(R.id.tv_msg_count);
         tv_download_count = menuContentView.findViewById(R.id.tv_download_count);
+        msgRef = new WeakReference<>(tv_msg_count);
+        downloadRef = new WeakReference<>(tv_download_count);
         menuContentView.findViewById(R.id.cl_message).setOnClickListener(v -> {
             onMsgClick();
         });
@@ -241,6 +245,7 @@ public class FgtMainHeader extends BaseFragment {
         menuContentView.findViewById(R.id.cl_download).setOnClickListener(v -> {
             onDownloadClick();
         });
+        //menuPopWindow.showAsDropDown(anchorView, 0, 5);
     }
 
     private void showOrHideMenuPop() {

app/src/main/java/com/sheep/gamegroup/module/login/fragments/EditUserInfoFgt.java

@@ -23,6 +23,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.login.controller.LoginController;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.upfile.UpFileListener;
 import com.sheep.gamegroup.util.upfile.UpFileUtils;
 import com.sheep.jiuyan.samllsheep.R;
@@ -57,6 +58,8 @@ public class EditUserInfoFgt extends BaseFragment {
     TextView birthdayBox;
     @BindView(R.id.gender_box)
     RadioGroup genderRadio;
+    @BindView(R.id.tv_agreement)
+    TextView tvAgreement;
 
     private String newAvatar;
 
@@ -106,6 +109,9 @@ public class EditUserInfoFgt extends BaseFragment {
         } else {
             genderRadio.check(R.id.male_radio);
         }
+        tvAgreement.setOnClickListener(v -> {
+            Jump2View.getInstance().tryShowAgreement(SheepApp.getInstance().getCurrentActivity(), G::showToast);
+        });
     }
 
     @OnClick(R.id.birthday_box)
@@ -130,7 +136,7 @@ public class EditUserInfoFgt extends BaseFragment {
         dateDialog.show();
     }
 
-    @OnClick(R.id.submit_btn)
+    @OnClick({R.id.submit_btn})
     public void doSubmit() {
         if (TextUtils.isEmpty(nickNameBox.getText().toString().trim())) {
             G.shortToast("请输入昵称");

app/src/main/java/com/sheep/gamegroup/view/activity/ActAudit.java

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 
+import android.view.WindowManager;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.util.DataUtil;

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -8,6 +8,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;

app/src/main/res/layout/act_audit_layout.xml

@@ -1,107 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.kfzs.android.view.widget.TouchEventConsumerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/bg">
+<com.kfzs.android.view.widget.TouchEventConsumerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/bg">
 
     <android.support.constraint.ConstraintLayout
-        android:id="@+id/root_1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+            android:id="@+id/root_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
         <ImageView
-            android:id="@+id/act_audit_bg_iv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY"
-            android:src="@mipmap/audit_top_bg"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/act_audit_bg_iv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="fitXY"
+                android:src="@mipmap/audit_top_bg"
+                app:layout_constraintTop_toTopOf="parent"/>
 
         <ImageView
-            android:id="@+id/img_baseactivity_title"
-            android:layout_width="wrap_content"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/content_padding_20"
-            android:paddingEnd="@dimen/content_padding_20"
-            android:scaleType="centerInside"
-            android:src="@drawable/narrow_back_white"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/img_baseactivity_title"
+                android:layout_width="wrap_content"
+                android:layout_height="?attr/actionBarSize"
+                android:layout_marginTop="24dp"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/content_padding_20"
+                android:paddingEnd="@dimen/content_padding_20"
+                android:scaleType="centerInside"
+                android:src="@drawable/narrow_back_white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
-            android:id="@+id/txt_baseactivity_title"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_5"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/txt_baseactivity_title"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:layout_marginTop="24dp"
+                android:gravity="center"
+                android:text="@string/app_name"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_5"
+                app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
-            android:id="@+id/number_tv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="111"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_3"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/number_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="111"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_3"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
-            android:id="@+id/audit_total_complete_tv"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="26dp"
-            android:gravity="center"
-            android:text="累计完成"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_13"
-            app:layout_constraintBottom_toBottomOf="@id/act_audit_bg_iv"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/act_audit_line_1"/>
+                android:id="@+id/audit_total_complete_tv"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="26dp"
+                android:gravity="center"
+                android:text="累计完成"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_13"
+                app:layout_constraintBottom_toBottomOf="@id/act_audit_bg_iv"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/act_audit_line_1"/>
 
         <View
-            android:id="@+id/act_audit_line_1"
-            android:layout_width="1dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center"
-            android:background="@color/disenable_color"
-            app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"
-            app:layout_constraintStart_toEndOf="parent"
-            app:layout_constraintEnd_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/audit_total_complete_tv" />
+                android:id="@+id/act_audit_line_1"
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center"
+                android:background="@color/disenable_color"
+                app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"
+                app:layout_constraintStart_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/audit_total_complete_tv"/>
 
         <TextView
-            android:id="@+id/audit_total_money_tv"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="累计现金"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_13"
-            app:layout_constraintStart_toEndOf="@id/act_audit_line_1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"/>
+                android:id="@+id/audit_total_money_tv"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="累计现金"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_13"
+                app:layout_constraintStart_toEndOf="@id/act_audit_line_1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"/>
 
     </android.support.constraint.ConstraintLayout>
 
     <android.support.design.widget.TabLayout
-        android:id="@+id/indicator"
-        style="@style/style_tab"
-        android:background="@color/white" />
+            android:id="@+id/indicator"
+            style="@style/style_tab"
+            android:background="@color/white"/>
 
     <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:background="@color/white" />
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:background="@color/white"/>
 </com.kfzs.android.view.widget.TouchEventConsumerLayout>

app/src/main/res/layout/common_container_nofit.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/frame_container"
-    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>

app/src/main/res/layout/fragment_edit_user_info.xml

@@ -1,56 +1,77 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true"
-    android:padding="@dimen/content_padding_24">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_horizontal"
+              android:orientation="vertical"
+              android:fitsSystemWindows="true"
+              android:padding="@dimen/content_padding_24">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:textSize="18dp"
+            android:textColor="@color/black"
+            android:text="登录小绵羊"/>
 
     <ImageView
-        android:id="@+id/avatar_view"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_marginTop="50dp"
-        android:src="@mipmap/icon_unread" />
+            android:id="@+id/avatar_view"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_marginTop="36dp"
+            android:src="@mipmap/icon_unread"/>
 
-    <EditText
-        android:id="@+id/nickname_box"
-        style="@style/login_edit_style"
-        android:layout_marginTop="30dp"
-        android:hint="您的名字"
-        android:lines="1"
-        android:maxLength="20" />
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="18dp"
+            android:layout_marginTop="12dp"
+            android:textColor="@color/black"
+            android:text="更换头像"/>
 
-    <View
-        style="@style/login_separetor_line_style"/>
+    <EditText
+            android:id="@+id/nickname_box"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            style="@style/login_edit_style"
+            android:background="@drawable/selector_login_edit_text"
+            android:layout_marginTop="56dp"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:hint="您的名字"
+            android:lines="1"
+            android:maxLength="20"/>
 
     <TextView
-        android:id="@+id/birthday_box"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center_vertical"
-        android:layout_marginTop="10dp"
-        android:hint="选择生日"
-        android:lines="1"
-        android:maxLength="20" />
-
-    <View
-        style="@style/login_separetor_line_style"/>
-
-    <RelativeLayout
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="50dp">
-
-        <RadioGroup
+            android:id="@+id/birthday_box"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            style="@style/login_edit_style"
+            android:background="@drawable/selector_login_edit_text"
+            android:gravity="center_vertical"
+            android:layout_marginTop="24dp"
+            android:hint="选择生日"
+            android:lines="1"
+            android:maxLength="20"/>
+
+    <RadioGroup
             android:id="@+id/gender_box"
             android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="42dp"
             android:orientation="horizontal">
 
-            <RadioButton
+        <RadioButton
                 android:layout_marginRight="36dp"
                 android:id="@+id/male_radio"
                 android:layout_width="wrap_content"
@@ -60,35 +81,50 @@
                 android:checked="true"
                 android:text="男   "
                 android:textColor="@color/selector_color_radio_button"
-                android:textSize="14sp"/>
+                android:textSize="16dp"/>
 
-            <RadioButton
+        <RadioButton
                 android:id="@+id/female_radio"
                 android:button="@null"
                 android:drawableRight="@drawable/selector_radio_img"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="14sp"
+                android:textSize="16dp"
                 android:textColor="@color/selector_color_radio_button"
-                android:text="女   " />
-
-        </RadioGroup>
-        <!--<TextView-->
-            <!--android:layout_centerVertical="true"-->
-            <!--android:text="注册后，性别不可以修改"-->
-            <!--android:textSize="12sp"-->
-            <!--android:textColor="@color/theme_app_mid"-->
-            <!--android:layout_alignParentRight="true"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content" />-->
-    </RelativeLayout>
-
-    <View
-        style="@style/login_separetor_line_style"/>
+                android:text="女   "/>
+
+    </RadioGroup>
 
     <Button
-        android:id="@+id/submit_btn"
-        android:text="下一步"
-        android:layout_marginTop="30dp"
-        style="@style/login_theme_round_button" />
+            android:id="@+id/submit_btn"
+            android:text="下一步"
+            android:layout_marginTop="56dp"
+            style="@style/login_theme_round_button"/>
+
+    <Space
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+    <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14dp"
+                android:text="注册即同意"/>
+
+        <TextView
+                android:id="@+id/tv_agreement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14dp"
+                android:textColor="#299EEF"
+                android:text="《小绵羊用户协议》"/>
+
+    </LinearLayout>
+
 </LinearLayout>

app/src/main/res/layout/fragment_sign_up.xml

@@ -252,7 +252,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
-                        android:text="我已阅读并同意《小绵羊平台用户协议》"
+                        android:text="我已阅读并同意《小绵羊用户协议》"
                         android:textColor="@color/black_333333"
                         android:textSize="12sp"/>
             </LinearLayout>