创建 user

陈硕
1 parent 358185d5
Showing 88 changed files with 437 additions and 573 deletions
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/user/activity/CommentActivity.java
app/src/main/java/com/cnlive/gundam/user/activity/UserPersonalActivity.java
app/src/main/java/com/cnlive/gundam/user/fragment/FeedbackFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.java
app/src/main/java/com/cnlive/gundam/user/model/PersonalDate.java
app/src/main/java/com/cnlive/gundam/user/model/Title.java
app/src/main/java/com/cnlive/gundam/user/model/UserContent.java
app/src/main/res/anim/pop_enter_anim.xml
app/src/main/res/anim/pop_exit_anim.xml
app/src/main/res/color/keycode_text_color.xml
app/src/main/res/drawable-hdpi/btn_cancel_nor.png
app/src/main/res/drawable-hdpi/btn_cancel_sel.png
app/src/main/res/drawable-hdpi/btn_list_arrows_nor.png
app/src/main/res/drawable-hdpi/btn_list_arrows_sel.png
app/src/main/res/drawable-hdpi/btn_return.png
app/src/main/res/drawable-hdpi/cnlive_user_header.png
@@ -36,4 +36,5 @@ dependencies {
     compile 'org.igniterealtime.smack:smack-tcp:4.1.4'
     compile 'org.greenrobot:greendao-encryption:2.2.2'
     compile 'com.gyf.barlibrary:barlibrary:2.2.4'
+    compile project(':user')
 }
@@ -73,13 +73,25 @@
             </intent-filter>
         </receiver>
-
+        <activity
+            android:name=".user.activity.CommentActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".stream.ui.activity.StreamActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
+        <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>
 </manifest>
 \ No newline at end of file
@@ -13,6 +13,6 @@ public class CNLiveApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9");
+        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9",true);
     }
 }
@@ -5,16 +5,18 @@ import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 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.auth.UserService;
+
+
 /**
  * Created by xiansong on 2017/6/27.
  */
@@ -79,6 +81,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                 break;
             case R.id.message:
+                startActivity(new Intent(getActivity(), CommentActivity.class));
                 break;
+package com.cnlive.gundam.user.activity;
+
+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.user.fragment.FeedbackFragment;
+
+/**
+ * @author 陈硕
+ * @time 2017/6/28  11:42
+ * @desc ${TODD}
+ */
+public class CommentActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        DataBindingUtil.setContentView(this, R.layout.activity_setting);
+        getSupportFragmentManager().beginTransaction().replace(R.id.setting_fragment, FeedbackFragment.newInstance()).commit();
+    }
+}
+package com.cnlive.gundam.user.activity;
+
+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.user.fragment.UserPersonalFragment;
+
+/**
+ * @author 陈硕
+ * @time 2017/6/28  12:56
+ * @desc ${TODD}
+ */
+public class UserPersonalActivity extends AppCompatActivity {
+    @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();
+    }
+}
+package com.cnlive.gundam.user.fragment;
+
+import android.app.ProgressDialog;
+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 com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.UserFeedbackBinding;
+import com.cnlive.gundam.user.util.ToastUtil;
+import com.cnlive.libs.user.IUserService;
+import com.cnlive.libs.user.UserUtil;
+import com.cnlive.libs.util.data.network.Callback;
+
+
+
+/**
+ * Created by luxiaoman on 2017/6/1.
+ */
+
+public class FeedbackFragment extends Fragment implements View.OnClickListener {
+    private UserFeedbackBinding binding;
+
+    //跳转页面的对话框
+    private ProgressDialog dialog;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.user_feedback, container, false);
+        return binding.getRoot();
+    }
+
+    public static Fragment newInstance() {
+        FeedbackFragment fragment = new FeedbackFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        try {
+            initToolBar();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        initView();
+    }
+
+    private void initToolBar(){
+        //整个页面的大标题
+        binding.feedbackIncludeLayout.toolbarTitle.setText("反馈意见");
+    }
+
+    private void initView() {
+        //返回键
+        binding.backSelector.setOnClickListener(this);
+        //反馈按钮
+        binding.feedback.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        int i = v.getId();
+        if (i == R.id.back_selector) {//返回上一页面
+            getFragmentManager().popBackStack();
+
+        } else if (i == R.id.feedback) {
+         /**
+         * 用户反馈
+         *
+         * @param id         举报内容ID
+         * @param msg        举报内容(app自己组织-不能带特殊字符&号等)
+         * @param callback   回调
+         */
+            //显示对话框
+            showDialog();
+            //调用sdk的用户反馈方法
+            UserUtil.feedback("id", binding.feedbackTextView.getText().toString(), feedbackcall);
+        }
+    }
+
+    /**
+     * 用户反馈的回调
+     */
+    protected FeedbackCall feedbackcall = new FeedbackCall();
+    private class FeedbackCall implements Callback {
+        @Override
+        public void onState(int what, String extra, Object obj) {
+            switch (what) {
+                case IUserService.SUCCESS:
+                    ToastUtil.show(getActivity(), "反馈成功");
+                    getFragmentManager().popBackStack();
+                    break;
+                case IUserService.ERROR_PARAM:
+                    ToastUtil.show(getActivity(), IUserService.message_error_param);
+                    break;
+                case IUserService.ERROR_FEEDBACK_INSERT_FAILED:
+                    ToastUtil.show(getActivity(), IUserService.message_feedback_insert_failed);
+                    break;
+                case IUserService.ERROR_FEEDBACK_LENGTH:
+                    ToastUtil.show(getActivity(), IUserService.message_feedback_length);
+                    break;
+                case IUserService.ERROR_OTHER:
+                    ToastUtil.show(getActivity(), IUserService.message_error_other);
+                    break;
+            }
+            closeDialog();
+        }
+    }
+
+    /**
+     * 显示对话框
+     */
+    public void showDialog() {
+        if (dialog == null) {
+            dialog = new ProgressDialog(getActivity());
+            dialog.setMessage("正在提交，请稍等...");
+        }
+        if (!dialog.isShowing()) {
+            dialog.show();
+        }
+    }
+
+    /**
+     * 关闭对话框
+     */
+    public void closeDialog() {
+        if (dialog != null && dialog.isShowing()) {
+            dialog.dismiss();
+        }
+    }
+}
+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 com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.FragmentUserPersonalBinding;
+
+
+
+/**
+ * @author 陈硕
+ * @time 2017/6/28  13:06
+ * @desc ${TODD}
+ */
+public class UserPersonalFragment  extends Fragment{
+
+    private FragmentUserPersonalBinding binding;
+
+
+    @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();
+    }
+
+    public static UserPersonalFragment newInstance() {
+        UserPersonalFragment fragment = new UserPersonalFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        initToolBar();
+        /*init();
+        PersonalHeadItem.getContent(getActivity());
+        PersonalItem.getContent(getActivity());*/
+    }
+    private void initToolBar() {
+        binding.personalIncludeLayout.toolbarTitle.setText("个人资料");
+    }
+
+
+
+}
+package com.cnlive.gundam.user.model;
+
+/**
+ * @author 陈硕
+ * @time 2017/6/28  13:55
+ * @desc ${TODD}
+ */
+public class PersonalDate {
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    private  String  itemName;
+
+    public String getItemMessage() {
+        return itemMessage;
+    }
+
+    public void setItemMessage(String itemMessage) {
+        this.itemMessage = itemMessage;
+    }
+
+    private  String  itemMessage;
+
+
+
+    public PersonalDate(String itemName, String itemMessage) {
+        this.itemName = itemName;
+        this.itemMessage = itemMessage;
+    }
+
+
+
+
+
+
+}
-package com.cnlive.gundam.user.model;
-
-/**
- * Created by luxiaoman on 2017/5/27.
- */
-
-public class Title {
-    private String title;
-
-    public Title() {
-    }
-
-    public Title(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    @Override
-    public String toString() {
-        return "Title{" +
-                "title='" + title + '\'' +
-                '}';
-    }
-}
-package com.cnlive.gundam.user.model;
-
-/**
- * Created by luxiaoman on 2017/2/24.
- */
-public class UserContent {
-
-    public final static int HEADER = 0;                    //header类型的条目
-    public final static int ITEM = 1;                      //item类型的条目
-    public final static int ITEM_NOTIFICATION = 2;         //item类型中通知列表的条目
-    public final static int ITEM_CACHE = 3;                //item类型中清除缓存的条目
-    public final static int ITEM_PERSONAL_HEADER = 4;      //item类型中个人资料中头像类型的条目
-    public final static int ITEM_PERSONAL = 5;             //item类型中个人资料中除编辑类型的条目
-    public final static int BOTTOM = 6;                    //item类型中个人资料中注销类型的条目
-
-
-    private String itemLetter;
-    private int itemType;
-    private String itemName;
-    private String itemContent;
-    private int itemIcon;
-
-    public String getItemLetter() {
-        return itemLetter;
-    }
-
-    public void setItemLetter(String itemLetter) {
-        this.itemLetter = itemLetter;
-    }
-
-    public int getItemType() {
-        return itemType;
-    }
-
-    public void setItemType(int itemType) {
-        this.itemType = itemType;
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-
-    public String getItemContent() {
-        return itemContent;
-    }
-
-    public void setItemContent(String itemContent) {
-        this.itemContent = itemContent;
-    }
-
-    public int getItemIcon() {
-        return itemIcon;
-    }
-
-    public void setItemIcon(int itemIcon) {
-        this.itemIcon = itemIcon;
-    }
-
-
-    public UserContent(String itemLetter, int itemType, String itemName, String itemContent, int itemIcon) {
-        this.itemLetter = itemLetter;
-        this.itemType = itemType;
-        this.itemName = itemName;
-        this.itemContent = itemContent;
-        this.itemIcon = itemIcon;
-    }
-}
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="200"
-        android:fromYDelta="100%p"
-        android:toYDelta="0" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="200"
-        android:fromYDelta="0"
-        android:toYDelta="50%p" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>
 \ 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:color="@color/text_white_color" />
-    <item android:state_pressed="true" android:color="@color/text_white_color" />
-    <item android:state_focused="true" android:color="@color/text_white_color" />
-    <item android:color="@color/ff4e51" />
-</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_checked="true" android:drawable="@drawable/btn_agree_sel" />
-    <item android:state_checked="false" android:drawable="@drawable/btn_agree_nor" />
-</selector> 
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/btn_cancel_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/btn_cancel_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_list_arrows_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_list_arrows_nor" />
-
-</selector>
 \ No newline at end of file
-<?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>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/gray_line_color" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@color/gray_line_color" android:state_pressed="true" />
-    <item android:drawable="@color/gray_line_color" android:state_focused="true" />
-    <item android:drawable="@android:color/white" />
-
-</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_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"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
-    android:useLevel="false">
-
-    <size
-        android:height="30dp" />
-
-    <corners
-        android:bottomLeftRadius="15dp"
-        android:bottomRightRadius="15dp"
-        android:topLeftRadius="15dp"
-        android:topRightRadius="15dp" /> <!-- 设置四个角的半径 -->
-
-    <stroke
-        android:width="2dp"
-        android:color="@color/ff4e51" /> <!-- 定义描边的宽度和描边的颜色值 -->
-
-</shape>
 \ 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="#ea002a" />
-
-    <size
-        android:height="30dp" />
-
-    <corners
-        android:bottomLeftRadius="15dp"
-        android:bottomRightRadius="15dp"
-        android:topLeftRadius="15dp"
-        android:topRightRadius="15dp" /> <!-- 设置四个角的半径 -->
-
-</shape>
 \ 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_login_sel" />
-    <item android:state_pressed="true" android:drawable="@drawable/user_btn_login_sel" />
-    <item android:state_focused="true" android:drawable="@drawable/user_btn_login_sel" />
-    <item android:state_checked="false" android:drawable="@drawable/user_btn_login_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="@color/ff4e51" />
-
-    <size
-        android:height="40dp" />
-
-    <corners
-        android:bottomLeftRadius="20dp"
-        android:bottomRightRadius="20dp"
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp" /> <!-- 设置四个角的半径 -->
-
-</shape>
 \ 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="#ea002a" />
-
-    <size
-        android:height="40dp" />
-
-    <corners
-        android:bottomLeftRadius="20dp"
-        android:bottomRightRadius="20dp"
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp" /> <!-- 设置四个角的半径 -->
-
-</shape>
 \ 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="@color/text_hint_color" />
-
-    <size
-        android:height="40dp" />
-
-    <corners
-        android:bottomLeftRadius="20dp"
-        android:bottomRightRadius="20dp"
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp" /> <!-- 设置四个角的半径 -->
-
-</shape>
 \ 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
-<?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_keycode_sel" />
-    <item android:state_pressed="true" android:drawable="@drawable/user_btn_keycode_sel" />
-    <item android:state_focused="true" android:drawable="@drawable/user_btn_keycode_sel" />
-    <item android:drawable="@drawable/user_btn_keycode_nor" />
-</selector>
 \ 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"?>
+<layout>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/setting_fragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.activity.UserActivity">
+
+</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:app="http://schemas.android.com/apk/res-auto">
+
+    <!--<data>
+
+        <variable
+            name="liLayoutManager"
+            type="android.support.v7.widget.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: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" />
+
+    </RelativeLayout>
+</layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/catalog"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/bottom_line"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/color_list_bg"
+        android:contentDescription="@null" />
+</LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+
+
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<LinearLayout
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <include layout="@layout/user_toolbar_title"
+        android:id="@+id/feedbackIncludeLayout"/>
+
+    <include layout="@layout/user_divider_head_line" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_20px" />
+
+    <EditText
+        android:id="@+id/feedback_textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="@dimen/_30px"
+        android:background="@null"
+        android:hint="有什么好的建议嘛"
+        android:textColor="#000000"
+        android:textColorHint="@color/color_list_bg"
+        android:textSize="@dimen/text_size_15"
+        android:imeOptions="flagNoExtractUi" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_100px" />
+
+    <Button
+        android:id="@+id/feedback"
+        style="@style/LoginButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:layout_gravity="center"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="15dp"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/user_btn_login"
+        android:gravity="center"
+        android:onClick="onClick"
+        android:text="提交" />
+
+</LinearLayout>
+
+    <ImageView
+        android:id="@+id/back_selector"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginLeft="@dimen/_10px"
+        android:layout_marginTop="@dimen/_20px"
+        android:onClick="onClick"
+        android:src="@drawable/btn_return" />
+
+    </RelativeLayout>
+
+    </layout>
 \ No newline at end of file
@@ -8,23 +8,4 @@
     <color name="rate_sel">#ff0000</color>
     <color name="rate_nor">#ffffff</color>
-
-    <color name="gray_line_color">#dcdcdc</color>
-    <color name="config_black_color">#323333</color>
-    <color name="config_gray_color">#969797</color>
-    <color name="color_list_bg">#88615F5D</color>
-    <color name="text_input_color">#323333</color>
-    <color name="text_hint_color">#969797</color>
-
-    //登录页面
-    <color name="ff4e51">#ff4e51</color>
-    <color name="black">#000000</color>
-
-    //注册页面
-    <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>
@@ -2,34 +2,4 @@
 <resources>
     <dimen name="volumeWidthDefault">0px</dimen>
     <dimen name="videoPortraitHeight" format="integer">200dp</dimen>
-
-
-    <dimen name="divider_height">6dip</dimen>
-    <dimen name="config_image_height">28dip</dimen>
-    <dimen name="config_image_width">29dip</dimen>
-    <dimen name="config_item_height">54dip</dimen>
-
-    <dimen name="next_image_width">13dp</dimen>
-    <dimen name="next_image_height">21dp</dimen>
-    <dimen name="next_image_margin_right">9dp</dimen>
-
-    <dimen name="_20px">10dp</dimen>
-    <dimen name="_28px">14dp</dimen>
-
-    //个人中心
-    <dimen name="personal_item_height">44dp</dimen>
-    <dimen name="personal_text_size">17sp</dimen>
-    <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>
-    <dimen name="_10px">5dp</dimen>
-    <dimen name="_30px">15dp</dimen>
-    <dimen name="_100px">50dp</dimen>
 </resources>
 \ No newline at end of file
@@ -31,71 +31,4 @@
     <string name="loaded_rate_last">""</string>
     <string name="loaded_rate_error_pre">提醒您切换</string>
     <string name="loaded_rate_error_last">失败，请重试</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>
@@ -11,85 +11,4 @@
     <declare-styleable name="FragmentTabHost">
         <attr name="dividerDrawable" format="reference" />
     </declare-styleable>
-
-    <style name="ActionbarTitleStyle">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">#000000</item>
-    </style>
-
-    <style name="list_item_style">
-        <item name="android:background">@drawable/list_item_selector</item>
-    </style>
-
-    <style name="ConfigItemImageStyle">
-        <item name="android:layout_marginLeft">18dp</item>
-        <item name="android:layout_marginRight">10dp</item>
-    </style>
-
-    <style name="ConfigItemTitleStyle">
-        <item name="android:textColor">@color/config_black_color</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-    </style>
-
-    <style name="ConfigItemDescStyle">
-        <item name="android:textColor">@color/config_gray_color</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:layout_marginRight">5dp</item>
-    </style>
-
-    <style name="ToolbarTitleStyle">
-        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">#000000</item>
-    </style>
-
-    <style name="LoginButtonStyle">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">17sp</item>
-        <item name="android:layout_marginRight">10dp</item>
-        <item name="android:layout_marginLeft">10dp</item>
-    </style>
-
-    <style name="LoginNameStyle">
-        <item name="android:textColor">@color/text_input_color</item>
-        <item name="android:textSize">17sp</item>
-        <item name="android:layout_marginRight">17dp</item>
-        <item name="android:layout_marginLeft">18dp</item>
-        <item name="android:layout_marginTop">20dp</item>
-        <item name="android:layout_marginBottom">20dp</item>
-    </style>
-
-    <style name="LoginContentStyle">
-        <item name="android:textColor">@color/text_input_color</item>
-        <item name="android:textColorHint">@color/text_hint_color</item>
-        <item name="android:textSize">17sp</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textCursorDrawable">@null</item>
-        <item name="android:background">@null</item>
-    </style>
-
-    <style name="take_photo_anim" parent="android:Animation">
-        <item name="android:windowEnterAnimation">@anim/pop_enter_anim</item>
-        <item name="android:windowExitAnimation">@anim/pop_exit_anim</item>
-    </style>
-
-    <style name="CustomDialogStyle" parent="@android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:backgroundDimAmount">0.6</item>
-        <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>
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen></PreferenceScreen>
-<?xml version="1.0" encoding="utf-8"?>
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/ACCOUNT_TYPE"
-    android:icon="@mipmap/ic_launcher"
-    android:smallIcon="@mipmap/ic_launcher"
-    android:label="@string/ACCOUNT_LABEL"
-    android:accountPreferences="@xml/account_preferences" />
 \ No newline at end of file
-include ':app'
+include ':app', ':user'