1 优化pop控件

YangShuai
1 parent 4a4f3240
Showing 22 changed files with 431 additions and 108 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/FirmwareUpdateFragmentPresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/FirmwareUpdateFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/FirmwareUpdateActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/AllDeviceAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/FirmwareUpdateFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/popmenu/PopMenu.java
module_xiaojiaSoundBox/src/main/res/anim/context_menu_enter.xml
module_xiaojiaSoundBox/src/main/res/anim/context_menu_exit.xml
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/icon_big_xiaojia.png
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/icon_big_xiaojia.png
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/icon_big_xiaojia.png
module_xiaojiaSoundBox/src/main/res/drawable/shape_red_circle.xml
module_xiaojiaSoundBox/src/main/res/layout/activity_firmware_update.xml
module_xiaojiaSoundBox/src/main/res/layout/activity_search_device.xml
module_xiaojiaSoundBox/src/main/res/layout/fragment_firmware_update.xml
module_xiaojiaSoundBox/src/main/res/layout/pop_item_menu.xml
module_xiaojiaSoundBox/src/main/res/values/styles.xml
@@ -11,12 +11,12 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.BluetoothConnActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceInstructionActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceManagerActivity;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.FirmwareUpdateActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SearchDeviceActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SpeakerMainActivity;
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -25,9 +25,10 @@ public class MainActivity extends AppCompatActivity {
 //        startActivity(new Intent(MainActivity.this, BluetoothConnActivity.class));
 //        startActivity(new Intent(MainActivity.this, BlueToothStep1Activity.class));
 //            startActivity(new Intent(MainActivity.this, ConnBluetoothSuccessActivity.class));
-//        startActivity(new Intent(MainActivity.this, AllDeviceActivity.class));
+        startActivity(new Intent(MainActivity.this, AllDeviceActivity.class));
 //        startActivity(new Intent(MainActivity.this, DeviceInstructionActivity.class));
-        startActivity(new Intent(MainActivity.this, DeviceManagerActivity.class));
+//        startActivity(new Intent(MainActivity.this, DeviceManagerActivity.class));
+//        startActivity(new Intent(MainActivity.this, FirmwareUpdateActivity.class));
         finish();
     }
@@ -17,7 +17,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application>
-        <activity android:name=".ui.activity.DeviceManagerActivity"></activity>
+        <activity android:name=".ui.activity.FirmwareUpdateActivity"></activity>
+        <activity android:name=".ui.activity.DeviceManagerActivity" />
         <activity android:name=".ui.activity.DeviceInstructionActivity" />
         <activity android:name=".ui.activity.AllDeviceActivity" />
         <activity android:name=".ui.activity.ConnBluetoothSuccessActivity" />
+package com.cnlive.strike.xiaojiaspeaker.frame.presenter;
+
+import com.cnlive.strike.xiaojiaspeaker.frame.view.FirmwareUpdateFragmentView;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+public class FirmwareUpdateFragmentPresenter extends MvpBasePresenter<FirmwareUpdateFragmentView> {
+}
+package com.cnlive.strike.xiaojiaspeaker.frame.view;
+
+import android.app.Activity;
+
+import com.cnlive.strike.xiaojiaspeaker.ui.fragment.FirmwareUpdateFragment;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+
+public class FirmwareUpdateFragmentView implements MvpView {
+    private FirmwareUpdateFragment fragment;
+
+    public FirmwareUpdateFragmentView(FirmwareUpdateFragment fragment) {
+        this.fragment = fragment;
+    }
+
+    public Activity getContext() {
+        return fragment == null ? null : fragment.getActivity();
+    }
+
+    public void initView() {
+    }
+}
+package com.cnlive.strike.xiaojiaspeaker.ui.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentFirmwareUpdateBinding;
+import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceManagerFragment;
+import com.cnlive.strike.xiaojiaspeaker.ui.fragment.FirmwareUpdateFragment;
+
+/**
+ * 固件升级
+ */
+public class FirmwareUpdateActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_search_device);
+        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,  FirmwareUpdateFragment.newInstance()).commitAllowingStateLoss();
+
+    }
+
+    public static void startActivity(Activity activity) {
+        activity.startActivity(new Intent(activity, FirmwareUpdateActivity.class));
+    }
+}
@@ -2,7 +2,6 @@ package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
 import android.content.Context;
 import android.databinding.DataBindingUtil;
-import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
@@ -11,16 +10,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import com.clj.fastble.data.BleDevice;
 import com.cnlive.strike.application.GlideApp;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemAllDeviceBinding;
-import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemBluetoothDeviceBinding;
 import com.cnlive.strike.xiaojiaspeaker.model.AllDeviceInfo;
-import com.cnlive.strike.xiaojiaspeaker.model.PopMenuInfo;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
-import java.util.ArrayList;
 import java.util.List;
 public class AllDeviceAdapter extends RecyclerView.Adapter {
 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
-import android.Manifest;
-import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.Display;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.PopupWindow;
-import android.widget.RelativeLayout;
-import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
-import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.ui.widget.UIPopup;
@@ -27,13 +14,9 @@ import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentAllDeviceBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.AllDeviceFragmentPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.AllDeviceFragmentView;
-import com.cnlive.strike.xiaojiaspeaker.model.PopMenuInfo;
-import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
-import com.cnlive.strike.xiaojiaspeaker.ui.adapter.PopMenuAdapter;
+import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
-import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
 import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
-import com.qmuiteam.qmui.widget.popup.QMUIPopup;
 import java.util.ArrayList;
 import java.util.List;
@@ -96,19 +79,22 @@ public class AllDeviceFragment extends MvpBindingFragment&lt;AllDeviceFragmentView,
         List<PopMenuInfo> popMenuInfoList = new ArrayList<>();
         PopMenuInfo popMenuInfo = new PopMenuInfo();
         popMenuInfo.setTitle("下载中");
+//        popMenuInfo.setNetImag("zsdfs");
         popMenuInfoList.add(popMenuInfo);
         popMenuInfo = new PopMenuInfo();
         popMenuInfo.setTitle("历史记录");
+//        popMenuInfo.setNetImag("zsdfs");
         popMenuInfoList.add(popMenuInfo);
         popMenuInfo = new PopMenuInfo();
         popMenuInfo.setTitle("设备管理");
+//        popMenuInfo.setNetImag("zsdfs");
         popMenuInfoList.add(popMenuInfo);
         PopMenu mPopMenu = new PopMenu.Builder(getActivity())
                 .addData(popMenuInfoList)
-                .setBackgroundColor(Color.parseColor("#FA3a3a3a"))
+                .setBackgroundColorArray(new int[]{Color.parseColor("#363636"), Color.parseColor("#BF000000"), Color.parseColor("#BF000000")})
                 .setLeftAndRightMargin(20)
-                .setHeightMargin(20)
+                .setTopMargin(20)
                 .setLineColor(R.color.white_50)
                 .setTextColor(R.color.white)
                 .setLineVisible(View.VISIBLE)
+package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.view.View;
+
+import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.libs.base.util.StatusBarUtil;
+import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentFirmwareUpdateBinding;
+import com.cnlive.strike.xiaojiaspeaker.frame.presenter.FirmwareUpdateFragmentPresenter;
+import com.cnlive.strike.xiaojiaspeaker.frame.view.FirmwareUpdateFragmentView;
+
+/**
+ * 固件升级
+ */
+public class FirmwareUpdateFragment extends MvpBindingFragment<FirmwareUpdateFragmentView, FirmwareUpdateFragmentPresenter, Object, FragmentFirmwareUpdateBinding> {
+    public static FirmwareUpdateFragment newInstance() {
+        FirmwareUpdateFragment fragment = new FirmwareUpdateFragment();
+        return fragment;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_firmware_update;
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        StatusBarUtil.setStatusBarWrite(getActivity());
+        StatusBarUtil2.setColor(getActivity(), ContextCompat.getColor(getActivity(), R.color.white), 0);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initTopBar();
+        if (null != getMvpView()) {
+            getMvpView().initView();
+        }
+    }
+
+    private void initTopBar() {
+        if (null != binding) {
+            binding.topbar.setTitle("固件升级");
+            //设置返回按钮
+            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    getActivity().finish();
+                }
+            });
+        }
+    }
+}
@@ -3,7 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
-import android.content.Context;
+import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.RectF;
@@ -12,25 +12,20 @@ import android.os.Build;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DimenRes;
 import android.support.annotation.NonNull;
-import android.support.annotation.Size;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.view.WindowManager;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
-import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.model.PopMenuInfo;
-import com.cnlive.strike.xiaojiaspeaker.ui.adapter.PopMenuAdapter;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +33,7 @@ import java.util.List;
 /**
  * PopMenu
+ * modify by ShinnyYang
  */
 public final class PopMenu {
@@ -60,13 +56,14 @@ public final class PopMenu {
     private List<PopMenuInfo> mData = new ArrayList<>();
     private String TAG = "PopMenu";
     private Builder builder;
+    private OnItemClickListener onItemClickListener;
-    public interface OnItemClickListener {
-//        void onItemClickListener(ActionItem item, int position);
+    public void setmItemClickListener(OnItemClickListener mItemClickListener) {
+        this.mItemClickListener = mItemClickListener;
     }
-    public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
-        mItemClickListener = onItemClickListener;
+    public interface OnItemClickListener {
+        void onClick(int position, PopMenuInfo popMenuInfo);
     }
     public void addData(List<PopMenuInfo> data) {
@@ -99,13 +96,17 @@ public final class PopMenu {
     @SuppressLint("WrongConstant")
     private View getContentView(final Builder builder) {
         GradientDrawable drawable = new GradientDrawable();
-        mBackgroundColor = builder.mBackgroundColor;
-        drawable.setColor(mBackgroundColor);
         drawable.setCornerRadius(builder.mCornerRadius);
         //设置颜色为渐变
-//        drawable.setGradientType(GradientDrawable.LINEAR_GRADIENT);
-//        drawable.setColors(new int[]{mBackgroundColor,Color.parseColor("#BF000000")});
-//        drawable.setOrientation(GradientDrawable.Orientation.TOP_BOTTOM);
+        drawable.setGradientType(GradientDrawable.LINEAR_GRADIENT);
+        if (null != builder.mBackgroundColorArray && builder.mBackgroundColorArray.length > 0) {
+            mBackgroundColor = builder.mBackgroundColorArray[0];
+            drawable.setColors(builder.mBackgroundColorArray);
+        } else {
+            mBackgroundColor = builder.mBackgroundColor;
+            drawable.setColor(mBackgroundColor);
+        }
+        drawable.setOrientation(GradientDrawable.Orientation.TOP_BOTTOM);
         mRecyclerView = new RecyclerView(builder.mContext);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(builder.mContext));
         mRecyclerView.setOverScrollMode(RecyclerView.OVER_SCROLL_NEVER);
@@ -125,40 +126,14 @@ public final class PopMenu {
             mAdapter.setLineVisible(builder.lineVisible);
         }
         mData.addAll(builder.mData);
-//        mAdapter = new CommonAdapter<ActionItem>(builder.mContext,
-//                R.layout.list_item_popmenu, mData) {
-//
-//            @Override
-//            protected void convert(final ViewHolder holder, final ActionItem item, final int position) {
-//                holder.setText(R.id.tv_pop_menu, item.getText());
-//                holder.setTextColor(R.id.tv_pop_menu, builder.mTextColor);
-//                ImageView iv = holder.getView(R.id.iv_pop_menu);
-//                if (builder.mIsShowImage) {
-//                    if (item.getResId() != 0) {
-//                        iv.setImageResource(item.getResId());
-//                        iv.setVisibility(View.VISIBLE);
-//                    } else {
-//                        iv.setVisibility(View.INVISIBLE);
-//                    }
-//                } else {
-//                    iv.setVisibility(View.GONE);
-//                }
-//                if (mItemClickListener == null)
-//                    return;
-//                holder.getConvertView().setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        mItemClickListener.onItemClickListener(item, position);
-//                        dismiss();
-//                    }
-//                });
-//            }
-//        };
         mRecyclerView.setAdapter(mAdapter);
         mAdapter.setOnItemClickListener(new PopMenuAdapter.OnItemClickListener() {
             @Override
             public void onClick(int position, PopMenuInfo popMenuInfo) {
-                AlertUtil.showDeftToast(builder.mContext, position + "");
+                if (null != onItemClickListener) {
+                    onItemClickListener.onClick(position, popMenuInfo);
+                }
+                dismiss();
             }
         });
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
@@ -187,6 +162,18 @@ public final class PopMenu {
         mContentView.setOrientation(LinearLayout.VERTICAL);
         mContentView.addView(mArrowView);
         mContentView.addView(mRecyclerView);//为了计算高度
+        mPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                //是否有背景色显示
+                if (builder.isShowDarkenBackground) {
+                    //恢复背景色
+                    WindowManager.LayoutParams lp = builder.mContext.getWindow().getAttributes();
+                    lp.alpha = 1f;
+                    builder.mContext.getWindow().setAttributes(lp);
+                }
+            }
+        });
         return mContentView;
     }
@@ -196,14 +183,23 @@ public final class PopMenu {
     public void show(final View anchorView) {
         if (!isShowing()) {
+            // 是否设置设置背景颜色变暗
+            if (builder.isShowDarkenBackground) {
+                WindowManager.LayoutParams lp = builder.mContext.getWindow().getAttributes();
+                lp.alpha = 0.7f;
+                builder.mContext.getWindow().setAttributes(lp);
+            }
             mAnchorView = anchorView;
             mContentView.getViewTreeObserver().addOnGlobalLayoutListener(mLocationLayoutListener);
-
             anchorView.addOnAttachStateChangeListener(mOnAttachStateChangeListener);
             anchorView.post(new Runnable() {
                 @Override
                 public void run() {
-                    mPopupWindow.showAsDropDown(anchorView);
+                    //设置高度，不立即生效，调用show之后，才生效
+//                    mPopupWindow.showAsDropDown(anchorView);
+                    // 设置popWindow的显示和消失动画
+                    mPopupWindow.setAnimationStyle(R.style.contextMenuAnim);
+                    mPopupWindow.showAtLocation(mAnchorView, 0, 0, 0);
                 }
             });
         }
@@ -245,8 +241,8 @@ public final class PopMenu {
         } else if (location.x < marginX) {
             location.x = marginX;
         }
-        if (null != builder && 0 != builder.HEIGHT_MARGIN) {
-            location.y -= builder.HEIGHT_MARGIN;
+        if (null != builder && 0 != builder.TOP_MARGIN) {
+            location.y -= builder.TOP_MARGIN;
         }
         return location;
@@ -336,7 +332,7 @@ public final class PopMenu {
         } else {
             mContentView.setPivotY(y);
         }
-        animatorSet.setDuration(300);
+        animatorSet.setDuration(200);
         animatorSet.setInterpolator(new DecelerateInterpolator());
         animatorSet.play(scaleX).with(scaleY).with(alpha);//两个动画同时开始
         animatorSet.start();
@@ -357,6 +353,7 @@ public final class PopMenu {
     public static final class Builder {
         private int mBackgroundColor = Color.BLACK;
+        private int[] mBackgroundColorArray;
         private int mTextColor = -1;
         private boolean isCancelable = true;
@@ -364,31 +361,54 @@ public final class PopMenu {
         private float mArrowHeight;
         private float mArrowWidth;
-        private Context mContext;
+        private Activity mContext;
         private List<PopMenuInfo> mData = new ArrayList<>();
         private int mLineColor = -1;
-        private boolean mIsShowImage = true;
         private int LEFT_TO_RIGHT_MARGIN;//弹窗左右边距
-        private int HEIGHT_MARGIN;//纵坐标边距
+        private int TOP_MARGIN;//上边距
         private int itemBackGround = -1;
         private int lineVisible = -1;
+        private boolean isShowDarkenBackground = false;//是否背景变暗
-        public Builder(@NonNull Context context) {
+        public Builder(@NonNull Activity context) {
             mContext = context;
         }
+        /**
+         * 设置背景是否变暗
+         *
+         * @param showDarkenBackground
+         * @return
+         */
+        public Builder setShowDarkenBackground(boolean showDarkenBackground) {
+            isShowDarkenBackground = showDarkenBackground;
+            return this;
+        }
+
         public Builder setLineVisible(int visible) {
             lineVisible = visible;
             return this;
         }
+        /**
+         * 设置左右边距
+         *
+         * @param margin
+         * @return
+         */
         public Builder setLeftAndRightMargin(int margin) {
             LEFT_TO_RIGHT_MARGIN = margin;
             return this;
         }
-        public Builder setHeightMargin(int margin) {
-            HEIGHT_MARGIN = margin;
+        /**
+         * 设置上边距
+         *
+         * @param margin
+         * @return
+         */
+        public Builder setTopMargin(int margin) {
+            TOP_MARGIN = margin;
             return this;
         }
@@ -402,6 +422,18 @@ public final class PopMenu {
             return this;
         }
+        /**
+         * 设置背景渐变色,一般在设置透明度的时候使用,因为半透明颜色时,箭头与下边recycleview会显得不是一个整体
+         * 纯色背景没事
+         *
+         * @param color
+         * @return
+         */
+        public Builder setBackgroundColorArray(@ColorInt int[] color) {
+            mBackgroundColorArray = color;
+            return this;
+        }
+
         public Builder setTextColor(int color) {
             mTextColor = color;
             return this;
@@ -412,15 +444,17 @@ public final class PopMenu {
             return this;
         }
+        /**
+         * 设置item点击效果
+         *
+         * @param drawable
+         * @return
+         */
         public Builder setItemBackGround(int drawable) {
             itemBackGround = drawable;
             return this;
         }
-        public Builder setShowImage(boolean isShowImage) {
-            mIsShowImage = isShowImage;
-            return this;
-        }
         public Builder setCornerRadius(@DimenRes int resId) {
             return setCornerRadius(mContext.getResources().getDimension(resId));
@@ -431,6 +465,12 @@ public final class PopMenu {
             return this;
         }
+        /**
+         * 设置箭头高度
+         *
+         * @param resId
+         * @return
+         */
         public Builder setArrowHeight(@DimenRes int resId) {
             return setArrowHeight(mContext.getResources().getDimension(resId));
         }
@@ -440,6 +480,12 @@ public final class PopMenu {
             return this;
         }
+        /**
+         * 设置箭头宽度
+         *
+         * @param resId
+         * @return
+         */
         public Builder setArrowWidth(@DimenRes int resId) {
             return setArrowWidth(mContext.getResources().getDimension(resId));
         }
-package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
+package com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu;
 import android.content.Context;
 import android.databinding.DataBindingUtil;
@@ -10,10 +10,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import com.cnlive.strike.application.GlideApp;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemWifi1Binding;
 import com.cnlive.strike.xiaojiaspeaker.databinding.PopItemMenuBinding;
-import com.cnlive.strike.xiaojiaspeaker.model.PopMenuInfo;
+import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
 import java.util.List;
@@ -72,10 +72,16 @@ public class PopMenuAdapter extends RecyclerView.Adapter {
             }
         }
         //判断图标是否显示
-        if (0 == popMenuInfoList.get(i).getImgDraw()) {
+        if (0 == popMenuInfoList.get(i).getImgDrawable() && TextUtils.isEmpty(popMenuInfoList.get(i).getNetImag())) {
             binding.ivIcon.setVisibility(View.GONE);
         } else {
             binding.ivIcon.setVisibility(View.VISIBLE);
+            //优先显示网络图片
+            if (!TextUtils.isEmpty(popMenuInfoList.get(i).getNetImag())) {
+                GlideApp.with(context).load(popMenuInfoList.get(i).getNetImag()).placeholder(R.color.white_50).into(binding.ivIcon);
+            } else {
+                GlideApp.with(context).load(popMenuInfoList.get(i).getImgDrawable()).placeholder(R.color.white_50).into(binding.ivIcon);
+            }
         }
         //点击
     }
-package com.cnlive.strike.xiaojiaspeaker.model;
+package com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu;
 public class PopMenuInfo {
     private String title;
-    private int imgDraw;
+    private int imgDrawable;
+    private String netImag;
+
+    public int getImgDrawable() {
+        return imgDrawable;
+    }
+
+    public void setImgDrawable(int imgDrawable) {
+        this.imgDrawable = imgDrawable;
+    }
+
+    public String getNetImag() {
+        return netImag;
+    }
+
+    public void setNetImag(String netImag) {
+        this.netImag = netImag;
+    }
     public String getTitle() {
         return title;
@@ -12,11 +29,4 @@ public class PopMenuInfo {
         this.title = title;
     }
-    public int getImgDraw() {
-        return imgDraw;
-    }
-
-    public void setImgDraw(int imgDraw) {
-        this.imgDraw = imgDraw;
-    }
 }
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+  >
+<!--    <alpha-->
+<!--        android:duration="200"-->
+<!--        android:fromAlpha="0.0"-->
+<!--        android:toAlpha="1.0"/>-->
+<!--    什么都不做-->
+<!--    <scale-->
+<!--        android:duration="200"-->
+<!--        android:fromXScale="0.0"-->
+<!--        android:fromYScale="0.0"-->
+<!--        android:interpolator="@android:anim/accelerate_interpolator"-->
+<!--        android:pivotX="100%"-->
+<!--        android:pivotY="0%"-->
+<!--        android:toXScale="1"-->
+<!--        android:toYScale="1"/>-->
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha
+        android:duration="300"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+    <!--    <scale-->
+    <!--        android:duration="200"-->
+    <!--        android:fromXScale="1.0"-->
+    <!--        android:fromYScale="1.0"-->
+    <!--        android:interpolator="@android:anim/accelerate_interpolator"-->
+    <!--        android:pivotX="100%"-->
+    <!--        android:pivotY="0%"-->
+    <!--        android:toXScale="1.0"-->
+    <!--        android:toYScale="0"/>-->
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="100dp" />
+    <solid android:color="#F10215" />
+</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"
+    tools:context=".ui.activity.FirmwareUpdateActivity">
+
+</android.support.constraint.ConstraintLayout>
 \ No newline at end of file
@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".ui.activity.SearchDeviceActivity">
+
     <RelativeLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.widget.QMUITopBar
+            android:id="@+id/topbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/qmui_topbar_height" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="2"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="350dp"
+                android:layout_height="200dp"
+                android:layout_gravity="center_horizontal"
+                android:background="@drawable/icon_big_xiaojia"
+                android:scaleType="fitXY" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="当前版本v:"
+                    android:textColor="@color/color_282828"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/tv_current_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1.0.39.20190516"
+                    android:textColor="@color/color_282828"
+                    android:textSize="16sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="最新版本v:"
+                    android:textColor="@color/color_282828"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/tv_new_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1.0.39.20190516"
+                    android:textColor="@color/color_282828"
+                    android:textSize="16sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp">
+
+                <Button
+                    android:id="@+id/btn_check_update"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:background="@drawable/selector_btn_green"
+                    android:gravity="center"
+                    android:text="检查更新"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <View
+                    android:layout_width="9dp"
+                    android:layout_height="9dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="50dp"
+                    android:layout_marginBottom="10dp"
+                    android:background="@drawable/shape_red_circle" />
+            </FrameLayout>
+
+        </LinearLayout>
+    </LinearLayout>
+</layout>
 \ No newline at end of file
@@ -6,9 +6,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/selectable_pop_item_background"
+        android:clickable="true"
         android:gravity="center_vertical"
         android:minWidth="100dp"
-        android:clickable="true"
         android:orientation="vertical">
         <LinearLayout
@@ -20,14 +20,16 @@
                 android:id="@+id/iv_icon"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/key_instruction" />
+                android:layout_marginLeft="10dp" />
             <TextView
                 android:id="@+id/tv_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
+                android:layout_marginTop="2dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="2dp"
                 android:gravity="center_vertical"
                 android:minHeight="35dp"
                 android:textColor="@color/color_282828"
@@ -37,7 +39,7 @@
         <View
             android:id="@+id/view_line"
             android:layout_width="match_parent"
-            android:layout_height="0.2dp"
+            android:layout_height="0.1dp"
             android:background="@color/line" />
     </LinearLayout>
@@ -27,4 +27,11 @@
         <item name="kswThumbWidth">@dimen/ksw_md_thumb_ripple_size</item>
         <item name="kswThumbHeight">@dimen/ksw_md_thumb_ripple_size</item>
     </style>
+    <!--pop特效-->
+    <style name="contextMenuAnim" parent="@android:style/Animation.Activity">
+        <item name="android:windowEnterAnimation">@anim/context_menu_enter</item>
+        <!-- 指定显示时的动画xml -->
+        <item name="android:windowExitAnimation">@anim/context_menu_exit</item>
+        <!-- 指定消失时的动画xml -->
+    </style>
 </resources>