合并

谷俊
2 parents 9921f315 54453777
Showing 100 changed files with 272 additions and 385 deletions
.idea/encodings.xml
.idea/inspectionProfiles/Project_Default.xml
.idea/markdown-navigator.xml
.idea/markdown-navigator/profiles_settings.xml
.idea/modules.xml
.idea/vcs.xml
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/user/activity/LoginActivity.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/model/ActiveInfo.java
app/src/main/java/com/cnlive/gundam/user/model/ChannelInfoModel.java
app/src/main/java/com/cnlive/gundam/user/view/CircleImageView.java
app/src/main/res/drawable-hdpi/ic_bubble.png
app/src/main/res/drawable-hdpi/ic_bubble_sel.png
app/src/main/res/drawable-hdpi/ic_camera.png → app/src/main/res/drawable-hdpi/main_camera.png
app/src/main/res/drawable-hdpi/ic_camera_sel.png → app/src/main/res/drawable-hdpi/main_camera_sel.png
app/src/main/res/drawable-hdpi/ic_home.png → app/src/main/res/drawable-hdpi/main_home.png
app/src/main/res/drawable-hdpi/ic_home_sel.png → app/src/main/res/drawable-hdpi/main_home_sel.png
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
 \ No newline at end of file
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintNewApi" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintSetTextI18n" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownProjectSettings">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="COMMONMARK_LISTS" value="false" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="true" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_EMOJI_URL" value="false" />
-        <option name="GITHUB_LISTS" value="true" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-</project>
 \ No newline at end of file
-<component name="MarkdownNavigator.ProfileManager">
-  <settings default="" pdf-export="" />
-</component>
 \ No newline at end of file
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNLiveApp.iml" filepath="$PROJECT_DIR$/CNLiveApp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNLiveApp5.iml" filepath="$PROJECT_DIR$/CNLiveApp5.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/user/user.iml" filepath="$PROJECT_DIR$/user/user.iml" />
     </modules>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
 \ No newline at end of file
@@ -53,6 +53,7 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
+
         <activity android:name=".user.activity.LoginActivity"/>
  
         <receiver
@@ -9,13 +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;
  
  
 /**
@@ -29,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();
     }
  
@@ -40,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);
     }
  
@@ -65,10 +55,11 @@ 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) {
                     //进入个人中心页面
                     Intent intent = new Intent(getActivity(), UserPersonalActivity.class);
@@ -77,18 +68,25 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                 } 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();
+        if (UserService.getInstance(getActivity()).getActiveAccountInfo().getUid() != 0) notifyUI();
+    }
+
+    private void notifyUI() {
+        User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
+        Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
+        binding.tvNickname.setText(activeAccountInfo.getNickname());
+    }
 }
@@ -34,9 +34,7 @@ public class LoginActivity extends AppCompatActivity {
         // TODO Auto-generated method stub
         if(ev.getAction()== MotionEvent.ACTION_DOWN){
  
-            // 获得当前得到焦点的View，一般情况下就是EditText（特殊情况就是轨迹求或者实体案件会移动焦点）
             View v=getCurrentFocus();
-
             if(DevilUtil.isShouldHideInput(v,ev)){
                 InputMethodManager im=(InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
                 DevilUtil.hideSoftInput(v.getWindowToken(),im);
@@ -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);
@@ -34,7 +34,6 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
     public static DataEntity data;
  
     private Account account;//密码登录的account
-    private Account account1;//第三方登录的account
  
     //跳转页面的对话框
     private ProgressDialog dialog;
@@ -155,8 +154,9 @@ 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.setUserInfo(account,data);
                     //userService.isAutoLogin();
                     userService.autoLogin(binding.edtLoginNumber.toString(), binding.edtInputPassward.getText().toString(), data);
  
-package com.cnlive.gundam.user.model;
-
-
-import java.io.Serializable;
-
-/**
- * Created by Lynn on 5/25/2017.
- */
-
-public class ActiveInfo implements Serializable {
-    private int totalCount;
-    private int nextCursor;
-    private int preCursor;
-    private String activityId;
-    private String activityName;
-    private int activityStatus;
-    private int isHorizontalScreen;
-    private String channelId;
-    private String createTime;
-    private String startTime;
-    private String endTime;
-    private String coverImgUrl;
-    private String activityCategory;
-    private Object extensions;
-    private String rates;
-
-    public ActiveInfo() {
-    }
-
-    public ActiveInfo(int totalCount, int nextCursor, int preCursor, String activityId, String activityName, int activityStatus, int isHorizontalScreen, String channelId, String createTime, String startTime, String endTime, String coverImgUrl, String activityCategory, Object extensions, String rates) {
-        this.totalCount = totalCount;
-        this.nextCursor = nextCursor;
-        this.preCursor = preCursor;
-        this.activityId = activityId;
-        this.activityName = activityName;
-        this.activityStatus = activityStatus;
-        this.isHorizontalScreen = isHorizontalScreen;
-        this.channelId = channelId;
-        this.createTime = createTime;
-        this.startTime = startTime;
-        this.endTime = endTime;
-        this.coverImgUrl = coverImgUrl;
-        this.activityCategory = activityCategory;
-        this.extensions = extensions;
-        this.rates = rates;
-    }
-
-    public int getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public int getNextCursor() {
-        return nextCursor;
-    }
-
-    public void setNextCursor(int nextCursor) {
-        this.nextCursor = nextCursor;
-    }
-
-    public int getPreCursor() {
-        return preCursor;
-    }
-
-    public void setPreCursor(int preCursor) {
-        this.preCursor = preCursor;
-    }
-
-    public String getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(String activityId) {
-        this.activityId = activityId;
-    }
-
-    public String getActivityName() {
-        return activityName;
-    }
-
-    public void setActivityName(String activityName) {
-        this.activityName = activityName;
-    }
-
-    public int getActivityStatus() {
-        return activityStatus;
-    }
-
-    public void setActivityStatus(int activityStatus) {
-        this.activityStatus = activityStatus;
-    }
-
-    public int getIsHorizontalScreen() {
-        return isHorizontalScreen;
-    }
-
-    public void setIsHorizontalScreen(int isHorizontalScreen) {
-        this.isHorizontalScreen = isHorizontalScreen;
-    }
-
-    public String getChannelId() {
-        return channelId;
-    }
-
-    public void setChannelId(String channelId) {
-        this.channelId = channelId;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getCoverImgUrl() {
-        return coverImgUrl;
-    }
-
-    public void setCoverImgUrl(String coverImgUrl) {
-        this.coverImgUrl = coverImgUrl;
-    }
-
-    public String getActivityCategory() {
-        return activityCategory;
-    }
-
-    public void setActivityCategory(String activityCategory) {
-        this.activityCategory = activityCategory;
-    }
-
-    public Object getExtensions() {
-        return extensions;
-    }
-
-    public void setExtensions(Object extensions) {
-        this.extensions = extensions;
-    }
-
-    public String getRates() {
-        return rates;
-    }
-
-    public void setRates(String rates) {
-        this.rates = rates;
-    }
-
-    @Override
-    public String toString() {
-        return "ActiveInfo{" +
-                "totalCount=" + totalCount +
-                ", nextCursor=" + nextCursor +
-                ", preCursor=" + preCursor +
-                ", activityId='" + activityId + '\'' +
-                ", activityName='" + activityName + '\'' +
-                ", activityStatus=" + activityStatus +
-                ", isHorizontalScreen=" + isHorizontalScreen +
-                ", channelId='" + channelId + '\'' +
-                ", createTime='" + createTime + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", endTime='" + endTime + '\'' +
-                ", coverImgUrl='" + coverImgUrl + '\'' +
-                ", activityCategory='" + activityCategory + '\'' +
-                ", extensions='" + extensions + '\'' +
-                ", rates='" + rates + '\'' +
-                '}';
-    }
-}
-package com.cnlive.gundam.user.model;
-
-
-import com.cnlive.gundam.user.model.base.ErrorMessage;
-
-import java.io.Serializable;
-
-/**
- * Created by Lynn on 5/26/2017.
- */
-
-public class ChannelInfoModel extends ErrorMessage {
-    private ChannelInfo data;
-
-    public ChannelInfoModel() {
-    }
-
-    public ChannelInfoModel(ChannelInfo data) {
-        this.data = data;
-    }
-
-    public ChannelInfo getData() {
-        return data;
-    }
-
-    public void setData(ChannelInfo data) {
-        this.data = data;
-    }
-
-    public class ChannelInfo implements Serializable {
-        private String coverImgUrl;
-        private String channelId;
-        private String channelName;
-        private int status;
-
-        public ChannelInfo() {
-        }
-
-        public ChannelInfo(String coverImgUrl, String channelId, String channelName, int status) {
-            this.coverImgUrl = coverImgUrl;
-            this.channelId = channelId;
-            this.channelName = channelName;
-            this.status = status;
-        }
-
-        public String getCoverImgUrl() {
-            return coverImgUrl;
-        }
-
-        public void setCoverImgUrl(String coverImgUrl) {
-            this.coverImgUrl = coverImgUrl;
-        }
-
-        public String getChannelId() {
-            return channelId;
-        }
-
-        public void setChannelId(String channelId) {
-            this.channelId = channelId;
-        }
-
-        public String getChannelName() {
-            return channelName;
-        }
-
-        public void setChannelName(String channelName) {
-            this.channelName = channelName;
-        }
-
-        public int getStatus() {
-            return status;
-        }
-
-        public void setStatus(int status) {
-            this.status = status;
-        }
-
-        @Override
-        public String toString() {
-            return "ChannelInfo{" +
-                    "coverImgUrl='" + coverImgUrl + '\'' +
-                    ", channelId='" + channelId + '\'' +
-                    ", channelName='" + channelName + '\'' +
-                    ", status=" + status +
-                    '}';
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "ChannelInfoModel{" +
-                "data=" + data +
-                '}';
-    }
-}
+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);
+    }
+
+}
+
+