Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp

朱显松
2 parents 86228b37 576a7725
Showing 46 changed files with 651 additions and 636 deletions
.idea/inspectionProfiles/Project_Default.xml
.idea/markdown-navigator.xml
.idea/markdown-navigator/profiles_settings.xml
.idea/vcs.xml
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/gundam/main/ui/activity/BackBaseActivity.java
app/src/main/java/com/cnlive/gundam/main/ui/adapter/DataBindingAdapter.java
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/activity/UserPersonalActivity.java
app/src/main/java/com/cnlive/gundam/user/adapter/PersonalAdapter.java
app/src/main/java/com/cnlive/gundam/user/fragment/LoginFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalEditFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.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/model/PersonalDate.java → app/src/main/java/com/cnlive/gundam/user/model/PersonalData.java
app/src/main/java/com/cnlive/gundam/video/test.java
app/src/main/res/layout/activity_user_personal.xml
app/src/main/res/layout/fragment_login.xml
@@ -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
 <?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
@@ -86,7 +86,6 @@
         <activity
             android:name=".user.activity.UserPersonalActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
     </application>
+package com.cnlive.gundam.main.ui.activity;
+
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import com.cnlive.gundam.R;
+
+/**
+ * Created by gujun on 2017/5/31.
+ */
+
+public class BackBaseActivity extends AppCompatActivity {
+
+    private Toolbar toolbar;
+
+    protected void setupToolBar(String title) {
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setTitle("");
+        TextView toolbarTitle = (TextView) findViewById(R.id.toolbarTitle);
+        toolbarTitle.setText(title);
+        toolbar.setVisibility(View.VISIBLE);
+        toolbar.setNavigationIcon(R.drawable.btn_cancel);
+        setSupportActionBar(toolbar);
+
+    }
+
+    public void setToolBarVisible(boolean show) {
+        if (toolbar == null) return;
+        toolbar.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            this.onBackPressed();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
@@ -17,11 +17,11 @@ import com.cnlive.gundam.main.ui.adapter.holder.DataBindingViewHolder;
 public class DataBindingAdapter<T> extends BaseRecyclerAdapter<T> {
     private int layoutId;
-    private int itemBRId;
+    protected int itemBRId;
     private int imageHeightBRId = -1;
     private int imageHeight;
-    private OnAdapterViewClickListener<T> l;
+    protected OnAdapterViewClickListener<T> l;
     private OnAdapterViewLoadMoreListener loadMoreListener;
     public DataBindingAdapter(Context context, int layoutId, int itemBRId) {
@@ -57,10 +57,15 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
         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);
+                    intent.putExtra("isEdit",false);
+                    startActivity(intent);
+                } else {
+                    //进入登录页面
                     startActivity(new Intent(getActivity(), LoginActivity.class));
+                }
                 break;
             case R.id.message:
@@ -74,8 +79,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onResume() {
         super.onResume();
-        notifyUI();
-
+        if (UserService.getInstance(getActivity()).getActiveAccountInfo().getUid() != 0) notifyUI();
     }
     private void notifyUI() {
@@ -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);
 package com.cnlive.gundam.user.activity;
+import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.ui.activity.BackBaseActivity;
+import com.cnlive.gundam.user.fragment.UserPersonalEditFragment;
 import com.cnlive.gundam.user.fragment.UserPersonalFragment;
 /**
@@ -13,11 +15,24 @@ import com.cnlive.gundam.user.fragment.UserPersonalFragment;
  * @time 2017/6/28  12:56
  * @desc ${TODD}
  */
-public class UserPersonalActivity extends AppCompatActivity {
+public class UserPersonalActivity extends BackBaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        DataBindingUtil.setContentView(this, R.layout.activity_setting);
-        getSupportFragmentManager().beginTransaction().replace(R.id.setting_fragment, UserPersonalFragment.newInstance()).commit();
+        DataBindingUtil.setContentView(this, R.layout.activity_user_personal);
+        addFragment(getIntent());
+    }
+
+    private void addFragment(Intent intent ){
+        if (intent.hasExtra("isEdit")) {
+            getSupportFragmentManager().beginTransaction().replace(R.id.contentLayout,
+                    intent.getBooleanExtra("isEdit",false) ?
+                            UserPersonalEditFragment.newInstance(intent.getIntExtra("type", 0)) :
+                            UserPersonalFragment.newInstance()).commit();
+        }
+    }
+
+    public void setTitle(String title){
+        setupToolBar(title);
     }
 }
+package com.cnlive.gundam.user.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.cnlive.gundam.BR;
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
+import com.cnlive.gundam.main.ui.adapter.holder.DataBindingViewHolder;
+import com.cnlive.gundam.user.model.PersonalData;
+
+/**
+ * Created by gujun on 2017/6/28.
+ */
+
+public class PersonalAdapter extends DataBindingAdapter<PersonalData>{
+
+    public PersonalAdapter(Context context, int layoutId, int itemBRId) {
+        super(context, layoutId, itemBRId);
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if(viewType == PersonalData.TYPE_HEADER){
+            ViewDataBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.layout_personal_header_item, parent, false);
+            DataBindingViewHolder viewHolder = new DataBindingViewHolder(binding.getRoot());
+            viewHolder.setBinding(binding);
+            return viewHolder;
+        }else{
+            return super.onCreateViewHolder(parent, viewType);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        if(getItem(position).getItemType() == PersonalData.TYPE_HEADER){
+            DataBindingViewHolder videoListViewHolder = (DataBindingViewHolder) holder;
+            videoListViewHolder.getBinding().setVariable(itemBRId, getItem(position));
+            if (l != null)
+                videoListViewHolder.getBinding().setVariable(BR.viewClickListner, l);
+            videoListViewHolder.getBinding().executePendingBindings();
+        }else{
+            super.onBindViewHolder(holder, position);
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return getItem(position).getItemType();
+    }
+}
@@ -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;
@@ -157,7 +156,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
                     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.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.FragmentPersonalEditBinding;
+import com.cnlive.gundam.user.activity.UserPersonalActivity;
+import com.cnlive.gundam.user.auth.UserService;
+import com.cnlive.gundam.user.model.User;
+import com.cnlive.libs.user.IUserService;
+import com.cnlive.libs.user.UserUtil;
+import com.cnlive.libs.util.data.network.Callback;
+
+/**
+ * Created by gujun on 2017/6/28.
+ */
+
+public class UserPersonalEditFragment extends Fragment implements Callback, View.OnClickListener {
+
+    public static final int TYPE_NICK = 0x1001;
+    public static final int TYPE_MOBILE = 0x1002;
+    public static final int TYPE_EMAIL = 0x1003;
+    public static final int TYPE_ADDRESS = 0x1004;
+
+    private FragmentPersonalEditBinding binding;
+    private int type;
+    private User user;
+
+    public static UserPersonalEditFragment newInstance(int type) {
+
+        Bundle args = new Bundle();
+        args.putInt("type", type);
+        UserPersonalEditFragment fragment = new UserPersonalEditFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_personal_edit, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        init();
+    }
+
+    private void init() {
+        binding.setUserPersonalEditFragment(this);
+        type = getArguments().getInt("type");
+        UserService userService = UserService.getInstance(getActivity());
+        user = userService.getActiveAccountInfo();
+        String title = "";
+        switch (type) {
+            case TYPE_NICK:
+                binding.editText.setText(user.getNickname());
+                binding.editText.setVisibility(View.VISIBLE);
+                binding.includeMobileLayout.mobileKeycodeLayout.setVisibility(View.GONE);
+                title = "修改昵称";
+                break;
+            case TYPE_MOBILE:
+                binding.editText.setVisibility(View.GONE);
+                binding.includeMobileLayout.mobileKeycodeLayout.setVisibility(View.VISIBLE);
+                binding.includeMobileLayout.edtLoginNumber.setText(user.getMobile());
+                binding.includeMobileLayout.getVerify.setOnClickListener(this);
+                title = "修改手机号";
+                break;
+            case TYPE_EMAIL:
+                binding.editText.setText(user.getEmail());
+                binding.editText.setVisibility(View.VISIBLE);
+                binding.includeMobileLayout.mobileKeycodeLayout.setVisibility(View.GONE);
+                title = "修改邮箱";
+                break;
+            case TYPE_ADDRESS:
+                binding.editText.setText(user.getLocation());
+                binding.editText.setVisibility(View.VISIBLE);
+                binding.includeMobileLayout.mobileKeycodeLayout.setVisibility(View.GONE);
+                title = "修改地址";
+                break;
+        }
+        ((UserPersonalActivity)getActivity()).setTitle(title);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.submit) {
+            switch (type) {
+                case TYPE_NICK:
+                    UserUtil.modifyUserInfo(String.valueOf(user.getUid()), "nickName", binding.editText.getText().toString(), this);
+                    break;
+                case TYPE_MOBILE:
+                    UserUtil.updateMobile(String.valueOf(user.getUid()), binding.includeMobileLayout.edtLoginNumber.getText().toString(), binding.includeMobileLayout.edtVerify.getText().toString(), this);
+                    break;
+                case TYPE_EMAIL:
+                    UserUtil.modifyUserInfo(String.valueOf(user.getUid()), "email", binding.editText.getText().toString(), this);
+                    break;
+                case TYPE_ADDRESS:
+                    UserUtil.modifyUserInfo(String.valueOf(user.getUid()), "location", binding.editText.getText().toString(), this);
+                    break;
+            }
+        } else if (v.getId() == R.id.get_verify) {
+            //TODO 获取验证码
+            UserUtil.sendMessage(IUserService.REGISTER_OR_MODIFY_MOBILE, binding.includeMobileLayout.edtLoginNumber.getText().toString(), new Callback() {
+                @Override
+                public void onState(int i, String s, Object o) {
+                    if (i == IUserService.SUCCESS) {
+                        Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_LONG).show();
+                    } else {
+                        Toast.makeText(getActivity(), "获取验证码失败" + s, Toast.LENGTH_LONG).show();
+                    }
+
+                }
+            });
+        }
+    }
+
+    @Override
+    public void onState(int i, String s, Object o) {
+        if (i == IUserService.SUCCESS) {
+            Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
+        } else {
+            Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
+        }
+
+        //TODO 更新一下本地数据
+    }
+}
 package com.cnlive.gundam.user.fragment;
+import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
+import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentUserPersonalBinding;
+import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
+import com.cnlive.gundam.user.activity.UserPersonalActivity;
+import com.cnlive.gundam.user.adapter.PersonalAdapter;
+import com.cnlive.gundam.user.auth.UserService;
+import com.cnlive.gundam.user.model.PersonalData;
+import com.cnlive.gundam.user.model.User;
+import java.util.ArrayList;
+import java.util.List;
 /**
@@ -18,38 +30,93 @@ import com.cnlive.gundam.databinding.FragmentUserPersonalBinding;
  * @time 2017/6/28  13:06
  * @desc ${TODD}
  */
-public class UserPersonalFragment  extends Fragment{
+public class UserPersonalFragment extends Fragment implements DataBindingAdapter.OnAdapterViewClickListener<PersonalData> {
     private FragmentUserPersonalBinding binding;
+    private PersonalAdapter adapter;
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_user_personal, container, false);
-        return binding.getRoot();
-    }
+    private List<PersonalData> personalData;
     public static UserPersonalFragment newInstance() {
+
+        Bundle args = new Bundle();
+
         UserPersonalFragment fragment = new UserPersonalFragment();
+        fragment.setArguments(args);
         return fragment;
     }
+    @Nullable
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        initToolBar();
-        /*init();
-        PersonalHeadItem.getContent(getActivity());
-        PersonalItem.getContent(getActivity());*/
-    }
-    private void initToolBar() {
-        binding.personalIncludeLayout.toolbarTitle.setText("个人资料");
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_user_personal, container, false);
+        return binding.getRoot();
     }
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initData();
+        init();
+    }
+    private void initData() {
+        UserService userService = UserService.getInstance(getActivity());
+        User user = userService.getActiveAccountInfo();
+        personalData = new ArrayList<>();
+        personalData.add(new PersonalData("头像", user.getFaceurl(), PersonalData.TYPE_HEADER));
+        personalData.add(new PersonalData("昵称", user.getNickname(), PersonalData.TYPE_NICK));
+        personalData.add(new PersonalData("性别", user.getGender(), PersonalData.TYPE_GENDER));
+        personalData.add(new PersonalData("手机号", user.getMobile(), PersonalData.TYPE_MOBILE));
+        personalData.add(new PersonalData("邮箱", user.getEmail(), PersonalData.TYPE_EMAIL));
+        personalData.add(new PersonalData("联系地址", user.getLocation(), PersonalData.TYPE_ADDRESS));
+    }
+    private void init() {
+        ((UserPersonalActivity)getActivity()).setTitle("个人资料");
+        binding.setListAdapter(adapter = new PersonalAdapter(getActivity(), R.layout.layout_personal_item, BR.data));
+        binding.setLayoutManager(new LinearLayoutManager(getActivity()));
+        adapter.updateItems(personalData);
+        adapter.setOnViewClickListener(this);
+    }
-
-
+    @Override
+    public void onViewClick(View v, PersonalData program) {
+        if (v.getId() == R.id.itemLayout) {
+            Intent intent = null;
+            switch (program.getItemType()) {
+                case PersonalData.TYPE_HEADER:
+                    Toast.makeText(getActivity(), "头像点击", Toast.LENGTH_LONG).show();
+                    break;
+                case PersonalData.TYPE_NICK:
+                    intent = new Intent(getActivity(), UserPersonalActivity.class);
+                    intent.putExtra("isEdit",true);
+                    intent.putExtra("type", UserPersonalEditFragment.TYPE_NICK);
+                    startActivity(intent);
+                    break;
+                case PersonalData.TYPE_GENDER:
+                    Toast.makeText(getActivity(), "性别点击", Toast.LENGTH_LONG).show();
+                    break;
+                case PersonalData.TYPE_MOBILE:
+                    intent = new Intent(getActivity(), UserPersonalActivity.class);
+                    intent.putExtra("isEdit",true);
+                    intent.putExtra("type", UserPersonalEditFragment.TYPE_MOBILE);
+                    startActivity(intent);
+                    break;
+                case PersonalData.TYPE_EMAIL:
+                    intent = new Intent(getActivity(), UserPersonalActivity.class);
+                    intent.putExtra("isEdit",true);
+                    intent.putExtra("type", UserPersonalEditFragment.TYPE_EMAIL);
+                    startActivity(intent);
+                    break;
+                case PersonalData.TYPE_ADDRESS:
+                    intent = new Intent(getActivity(), UserPersonalActivity.class);
+                    intent.putExtra("isEdit",true);
+                    intent.putExtra("type", UserPersonalEditFragment.TYPE_ADDRESS);
+                    startActivity(intent);
+                    break;
+            }
+        }
+    }
 }
-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 +
-                '}';
-    }
-}
@@ -5,7 +5,25 @@ package com.cnlive.gundam.user.model;
  * @time 2017/6/28  13:55
  * @desc ${TODD}
  */
-public class PersonalDate {
+public class PersonalData {
+
+    private String itemName;
+    private String itemMessage;
+    private int itemType;
+
+    public static final int TYPE_HEADER = 0x1001;
+    public static final int TYPE_NICK = 0x1002;
+    public static final int TYPE_GENDER = 0x1003;
+    public static final int TYPE_MOBILE = 0x1004;
+    public static final int TYPE_EMAIL = 0x1005;
+    public static final int TYPE_ADDRESS = 0x1006;
+
+    public PersonalData(String itemName, String itemMessage, int itemType) {
+        this.itemName = itemName;
+        this.itemMessage = itemMessage;
+        this.itemType = itemType;
+    }
+
     public String getItemName() {
         return itemName;
     }
@@ -14,8 +32,6 @@ public class PersonalDate {
         this.itemName = itemName;
     }
-    private  String  itemName;
-
     public String getItemMessage() {
         return itemMessage;
     }
@@ -24,18 +40,11 @@ public class PersonalDate {
         this.itemMessage = itemMessage;
     }
-    private  String  itemMessage;
-
-
-
-    public PersonalDate(String itemName, String itemMessage) {
-        this.itemName = itemName;
-        this.itemMessage = itemMessage;
+    public int getItemType() {
+        return itemType;
     }
-
-
-
-
-
+    public void setItemType(int itemType) {
+        this.itemType = itemType;
+    }
 }
-package com.cnlive.gundam.video;
-
-/**
- * Created by gujun on 2017/6/27.
- */
-
-public class test {
-}
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/layout_actionbar_back"/>
+
+        <RelativeLayout
+            android:id="@+id/contentLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+
+</layout>
 \ No newline at end of file
 <?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
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <import type="com.cnlive.gundam.user.fragment.UserPersonalEditFragment" />
+
+        <variable
+            name="userPersonalEditFragment"
+            type="UserPersonalEditFragment" />
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <EditText
+            android:id="@+id/editText"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:visibility="gone"/>
+
+        <include
+            android:id="@+id/includeMobileLayout"
+            layout="@layout/mobile_keycode_layout"/>
+
+        <Button
+            android:id="@+id/submit"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="200dp"
+            android:onClick="@{userPersonalEditFragment.onClick}"
+            android:text="提交" />
+
+    </RelativeLayout>
+
+</layout>
 \ No newline at end of file
@@ -2,47 +2,34 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <!--<data>
+    <data>
+
+        <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter"/>
+        <import type="android.support.v7.widget.LinearLayoutManager"/>
+
+        <variable
+            name="listAdapter"
+            type="DataBindingAdapter"/>
         <variable
-            name="liLayoutManager"
-            type="android.support.v7.widget.LinearLayoutManager" />
+            name="layoutManager"
+            type="LinearLayoutManager"/>
     </data>
--->
+
     <RelativeLayout
-        android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <LinearLayout
-            android:id="@+id/persion_layout"
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <include
-                android:id="@+id/personalIncludeLayout"
-                layout="@layout/user_toolbar_title" />
-
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/lv_personal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:divider="@null"
-                android:fastScrollEnabled="true"
-                android:scrollbars="none"
-                 />
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/back_selector"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginLeft="@dimen/_20px"
-            android:layout_marginTop="@dimen/_28px"
-            android:src="@drawable/btn_return" />
+            android:clipToPadding="true"
+            android:clipChildren="true"
+            android:paddingTop="5dp"
+            android:background="@color/list_divider"
+            app:adapter="@{listAdapter}"
+            app:layoutManager="@{layoutManager}"/>
     </RelativeLayout>
 </layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:theme="@style/ThemeOverlay.AppCompat.Light"
+    app:contentInsetEnd="?attr/actionBarSize"
+    android:visibility="gone"
+    tools:visibility="visible">
+
+
+    <TextView
+        android:id="@+id/toolbarTitle"
+        style="@style/ActionbarTitleStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:lines="1"
+        tools:text="here is title"/>
+
+</android.support.v7.widget.Toolbar>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="com.cnlive.gundam.user.model.PersonalData" />
+        <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter.OnAdapterViewClickListener"/>
+
+        <variable
+            name="data"
+            type="PersonalData" />
+
+        <variable
+            name="viewClickListner"
+            type="OnAdapterViewClickListener&lt;PersonalData>"/>
+
+    </data>
+
+    <RelativeLayout
+        android:id="@+id/itemLayout"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:onClick="@{(view)->viewClickListner.onViewClick(view,data)}">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/divider"
+            android:background="@android:color/white">
+
+            <TextView
+                android:id="@+id/itemName"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="@{data.getItemName()}"
+                android:textColor="@color/black"
+                android:textSize="18sp"
+                tools:text="nick" />
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginRight="50dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:scaleType="centerCrop"
+                app:error="@{@drawable/image_error}"
+                app:imageUrl="@{data.getItemMessage()}"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"/>
+
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:layout_alignParentBottom="true"/>
+
+    </RelativeLayout>
+
+</layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="com.cnlive.gundam.user.model.PersonalData" />
+        <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter.OnAdapterViewClickListener"/>
+
+        <variable
+            name="data"
+            type="PersonalData" />
+
+        <variable
+            name="viewClickListner"
+            type="OnAdapterViewClickListener&lt;PersonalData>"/>
+
+    </data>
+
+    <RelativeLayout
+        android:id="@+id/itemLayout"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:onClick="@{(view)->viewClickListner.onViewClick(view,data)}">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/divider"
+            android:background="@android:color/white">
+
+            <TextView
+                android:id="@+id/itemName"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="@{data.getItemName()}"
+                android:textColor="@color/black"
+                android:textSize="18sp"
+                tools:text="nick" />
+
+            <TextView
+                android:id="@+id/itemMsg"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="50dp"
+                android:layout_toRightOf="@+id/itemName"
+                android:gravity="center_vertical|right"
+                android:text="@{data.getItemMessage()}"
+                android:textColor="@color/black"
+                android:textSize="18sp"
+                tools:text="haha" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"/>
+
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:layout_alignParentBottom="true"/>
+
+    </RelativeLayout>
+
+</layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    >
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
     <LinearLayout
         android:id="@+id/mobile_keycode_layout"
         android:layout_width="match_parent"
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:cn="http://schemas.android.com/apk/res-auto"
+    >
     <LinearLayout
         android:layout_width="match_parent"
@@ -44,6 +46,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="11dp"
                 android:layout_marginRight="16dp"
+                cn:border_color="@android:color/transparent"
                 android:src="@drawable/cnlive_user_header" />
             <LinearLayout
-<?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
@@ -15,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>