修改页面布局

陈硕
1 parent 01c7920a
Showing 8 changed files with 311 additions and 61 deletions
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/FeedbackFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/LoginFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.java
app/src/main/java/com/cnlive/gundam/user/view/CircleImageView.java
app/src/main/res/layout/user_feedback.xml
app/src/main/res/layout/user_fragment.xml
user/src/main/res/values/attrs.xml
@@ -9,12 +9,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import com.bumptech.glide.Glide;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.UserFragmentBinding;
 import com.cnlive.gundam.user.activity.CommentActivity;
 import com.cnlive.gundam.user.activity.LoginActivity;
+import com.cnlive.gundam.user.activity.UserPersonalActivity;
 import com.cnlive.gundam.user.auth.UserService;
-
+import com.cnlive.gundam.user.model.User;
 /**
@@ -28,7 +30,6 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, R.layout.user_fragment, container, false);
-
         return binding.getRoot();
     }
@@ -39,24 +40,14 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     }
-    /* public static Fragment newInstance() {
-        UserFragment fragment = new UserFragment();
-        return fragment;
-    }*/
-
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-
-        /*initToolBar();
-        init();
-        MyHeadItem.getContent(getActivity());*/
     }
     private void initUI() {
         binding.configHeader.setOnClickListener(this);
-        binding.live.setOnClickListener(this);
         binding.message.setOnClickListener(this);
     }
@@ -64,28 +55,32 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-
-
             case R.id.config_header:
                 int uid = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
-                if (uid != 0) {
-                    //进入个人中心页面
-                    //startActivity(new Intent(getActivity(), UserPersonalActivity.class));
-                } else {
-                    //进入登录页面
+                if (uid != 0)
+                    startActivity(new Intent(getActivity(), UserPersonalActivity.class));
+                else
                     startActivity(new Intent(getActivity(), LoginActivity.class));
-                }
-
                 break;
-            case R.id.live:
-                break;
             case R.id.message:
                 startActivity(new Intent(getActivity(), CommentActivity.class));
-
                 break;
         }
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        notifyUI();
+
+    }
+
+    private void notifyUI() {
+        User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
+        Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
+        binding.tvNickname.setText(activeAccountInfo.getNickname());
+    }
 }
@@ -67,7 +67,7 @@ public class FeedbackFragment extends Fragment implements View.OnClickListener {
     public void onClick(View v) {
         int i = v.getId();
         if (i == R.id.back_selector) {//返回上一页面
-            getFragmentManager().popBackStack();
+            getActivity().finish();
         } else if (i == R.id.feedback) {
          /**
@@ -94,7 +94,7 @@ public class FeedbackFragment extends Fragment implements View.OnClickListener {
             switch (what) {
                 case IUserService.SUCCESS:
                     ToastUtil.show(getActivity(), "反馈成功");
-                    getFragmentManager().popBackStack();
+                    getActivity().finish();
                     break;
                 case IUserService.ERROR_PARAM:
                     ToastUtil.show(getActivity(), IUserService.message_error_param);
@@ -155,6 +155,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
                     closeDialog();
                     UserData userData = (UserData) obj;
                     data = userData.getData();
+
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setUserInfo(account, data);
                     //userService.isAutoLogin();
@@ -49,4 +49,7 @@ public class UserPersonalFragment  extends Fragment{
+
+
+
 }
+package com.cnlive.gundam.user.view;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+import com.cnlive.gundam.R;
+
+
+/**
+ * @author 陈硕
+ * @time 2016/11/7  10:27
+ * @desc ${TODD}
+ */
+@SuppressLint("AppCompatCustomView")
+public class CircleImageView extends ImageView {
+
+
+    private static final ImageView.ScaleType SCALE_TYPE = ImageView.ScaleType.CENTER_CROP;
+
+    private static final Bitmap.Config BITMAP_CONFIG = Bitmap.Config.ARGB_8888;
+    private static final int COLORDRAWABLE_DIMENSION = 1;
+
+    private static final int DEFAULT_BORDER_WIDTH = 0;
+    private static final int DEFAULT_BORDER_COLOR = Color.BLACK;
+
+    private final RectF mDrawableRect = new RectF();
+    private final RectF mBorderRect = new RectF();
+
+    private final Matrix mShaderMatrix = new Matrix();
+    private final Paint mBitmapPaint = new Paint();
+    private final Paint mBorderPaint = new Paint();
+
+    private int mBorderColor = DEFAULT_BORDER_COLOR;
+    private int mBorderWidth = DEFAULT_BORDER_WIDTH;
+
+    private Bitmap mBitmap;
+    private BitmapShader mBitmapShader;
+    private int mBitmapWidth;
+    private int mBitmapHeight;
+
+    private float mDrawableRadius;
+    private float mBorderRadius;
+
+    private boolean mReady;
+    private boolean mSetupPending;
+
+    public CircleImageView(Context context) {
+        super(context);
+    }
+
+    public CircleImageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CircleImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        super.setScaleType(SCALE_TYPE);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CircleImageView, defStyle, 0);
+
+        mBorderWidth = a.getDimensionPixelSize(R.styleable.CircleImageView_border_width, DEFAULT_BORDER_WIDTH);
+        mBorderColor = a.getColor(R.styleable.CircleImageView_border_color, DEFAULT_BORDER_COLOR);
+
+        a.recycle();
+
+        mReady = true;
+
+        if (mSetupPending) {
+            setup();
+            mSetupPending = false;
+        }
+    }
+
+    @Override
+    public ScaleType getScaleType() {
+        return SCALE_TYPE;
+    }
+
+    @Override
+    public void setScaleType(ScaleType scaleType) {
+        if (scaleType != SCALE_TYPE) {
+            throw new IllegalArgumentException(String.format("ScaleType %s not supported.", scaleType));
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (getDrawable() == null) {
+            return;
+        }
+
+        canvas.drawCircle(getWidth() / 2, getHeight() / 2, mDrawableRadius, mBitmapPaint);
+        canvas.drawCircle(getWidth() / 2, getHeight() / 2, mBorderRadius, mBorderPaint);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        setup();
+    }
+
+    public int getBorderColor() {
+        return mBorderColor;
+    }
+
+    public void setBorderColor(int borderColor) {
+        if (borderColor == mBorderColor) {
+            return;
+        }
+
+        mBorderColor = borderColor;
+        mBorderPaint.setColor(mBorderColor);
+        invalidate();
+    }
+
+    public int getBorderWidth() {
+        return mBorderWidth;
+    }
+
+    public void setBorderWidth(int borderWidth) {
+        if (borderWidth == mBorderWidth) {
+            return;
+        }
+
+        mBorderWidth = borderWidth;
+        setup();
+    }
+
+    @Override
+    public void setImageBitmap(Bitmap bm) {
+        super.setImageBitmap(bm);
+        mBitmap = bm;
+        setup();
+    }
+
+    @Override
+    public void setImageDrawable(Drawable drawable) {
+        super.setImageDrawable(drawable);
+        mBitmap = getBitmapFromDrawable(drawable);
+        setup();
+    }
+
+    @Override
+    public void setImageResource(int resId) {
+        super.setImageResource(resId);
+        mBitmap = getBitmapFromDrawable(getDrawable());
+        setup();
+    }
+
+    private Bitmap getBitmapFromDrawable(Drawable drawable) {
+        if (drawable == null) {
+            return null;
+        }
+
+        if (drawable instanceof BitmapDrawable) {
+            return ((BitmapDrawable) drawable).getBitmap();
+        }
+
+        try {
+            Bitmap bitmap;
+
+            if (drawable instanceof ColorDrawable) {
+                bitmap = Bitmap.createBitmap(COLORDRAWABLE_DIMENSION, COLORDRAWABLE_DIMENSION, BITMAP_CONFIG);
+            } else {
+                bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), BITMAP_CONFIG);
+            }
+
+            Canvas canvas = new Canvas(bitmap);
+            drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+            drawable.draw(canvas);
+            return bitmap;
+        } catch (OutOfMemoryError e) {
+            return null;
+        }
+    }
+
+    private void setup() {
+        if (!mReady) {
+            mSetupPending = true;
+            return;
+        }
+
+        if (mBitmap == null) {
+            return;
+        }
+
+        mBitmapShader = new BitmapShader(mBitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+
+        mBitmapPaint.setAntiAlias(true);
+        mBitmapPaint.setShader(mBitmapShader);
+
+        mBorderPaint.setStyle(Paint.Style.STROKE);
+        mBorderPaint.setAntiAlias(true);
+        mBorderPaint.setColor(mBorderColor);
+        mBorderPaint.setStrokeWidth(mBorderWidth);
+
+        mBitmapHeight = mBitmap.getHeight();
+        mBitmapWidth = mBitmap.getWidth();
+
+        mBorderRect.set(0, 0, getWidth(), getHeight());
+        mBorderRadius = Math.min((mBorderRect.height() - mBorderWidth) / 2, (mBorderRect.width() - mBorderWidth) / 2);
+
+        mDrawableRect.set(mBorderWidth, mBorderWidth, mBorderRect.width() - mBorderWidth, mBorderRect.height() - mBorderWidth);
+        mDrawableRadius = Math.min(mDrawableRect.height() / 2, mDrawableRect.width() / 2);
+
+        updateShaderMatrix();
+        invalidate();
+    }
+
+    private void updateShaderMatrix() {
+        float scale;
+        float dx = 0;
+        float dy = 0;
+
+        mShaderMatrix.set(null);
+
+        if (mBitmapWidth * mDrawableRect.height() > mDrawableRect.width() * mBitmapHeight) {
+            scale = mDrawableRect.height() / (float) mBitmapHeight;
+            dx = (mDrawableRect.width() - mBitmapWidth * scale) * 0.5f;
+        } else {
+            scale = mDrawableRect.width() / (float) mBitmapWidth;
+            dy = (mDrawableRect.height() - mBitmapHeight * scale) * 0.5f;
+        }
+
+        mShaderMatrix.setScale(scale, scale);
+        mShaderMatrix.postTranslate((int) (dx + 0.5f) + mBorderWidth, (int) (dy + 0.5f) + mBorderWidth);
+
+        mBitmapShader.setLocalMatrix(mShaderMatrix);
+    }
+
+}
+
+
@@ -25,6 +25,8 @@
         android:id="@+id/feedback_textView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="@dimen/_20px"
+        android:paddingBottom="@dimen/_20px"
         android:layout_centerVertical="true"
         android:layout_marginLeft="@dimen/_30px"
         android:background="@null"
@@ -10,20 +10,23 @@
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="150dp"
             >
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
+                android:singleLine="true"
                 android:text="我的"
-                android:textSize="@dimen/_30px"
+                android:textColor="@color/config_black_color"
+                android:textSize="22sp"
                 />
         </RelativeLayout>
         <View
             android:layout_width="match_parent"
+            android:layout_marginBottom="@dimen/_20px"
             android:layout_height="1px"
             android:background="@color/gray_line_color" />
@@ -35,11 +38,12 @@
                 android:gravity="center_vertical"
                 style="@style/list_item_style">
-                <ImageView
+                <com.cnlive.gundam.user.view.CircleImageView
                     android:id="@+id/head_img"
                     android:layout_width="55dip"
                     android:layout_height="55dip"
                     android:layout_centerVertical="true"
+                    android:src="@drawable/cnlive_user_header"
                     android:layout_marginLeft="11dp"
                     android:layout_marginRight="16dp" />
@@ -61,14 +65,7 @@
                         android:text="@string/click_login"
                         android:textColor="@color/config_black_color"
                         android:textSize="17sp" />
-                    <TextView
-                        android:id="@+id/point"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="3dp"
-                        android:text="@string/login_china_coin"
-                        android:textColor="@color/config_gray_color"
-                        android:textSize="12sp" />
+
                 </LinearLayout>
                 <ImageView
@@ -86,38 +83,21 @@
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:id="@+id/live"
-            style="@style/list_item_style">
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:id="@+id/ic_config_history"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_config_history"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/ic_config_history"
-                android:layout_marginLeft="20dp"
-                android:text="我要直播"/>
-        </RelativeLayout>
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
             android:background="@color/gray_line_color" />
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="30dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="@dimen/_20px"
             android:id="@+id/message"
             style="@style/list_item_style">
             <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="@dimen/_20px"
                 android:layout_centerVertical="true"
                 android:id="@+id/ic_setting_opinion"
                 android:src="@drawable/ic_setting_opinion"/>
@@ -126,8 +106,23 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toRightOf="@+id/ic_setting_opinion"
-                android:layout_marginLeft="20dp"
-                android:text="意见反馈"/>
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="意见反馈"
+                android:textColor="@color/config_black_color"
+                android:layout_marginLeft="30dp"
+                android:textSize="17sp"/>
+
+
+            <ImageView
+                android:id="@+id/imv_message"
+                android:layout_width="@dimen/next_image_width"
+                android:layout_height="@dimen/next_image_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/next_image_margin_right"
+                android:contentDescription="@null"
+                android:src="@drawable/btn_channel_more" />
         </RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="CircleImageView">
+        <attr name="border_width" format="dimension" />
+        <attr name="border_color" format="color" />
+    </declare-styleable>
+</resources>
 \ No newline at end of file