合并

谷俊
2 parents 9921f315 54453777
Showing 234 changed files with 426 additions and 888 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);
+    }
+
+}
+
+
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_flash_on_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_flash_on" android:state_pressed="false" />
+
+    <item android:drawable="@drawable/stream_close_on" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_close" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_meiyan_on_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_meiyan_on" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_flash_on_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_flash_on" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_close_on" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_close" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_switch_camera_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_switch_camera" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_meiyan_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_meiyan" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_meiyan_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_meiyan" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_switch_camera_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_switch_camera" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_meiyan_on_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_meiyan_on" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_camera_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_camera" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_camera_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_camera" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_camera" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_camera" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_camera" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_camera" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_home" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_home_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_home" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_home_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_home_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_home_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_home_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_home_sel" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_live_tv" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_live_tv" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_person" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_person_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_person" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_person_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_person_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_person_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_person_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_person_sel" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_videocam" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_videocam" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
@@ -125,7 +125,7 @@
                     android:layout_below="@+id/end_view"
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="48dp"
-                    android:background="@drawable/btn_record_end"
+                    android:background="@drawable/record_end"
                     android:onClick="onClick"
                     android:text="知道了"
                     android:textColor="@android:color/white"
@@ -162,7 +162,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@{isShow.beautifulBtn ? @drawable/icon_record_meiyan_on : @drawable/icon_record_meiyan}" />
+                android:src="@{isShow.beautifulBtn ? @drawable/record_meiyan_on : @drawable/record_meiyan}" />
             <ImageButton
                 android:id="@+id/btn_flip"
@@ -172,7 +172,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/icon_record_flip" />
+                android:src="@drawable/record_flip" />
             <ImageButton
                 android:id="@+id/btn_flash"
@@ -182,7 +182,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/icon_record_flash"
+                android:src="@drawable/record_flash"
                 android:visibility="@{isShow.flashBtn ? 0 : 8}" />
             <ImageButton
@@ -195,7 +195,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/icon_record_close" />
+                android:src="@drawable/record_close" />
         </LinearLayout>
         <Button
@@ -203,7 +203,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:background="@drawable/anchor_retry_nor"
+            android:background="@drawable/record_retry_nor"
             android:onClick="onClick"
             android:padding="5dp"
             android:text="开始直播"
@@ -244,7 +244,7 @@
                 android:layout_below="@+id/auto_reconnect_msg"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/anchor_retry_nor"
+                android:background="@drawable/record_retry_nor"
                 android:onClick="onClick"
                 android:paddingBottom="8dp"
                 android:paddingLeft="15dp"
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     >
-    <ScrollView
-        android:id="@+id/detail_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
         <RelativeLayout
             android:layout_width="match_parent"
@@ -27,6 +23,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_30px"
                     android:background="@android:color/white"
                     android:orientation="vertical">
@@ -90,7 +87,7 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
+                    android:layout_marginTop="40dp"
                     android:orientation="horizontal"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp">
@@ -121,111 +118,21 @@
                         android:textSize="15sp" />
                 </RelativeLayout>
-                <Button
-                    android:id="@+id/btn_login"
-                    style="@style/LoginButtonStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="59dp"
-                    android:background="@drawable/user_btn_login"
-                    android:gravity="center"
-                    android:onClick="onClick"
-                    android:text="@string/user_login" />
-
-
-                <TextView
-                    android:id="@+id/login_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="100dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/user_login_third_part_login"
-                    android:textColor="@color/text_hint_color"
-                    android:textSize="15sp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="37dp"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/rbtn_login_wechat"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/share_btn_weixin"
-                            android:onClick="onClick"
-                            android:layout_marginBottom="4dp"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/third_login_weixin"
-                            android:textColor="@color/text_hint_color"
-                            android:textSize="12sp" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/rbtn_login_qq"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/share_btn_tencent"
-                            android:onClick="onClick"
-                            android:layout_marginBottom="4dp"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/third_login_qq"
-                            android:textColor="@color/text_hint_color"
-                            android:textSize="12sp" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/rbtn_login_micro_blog"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/share_btn_sina"
-                            android:onClick="onClick"
-                            android:layout_marginBottom="4dp"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/third_login_sina"
-                            android:textColor="@color/text_hint_color"
-                            android:textSize="12sp" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
             </LinearLayout>
+            <Button
+                android:id="@+id/btn_login"
+                style="@style/LoginButtonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="200dp"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/user_btn_login"
+                android:gravity="center"
+                android:onClick="onClick"
+                android:text="@string/user_login" />
+
             <ImageView
                 android:id="@+id/back_selector"
                 android:layout_width="30dp"
@@ -249,6 +156,6 @@
         </RelativeLayout>
-    </ScrollView>
+
 </layout>
 \ No newline at end of file
@@ -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"
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:cn="http://schemas.android.com/apk/res-auto"
     >
     <LinearLayout
@@ -10,124 +11,119 @@
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
-            >
+            android:layout_height="48dp">
+
             <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_height="1px"
+            android:layout_marginBottom="@dimen/_20px"
             android:background="@color/gray_line_color" />
-            <RelativeLayout
-                android:id="@+id/config_header"
-                android:layout_width="fill_parent"
-                android:layout_height="85dp"
-                android:gravity="center_vertical"
-                style="@style/list_item_style">
+        <RelativeLayout
+            android:id="@+id/config_header"
+            style="@style/list_item_style"
+            android:layout_width="fill_parent"
+            android:layout_height="85dp"
+            android:gravity="center_vertical">
+
+            <com.cnlive.gundam.user.view.CircleImageView
+                android:id="@+id/head_img"
+                android:layout_width="55dip"
+                android:layout_height="55dip"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="11dp"
+                android:layout_marginRight="16dp"
+                cn:border_color="@android:color/transparent"
+                android:src="@drawable/cnlive_user_header" />
-                <ImageView
-                    android:id="@+id/head_img"
-                    android:layout_width="55dip"
-                    android:layout_height="55dip"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="11dp"
-                    android:layout_marginRight="16dp" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/next"
+                android:layout_toRightOf="@+id/head_img"
+                android:orientation="vertical">
-                <LinearLayout
+                <TextView
+                    android:id="@+id/tv_nickname"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toRightOf="@+id/head_img"
-                    android:orientation="vertical"
-                    android:layout_toLeftOf="@+id/next">
-
-                    <TextView
-                        android:id="@+id/tv_nickname"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="3dp"
-                        android:gravity="center_vertical"
-                        android:singleLine="true"
-                        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
-                    android:id="@+id/next"
-                    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>
+                    android:layout_margin="3dp"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:text="@string/click_login"
+                    android:textColor="@color/config_black_color"
+                    android:textSize="17sp" />
+            </LinearLayout>
-
-
-
-        <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:id="@+id/next"
+                android:layout_width="@dimen/next_image_width"
+                android:layout_height="@dimen/next_image_height"
+                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/ic_config_history"
-                android:layout_marginLeft="20dp"
-                android:text="我要直播"/>
+                android:layout_marginRight="@dimen/next_image_margin_right"
+                android:contentDescription="@null"
+                android:src="@drawable/btn_channel_more" />
         </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:id="@+id/message"
-            style="@style/list_item_style">
+            style="@style/list_item_style"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginTop="@dimen/_20px">
             <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_centerVertical="true"
                 android:id="@+id/ic_setting_opinion"
-                android:src="@drawable/ic_setting_opinion"/>
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/_20px"
+                android:src="@drawable/ic_setting_opinion" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="30dp"
                 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: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>
@@ -37,70 +37,4 @@
     <string name="request_state_error">获取活动状态失败</string>
     <string name="request_state_play_error">此活动状态无法播放</string>
-
-    <string name="net_connect_toast">"你好像掉线了"</string>
-
-    //我的
-    <string name="main_tab_config">我的</string>
-    <string name="click_login">点击登录</string>
-    <string name="login_china_coin">登录就送中国币哟</string>
-    <string name="my_config_money_desc">中国币、兑换码、金额</string>
-    <string name="logout">注销</string>
-
-    //登录页面
-    <string name="user_login_account">账号：</string>
-    <string name="user_login_account_hint">Email/手机号码</string>
-    <string name="user_login_code">密码：</string>
-    <string name="user_login_code_hint">6&#8211;20位字母或数字</string>
-    <string name="user_login_recall_code">忘记密码？</string>
-    <string name="string_fast_access">短信验证登录</string>
-    <string name="user_login">登录</string>
-    <string name="user_login_third_part_login">第三方账号登录</string>
-    <string name="third_login_sina">微博</string>
-    <string name="third_login_qq">QQ</string>
-    <string name="third_login_weixin">微信</string>
-
-    //注册页面
-    <string name="register_mobile_hint">请输入您的手机号</string>
-    <string name="getmobile_identify_code">获取验证码</string>
-    <string name="register_mobile_keycode_hint">请输入您收到的验证码</string>
-    <string name="register_password_hint">请设置密码：6&#8211;20位字母或数字</string>
-    <string name="register_show_password">显示密码</string>
-    <string name="register_and_agree">我已阅读并同意</string>
-    <string name="register_btn">注册</string>
-
-    //找回密码页面
-    <string name="find_password_btn">找回密码</string>
-    <string name="find_password_hint">请确认密码：6&#8211;20位字母或数字</string>
-    <string name="save_btn">保存</string>
-
-    //昵称修改页面
-    <string name="user_input_nickname">请输入昵称</string>
-
-    //手机号修改页面
-    <string name="register_mobile">手机号：</string>
-    <string name="user_personal_telephone_hint">手机号码</string>
-    <string name="register_mobile_keycode">验证码：</string>
-    <string name="hint_6_numbers_code">6位数字验证码</string>
-
-    //邮箱修改页面
-    <string name="email_notify">修改后，您输入的邮箱将会收到确认邮件，请按邮件中的说明去完成验证，谢谢！</string>
-
-    //关于我们页面
-    <string name="about_us_visit">访问视讯中国官网</string>
-    <string name="about_us_call_phone">拨打客服电话</string>
-    <string name="about_us_disclaimer">免责声明</string>
-    <string name="about_us_company_name">北京中投视讯文化传媒股份有限公司</string>
-
-    //分享
-    <string name="toast_msg_share_success">分享成功！</string>
-    <string name="toast_msg_share_fail">分享失败，请再试一次</string>
-    <string name="toast_msg_share_cancel">取消分享</string>
-    <string name="share_program_download_targetUrl"> http://www.cnlive.com/web/guide.jsp</string>
-
-    //AccountManager用户管理
-    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
-    <string name="ACCOUNT_LABEL">@string/app_name</string>
-
-    <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
 </resources>
@@ -23,10 +23,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     compile 'com.android.support:appcompat-v7:26.+'
-    testCompile 'junit:junit:4.12'
 }
-package cnlive.com.myuser;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("cnlive.com.myuser.test", appContext.getPackageName());
-    }
-}
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background">
-        <shape>
-            <corners android:radius="5dip" />
-            <gradient
-                android:startColor="#D5D5D5"
-                android:centerColor="#D5D5D5"
-                android:endColor="#D5D5D5" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <corners android:radius="5dip" />
-                <gradient
-                    android:startColor="@color/ff4e51"
-                    android:centerColor="@color/ff4e51"
-                    android:endColor="@color/ff4e51" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_share_tengxun_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_share_tengxun_nor" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_share_sina_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_share_sina_nor" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/share_btn_qq_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/share_btn_qq_nor" android:state_pressed="false" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_share_weixin_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_share_weixin_nor" />
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_selected="true" android:drawable="@drawable/user_btn_logout_sel" />
-    <item android:state_pressed="true" android:drawable="@drawable/user_btn_logout_sel" />
-    <item android:state_focused="true" android:drawable="@drawable/user_btn_logout_sel" />
-    <item android:state_checked="false" android:drawable="@drawable/user_btn_logout_nor" />
-
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
-    android:useLevel="false">
-    <solid android:color="#6e6e6e" />
-
-    <size
-        android:height="40dp" />
-
-    <corners
-        android:bottomLeftRadius="20dp"
-        android:bottomRightRadius="20dp"
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp" /> <!-- 设置四个角的半径 -->
-
-</shape>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_micro_blog" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_micro_blog" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_micro_blog" android:state_focused="true" />
-    <item android:drawable="@drawable/user_micro_blog_click" />
-
-</selector>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_qq" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_qq" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_qq" android:state_focused="true" />
-    <item android:drawable="@drawable/user_qq_click" />
-
-</selector>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_wechat" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_wechat" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_wechat" android:state_focused="true" />
-    <item android:drawable="@drawable/user_wechat_click" />
-
-</selector>
 \ No newline at end of file
+<?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
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
     <color name="gray_line_color">#dcdcdc</color>
     <color name="config_black_color">#323333</color>
@@ -18,8 +15,5 @@
     //注册页面
     <color name="text_white_color">#FFFFFF</color>
-    //关于我们页面
-    <color name="star_name_color">#323333</color>
-    <color name="about_us_btn_text_color">#177bdf</color>
-    <color name="about_us_company_name_color">#969797</color>
+
 </resources>
@@ -21,10 +21,7 @@
     <dimen name="personal_text_size_14">14sp</dimen>
     <dimen name="personal_text_size_18">18sp</dimen>
-    //关于我们
-    <dimen name="about_us_text_size">17sp</dimen>
-    <dimen name="about_us_btn_size">13sp</dimen>
-    <dimen name="about_us_company_name_size">12sp</dimen>
+
     //反馈意见
     <dimen name="text_size_15">15sp</dimen>
@@ -20,9 +20,7 @@
     <string name="string_fast_access">短信验证登录</string>
     <string name="user_login">登录</string>
     <string name="user_login_third_part_login">第三方账号登录</string>
-    <string name="third_login_sina">微博</string>
-    <string name="third_login_qq">QQ</string>
-    <string name="third_login_weixin">微信</string>
+
     //注册页面
     <string name="register_mobile_hint">请输入您的手机号</string>
@@ -38,34 +36,13 @@
     <string name="find_password_hint">请确认密码：6&#8211;20位字母或数字</string>
     <string name="save_btn">保存</string>
-    //昵称修改页面
-    <string name="user_input_nickname">请输入昵称</string>
+    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
+    <string name="ACCOUNT_LABEL">@string/app_name</string>
-    //手机号修改页面
-    <string name="register_mobile">手机号：</string>
-    <string name="user_personal_telephone_hint">手机号码</string>
-    <string name="register_mobile_keycode">验证码：</string>
-    <string name="hint_6_numbers_code">6位数字验证码</string>
-    //邮箱修改页面
-    <string name="email_notify">修改后，您输入的邮箱将会收到确认邮件，请按邮件中的说明去完成验证，谢谢！</string>
-    //关于我们页面
-    <string name="about_us_visit">访问视讯中国官网</string>
-    <string name="about_us_call_phone">拨打客服电话</string>
-    <string name="about_us_disclaimer">免责声明</string>
-    <string name="about_us_company_name">北京中投视讯文化传媒股份有限公司</string>
-    //分享
-    <string name="toast_msg_share_success">分享成功！</string>
-    <string name="toast_msg_share_fail">分享失败，请再试一次</string>
-    <string name="toast_msg_share_cancel">取消分享</string>
-    <string name="share_program_download_targetUrl"> http://www.cnlive.com/web/guide.jsp</string>
-    //AccountManager用户管理
-    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
-    <string name="ACCOUNT_LABEL">@string/app_name</string>
-    <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
 </resources>
 <resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
     <style name="ActionbarTitleStyle">
         <item name="android:textSize">22sp</item>
@@ -81,11 +74,4 @@
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
-    <style name="ActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
-    <!-- Customize your theme here. -->
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-    <item name="android:windowContentOverlay">@null</item>
-    </style>
 </resources>
-package cnlive.com.myuser;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
 \ No newline at end of file