1 新增全局通知(这个不用,已经移动到主项目中)

YangShuai
1 parent aedde39e
Showing 7 changed files with 311 additions and 21 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MyApp.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/AllDeviceFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_black_tip.xml
module_xiaojiaSoundBox/src/main/res/layout/layout_snaker.xml
module_xiaojiaSoundBox/src/main/res/layout/view_top_msg.xml
@@ -2,11 +2,17 @@ package com.cnlive.strike.xiaojiaspeaker;
  
  
 import android.content.Intent;
+import android.databinding.DataBindingUtil;
 import android.os.Bundle;
+import android.os.Handler;
+import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.View;
  
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
+import com.cnlive.strike.xiaojiaspeaker.databinding.ActivitySpeakerMainBinding;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BluetoothConnActivity;
@@ -22,11 +28,12 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.SpeakerMainActivity;
  
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
+    private ActivitySpeakerMainBinding binding;
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_speaker_main);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_speaker_main);
         XiaoJIaCommInfo.setUserId(this, "10514333".trim());
         XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
  
@@ -54,7 +61,18 @@ public class MainActivity extends AppCompatActivity {
 //                .withString("currentSelectFamilyId", "")
 //                .navigation(this);
  
+
         finish();
+
+//        View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.layout_snaker, null);
+//       new Handler().postDelayed(new Runnable() {
+//           @Override
+//           public void run() {
+//               Snackbar.make(getWindow().getDecorView(), "这是一个snackbar", Snackbar.LENGTH_LONG).show();
+//               MyApp.instance().createAndStart();
+//           }
+//       },5000);
+
     }
  
 }
 package com.cnlive.strike.xiaojiaspeaker;
  
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.app.Activity;
 import android.app.Application;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
  
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.strike.speaker.BuildConfig;
+import com.cnlive.strike.xiaojiaspeaker.util.utilcode.util.ScreenUtils;
  
+import static com.cnlive.strike.xiaojiaspeaker.util.utilcode.util.ConvertUtils.dp2px;
+
+
+public class MyApp extends Application implements Application.ActivityLifecycleCallbacks {
+    /*当前对象的静态实例*/
+    private static MyApp instance;
+    /*当前显示的Activity*/
+    private Activity activity;
  
-public class MyApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        MyApp.instance = this;
+        this.registerActivityLifecycleCallbacks(this);
+
         initARouter();
         String userId = "";
         AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY,
                 BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT,
-                BuildConfig.VERSION_AS_DEBUG, "","",
+                BuildConfig.VERSION_AS_DEBUG, "", "",
                 "10514333", "",
-               "","", "",
-                "", "","",
+                "", "", "",
+                "", "", "",
                 BuildConfig.BAIDU_MAP_APP_KEY, "");
     }
  
@@ -35,4 +58,144 @@ public class MyApp extends Application {
         ARouter.init(this); // 尽可能早，推荐在Application中初始化
     }
  
+    /**
+     * 获取Application对象
+     *
+     * @return 返回一个App对象实例
+     * @see MyApp
+     */
+    public static MyApp instance() {
+        return MyApp.instance;
+    }
+
+    /**
+     * 显示View
+     *
+     * @param view 需要显示到Activity的视图
+     */
+    public void showView(View view) {
+        /*Activity不为空并且没有被释放掉*/
+        if (this.activity != null && !this.activity.isFinishing()) {
+            /*获取Activity顶层视图,并添加自定义View*/
+            ((ViewGroup) this.activity.getWindow().getDecorView()).addView(view);
+        }
+    }
+
+    /**
+     * 隐藏View
+     *
+     * @param view 需要从Activity中移除的视图
+     */
+    public void hideView(View view) {
+        /*Activity不为空并且没有被释放掉*/
+        if (this.activity != null && !this.activity.isFinishing() && null != view) {
+            /*获取Activity顶层视图*/
+            ViewGroup root = ((ViewGroup) this.activity.getWindow().getDecorView());
+            if (null == root) {
+                return;
+            }
+            removeView(view, root);
+        }
+    }
+
+    private void removeView(View view, ViewGroup root) {
+        ObjectAnimator bottomToTop = ObjectAnimator.ofFloat(view, "translationY", ScreenUtils.getScreenHeight() - dp2px(80), ScreenUtils.getScreenHeight()).setDuration(500);
+        /*初始化动画组合器*/
+        AnimatorSet animator = new AnimatorSet();
+        animator.play(bottomToTop);
+        /*添加动画结束回调*/
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                /*如果Activity中存在View对象则删除*/
+                if (root.indexOfChild(view) != -1) {
+                    /*从顶层视图中删除*/
+                    root.removeView(view);
+                }
+            }
+        });
+        /*启动动画*/
+        animator.start();
+    }
+
+    @Override
+    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+
+    }
+
+    @Override
+    public void onActivityStarted(Activity activity) {
+
+    }
+
+    @Override
+    public void onActivityResumed(Activity activity) {
+        /*获取当前显示的Activity*/
+        this.activity = activity;
+    }
+
+    @Override
+    public void onActivityPaused(Activity activity) {
+
+    }
+
+    @Override
+    public void onActivityStopped(Activity activity) {
+
+    }
+
+    @Override
+    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+    }
+
+    @Override
+    public void onActivityDestroyed(Activity activity) {
+
+    }
+
+
+    public void createAndStart() {
+        /*创建提示消息View*/
+        View view = LayoutInflater.from(this).inflate(R.layout.view_top_msg, null);
+        if (null == view) {
+            return;
+        }
+        LinearLayout ll_ignore = view.findViewById(R.id.ll_ignore);
+        LinearLayout ll_lookUp = view.findViewById(R.id.ll_lookUp);
+        ll_ignore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != view) {
+                    instance().hideView(view);
+                }
+            }
+        });
+        /*创建属性动画,从下到上*/
+        ObjectAnimator bottomToTop = ObjectAnimator.ofFloat(view, "translationY", ScreenUtils.getScreenHeight(), ScreenUtils.getScreenHeight() - dp2px(80)).setDuration(500);
+        /*初始化动画组合器*/
+        AnimatorSet animator = new AnimatorSet();
+        /*组合动画*/
+        animator.play(bottomToTop);
+        /*添加动画结束回调*/
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        /*删除View*/
+                        instance().hideView(view);
+                    }
+                }, 5000);
+            }
+        });
+        /*添加View到当前显示的Activity*/
+        instance().showView(view);
+        /*启动动画*/
+        animator.start();
+    }
+
 }
@@ -11,11 +11,13 @@ import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceDetailActivity;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.RemoteControlActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.AllDeviceAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.AllDeviceFragment;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +30,7 @@ public class AllDeviceFragmentView implements MvpView {
 //    private PopMenu mPopMenu;
     private String TAG = "AllDeviceFragmentView";
     private FamilyListBean familyListBean;
+    private QMUIAlphaImageButton remoteButton;//远程控制按钮
  
     public AllDeviceFragmentView(AllDeviceFragment fragment) {
         this.fragment = fragment;
@@ -38,11 +41,20 @@ public class AllDeviceFragmentView implements MvpView {
     }
  
     public void initView() {
-//        initPopView();
+        if (null == remoteButton) {
+            remoteButton = fragment.binding.topbar.addRightImageButton(R.drawable.icon_xiaojia_menu, R.id.right_menu);
+            remoteButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    //远程控制
+                    RemoteControlActivity.startActivity(getContext());
+                }
+            });
+        }
+        remoteButton.setVisibility(View.GONE);
     }
  
     public void initAllDeviceList(FamilyListBean familyListBean) {
-
         this.familyListBean = familyListBean;
         this.allDeviceInfoList = new ArrayList<>();
         if (null != familyListBean && null != familyListBean.getUsers()) {
@@ -50,7 +62,7 @@ public class AllDeviceFragmentView implements MvpView {
             for (FamilyListBean.UsersBeanX usersBean : familyListBean.getUsers()) {
  
                 //存储自己为主人的家庭
-                if (FamilyListBean.THE_HOST==usersBean.getIsMaster()) {
+                if (FamilyListBean.THE_HOST == usersBean.getIsMaster()) {
                     Log.e(TAG, "getId: " + usersBean.getUserId());
                     Log.e(TAG, "getToken: " + usersBean.getToken());
                     //存储家庭id
@@ -73,8 +85,10 @@ public class AllDeviceFragmentView implements MvpView {
         }
         if (null == allDeviceInfoList || allDeviceInfoList.size() == 0) {
             XiaoJIaCommInfo.setUserIsBind(getContext(), false);
+            initTopBarBtn(false);
         } else {
             XiaoJIaCommInfo.setUserIsBind(getContext(), true);
+            initTopBarBtn(true);
         }
         adapter = new AllDeviceAdapter(getContext(), allDeviceInfoList);
         fragment.binding.rvAllDevice.setLayoutManager(new LinearLayoutManager(getContext()));
@@ -194,4 +208,12 @@ public class AllDeviceFragmentView implements MvpView {
         }
         fragment.binding.emptyLayout.show(false, titleText, detailText, getContext().getString(R.string.retry), R.drawable.wufalianjie, listener);
     }
+
+    public void initTopBarBtn(boolean isShowRemote) {
+
+        if (isShowRemote) {
+            //控制
+            remoteButton.setVisibility(View.VISIBLE);
+        }
+    }
 }
@@ -86,29 +86,17 @@ public class AllDeviceFragment extends MvpBindingFragment&lt;AllDeviceFragmentView,
                     getActivity().finish();
                 }
             });
-
-
             //添加设备按钮
             addButton = binding.topbar.addRightImageButton(R.drawable.icon_xiaojia_item_add, R.id.right_add);
             addButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    if (null != getMvpView()) {
-//                        getMvpView().showPop(addButton);
+                    if (null != getContext()) {
                         BlueToothStep1Activity.startActivity(getActivity());
  
                     }
                 }
             });
-            //控制
-            binding.topbar.addRightImageButton(R.drawable.icon_xiaojia_menu, R.id.right_menu).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    //远程控制
-                    RemoteControlActivity.startActivity(getActivity());
-                }
-            });
-
         }
     }
  
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="10dp" />
+    <solid android:color="#BF000000" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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="match_parent">
+
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/snackbar_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="asfvsadfvas" />
+
+    </android.support.design.widget.CoordinatorLayout>
+
+</android.support.constraint.ConstraintLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/view_top_msg_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_margin="10dp"
+        android:background="@drawable/shape_xiaojia_black_tip"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:text="您被好友绑定成为了亲情关系"
+            android:textColor="@color/white"
+            android:textSize="15sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="right">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:id="@+id/ll_ignore"
+                android:gravity="center">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="10dp"
+                    android:text="忽略"
+                    android:textColor="@color/white"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="15dp"
+                android:background="@color/white" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="20dp"
+                android:layout_weight="1"
+                android:id="@+id/ll_lookUp"
+                android:gravity="center">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="5dp"
+                    android:text="查看"
+                    android:textColor="@color/white"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
 \ No newline at end of file