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

朱显松
2 parents 3f7e8d94 4fd76e52
Showing 40 changed files with 979 additions and 65 deletions
app/src/main/java/com/cnlive/gundam/application/CNLiveApplication.java
app/src/main/java/com/cnlive/gundam/main/model/ActiveExInfo.java
app/src/main/java/com/cnlive/gundam/main/model/ActiveInfo.java
app/src/main/java/com/cnlive/gundam/main/model/ActivePlayInfo.java
app/src/main/java/com/cnlive/gundam/main/model/VideoListProgram.java
app/src/main/java/com/cnlive/gundam/main/ui/activity/BackBaseActivity.java
app/src/main/java/com/cnlive/gundam/main/ui/activity/MainActivity.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/UGCListFragment.java
app/src/main/java/com/cnlive/gundam/main/utils/ActivityJumpUtil.java
app/src/main/java/com/cnlive/gundam/user/adapter/PersonalAdapter.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/PersonalData.java
app/src/main/java/com/cnlive/gundam/user/util/PictureUtil.java
app/src/main/java/com/cnlive/gundam/user/view/SelectPopupWindow.java
app/src/main/java/com/cnlive/gundam/video/activity/PlayerActivity.java
app/src/main/java/com/cnlive/gundam/video/fragment/PlayerUgcLiveFragment.java
app/src/main/java/com/cnlive/gundam/video/view/BaseVideoView.java
app/src/main/res/drawable-hdpi/page_back.png
@@ -10,6 +10,8 @@ import com.cnlive.libs.util.Config;
  
 public class CNLiveApplication extends Application {
  
+    public static final String secret = "c2faeb120f0ea2e2d47020d4b03cb8a93bed2585897a94";
+
     @Override
     public void onCreate() {
         super.onCreate();
+package com.cnlive.gundam.main.model;
+
+/**
+ * Created by gujun on 2017/6/29.
+ */
+
+public class ActiveExInfo {
+
+    private String name ;
+    private String iconUrl;
+
+    public ActiveExInfo(String name, String iconUrl) {
+        this.name = name;
+        this.iconUrl = iconUrl;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "ActiveExInfo{" +
+                "name='" + name + '\'' +
+                ", iconUrl='" + iconUrl + '\'' +
+                '}';
+    }
+}
@@ -21,13 +21,13 @@ public class ActiveInfo implements Serializable {
     private String endTime;
     private String coverImgUrl;
     private String activityCategory;
-    private Object extensions;
+    private ActiveExInfo 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) {
+    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, ActiveExInfo extensions, String rates) {
         this.totalCount = totalCount;
         this.nextCursor = nextCursor;
         this.preCursor = preCursor;
@@ -149,11 +149,11 @@ public class ActiveInfo implements Serializable {
         this.activityCategory = activityCategory;
     }
  
-    public Object getExtensions() {
+    public ActiveExInfo getExtensions() {
         return extensions;
     }
  
-    public void setExtensions(Object extensions) {
+    public void setExtensions(ActiveExInfo extensions) {
         this.extensions = extensions;
     }
  
@@ -185,4 +185,12 @@ public class ActiveInfo implements Serializable {
                 ", rates='" + rates + '\'' +
                 '}';
     }
+
+    public String getExUrl() {
+        return extensions != null ? extensions.getIconUrl() : "";
+    }
+
+    public String getExNick() {
+        return extensions != null ? extensions.getName() : "";
+    }
 }
@@ -37,6 +37,7 @@ public class ActivePlayInfo extends ErrorMessage {
         private String activityCategory;
         private String rates;
         private String extViews;
+        private ActiveExInfo extensions;
  
         public ActiveModel() {
         }
@@ -137,6 +138,14 @@ public class ActivePlayInfo extends ErrorMessage {
             this.extViews = extViews;
         }
  
+        public ActiveExInfo getExtensions() {
+            return extensions;
+        }
+
+        public void setExtensions(ActiveExInfo extensions) {
+            this.extensions = extensions;
+        }
+
         @Override
         public String toString() {
             return "ActiveModel{" +
@@ -18,18 +18,20 @@ public class VideoListProgram implements Serializable {
     private String rates;
     private String type;
     private String category;//点播用
+    private int isHorizontalScreen = 1;//屏幕方向，0：垂直即竖屏 ／1：水平即横屏 ，默认为1 ｜
  
     public VideoListProgram() {
     }
  
     //ugc点播使用
-    public VideoListProgram(String vId, String title, String img, String subTitle, String rates, String type) {
+    public VideoListProgram(String vId, String title, String img, String subTitle, String rates, String type, int isHorizontalScreen) {
         this.vId = vId;
         this.title = title;
         this.subTitle = subTitle;
         this.img = img;
         this.rates = rates;
         this.type = type;
+        this.isHorizontalScreen = isHorizontalScreen;
     }
  
     //直播使用
@@ -41,6 +43,16 @@ public class VideoListProgram implements Serializable {
         this.type = type;
     }
  
+    //ugc直播使用
+    public VideoListProgram(String channelId, String title, String img, String docID, String type, int isHorizontalScreen) {
+        this.channelId = channelId;
+        this.title = title;
+        this.img = img;
+        this.docID = docID;
+        this.type = type;
+        this.isHorizontalScreen = isHorizontalScreen;
+    }
+
     public String getvId() {
         return vId;
     }
@@ -104,4 +116,20 @@ public class VideoListProgram implements Serializable {
     public void setType(String type) {
         this.type = type;
     }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public int getIsHorizontalScreen() {
+        return isHorizontalScreen;
+    }
+
+    public void setIsHorizontalScreen(int isHorizontalScreen) {
+        this.isHorizontalScreen = isHorizontalScreen;
+    }
 }
@@ -22,7 +22,7 @@ public class BackBaseActivity extends AppCompatActivity {
         TextView toolbarTitle = (TextView) findViewById(R.id.toolbarTitle);
         toolbarTitle.setText(title);
         toolbar.setVisibility(View.VISIBLE);
-        toolbar.setNavigationIcon(R.drawable.btn_cancel);
+        toolbar.setNavigationIcon(R.drawable.page_back);
         setSupportActionBar(toolbar);
  
     }
@@ -17,11 +17,13 @@ import com.cnlive.gundam.main.ui.fragment.HomeFragment;
 import com.cnlive.gundam.main.ui.fragment.LiveFragment;
 import com.cnlive.gundam.main.ui.fragment.UGCListFragment;
 import com.cnlive.gundam.main.ui.widget.FragmentTabHost;
+import com.cnlive.gundam.main.utils.SharedPreferencesHelper;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import com.cnlive.gundam.stream.ui.activity.StreamActivity;
 import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
+import com.cnlive.gundam.video.view.VideoView;
 import com.cnlive.libs.util.Config;
  
 import java.util.Arrays;
@@ -139,4 +141,10 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
                     }
                 }).show();
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        SharedPreferencesHelper.getInstance(this).setValue(VideoView.CAN_MOBILE_NET_PLAY, false);
+    }
 }
 \ No newline at end of file
@@ -79,12 +79,17 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onResume() {
         super.onResume();
-        if (UserService.getInstance(getActivity()).getActiveAccountInfo().getUid() != 0) notifyUI();
+        notifyUI(UserService.getInstance(getActivity()).getActiveAccountInfo().getUid() != 0);
     }
  
-    private void notifyUI() {
-        User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
-        Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
-        binding.tvNickname.setText(activeAccountInfo.getNickname());
+    private void notifyUI(boolean isLogin) {
+        if(isLogin){
+            User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
+            Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
+            binding.tvNickname.setText(activeAccountInfo.getNickname());
+        }else{
+            Glide.with(getActivity()).load(R.drawable.cnlive_user_header).into(binding.headImg);
+            binding.tvNickname.setText(getString(R.string.click_login));
+        }
     }
 }
@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -65,9 +66,8 @@ public class UGCListFragment extends Fragment implements SwipeRefreshLayout.OnRe
  
     private void loadData() {
         Map<String, String> params = new HashMap<>();
-        //TODO 传多个播放状态
         params.put("appId", Config.getAppId());
-        params.put("activityStatus", "2");
+        params.put("activityStatus", "1,2");
         params.put("pageNo", "1");
         params.put("pageSize", "15");
         RetrofitUtil.getApiService().getSpActivityList(SignUtil.getSignParamM(getActivity(), params)).enqueue(this);
@@ -92,6 +92,7 @@ public class UGCListFragment extends Fragment implements SwipeRefreshLayout.OnRe
  
     @Override
     public void onResponse(Call<ActiveListModel> call, Response<ActiveListModel> response) {
+        Log.e("11111111111111", "onResponse: "+call.request().toString() );
         binding.contentView.setRefreshing(false);
         if (response.isSuccessful()) {
             ActiveListModel model = response.body();
@@ -57,9 +57,9 @@ public class ActivityJumpUtil {
     private static void jumpByStatus(Context context, ActivePlayInfo.ActiveModel model) {
         if (model == null) return;
         if (model.getActivityStatus() == 1) {//直播中
-            jumpByProgramType(context, new VideoListProgram(model.getChannelId(), model.getActivityName(), model.getCoverImgUrl(), model.getRates(), VideoView.TYPE_UGC_LIVE));
-        } else if (model.getActivityStatus() == 3) {//已结束
-            jumpByProgramType(context, new VideoListProgram(model.getActivityId(), model.getActivityName(), model.getCoverImgUrl(), model.getActivityName(), model.getRates(), VideoView.TYPE_UGC_VOD));
+            jumpByProgramType(context, new VideoListProgram(model.getChannelId(), model.getActivityName(), model.getCoverImgUrl(), model.getRates(), VideoView.TYPE_UGC_LIVE, model.getIsHorizontalScreen()));
+        } else if (model.getActivityStatus() == 4) {//回放状态
+            jumpByProgramType(context, new VideoListProgram(model.getActivityId(), model.getActivityName(), model.getCoverImgUrl(), model.getActivityName(), model.getRates(), VideoView.TYPE_UGC_VOD, model.getIsHorizontalScreen()));
         } else {
             Toast.makeText(context, context.getString(R.string.request_state_play_error), Toast.LENGTH_LONG).show();
         }
@@ -30,6 +30,11 @@ public class PersonalAdapter extends DataBindingAdapter&lt;PersonalData&gt;{
             DataBindingViewHolder viewHolder = new DataBindingViewHolder(binding.getRoot());
             viewHolder.setBinding(binding);
             return viewHolder;
+        }else if(viewType == PersonalData.TYPE_LOGOUT){
+            ViewDataBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.layout_personal_logout_item, parent, false);
+            DataBindingViewHolder viewHolder = new DataBindingViewHolder(binding.getRoot());
+            viewHolder.setBinding(binding);
+            return viewHolder;
         }else{
             return super.onCreateViewHolder(parent, viewType);
         }
@@ -43,6 +48,12 @@ public class PersonalAdapter extends DataBindingAdapter&lt;PersonalData&gt;{
             if (l != null)
                 videoListViewHolder.getBinding().setVariable(BR.viewClickListner, l);
             videoListViewHolder.getBinding().executePendingBindings();
+        }else if(getItem(position).getItemType() == PersonalData.TYPE_LOGOUT){
+            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);
         }
@@ -16,6 +16,7 @@ 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.user.model.UserData;
 import com.cnlive.libs.util.data.network.Callback;
  
 /**
@@ -88,7 +89,7 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
                 title = "修改地址";
                 break;
         }
-        ((UserPersonalActivity)getActivity()).setTitle(title);
+        ((UserPersonalActivity) getActivity()).setTitle(title);
     }
  
     @Override
@@ -109,7 +110,6 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
                     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) {
@@ -127,11 +127,23 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
     @Override
     public void onState(int i, String s, Object o) {
         if (i == IUserService.SUCCESS) {
+            updateUserInfo();
             Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
         } else {
             Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
         }
+    }
  
-        //TODO 更新一下本地数据
+    private void updateUserInfo() {
+        UserUtil.queryUserInfo(String.valueOf(user.getUid()), String.valueOf(user.getUid()), new Callback() {
+            @Override
+            public void onState(int i, String s, Object obj) {
+                if (i == IUserService.SUCCESS) {
+                    UserData userData = (UserData) obj;
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.setActiveAccountInfo(userData.getData());
+                }
+            }
+        });
     }
 }
 package com.cnlive.gundam.user.fragment;
  
+import android.Manifest;
+import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.MediaStore;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,13 +23,21 @@ 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.application.CNLiveApplication;
 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 com.cnlive.gundam.user.util.PictureUtil;
+import com.cnlive.gundam.user.view.SelectPopupWindow;
+import com.cnlive.libs.user.IUserService;
+import com.cnlive.libs.user.UserUtil;
+import com.cnlive.libs.user.model.UserData;
+import com.cnlive.libs.util.data.network.Callback;
  
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
  
@@ -30,7 +47,15 @@ import java.util.List;
  * @time 2017/6/28  13:06
  * @desc ${TODD}
  */
-public class UserPersonalFragment extends Fragment implements DataBindingAdapter.OnAdapterViewClickListener<PersonalData> {
+public class UserPersonalFragment extends Fragment implements DataBindingAdapter.OnAdapterViewClickListener<PersonalData>, Callback {
+
+    public static final int IMG_FROM_PICTURE = 0x1001;
+    public static final int IMG_FROM_CAMERA = 0x1002;
+    public static final int PICTURE_REQUEST_CODE = 0x1003;
+    public static final int CAMERA_REQUEST_CODE = 0x1004;
+
+    //从相机获取的图片地址
+    private String cameraImagePath = "";
  
     private FragmentUserPersonalBinding binding;
  
@@ -38,6 +63,11 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
  
     private List<PersonalData> personalData;
  
+    //上传头像和修改性别的PopupWindow
+    private SelectPopupWindow menuWindow;
+
+    private User user;
+
     public static UserPersonalFragment newInstance() {
  
         Bundle args = new Bundle();
@@ -57,27 +87,34 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        initData();
         init();
     }
  
+    @Override
+    public void onResume() {
+        super.onResume();
+        initData();
+    }
+
     private void initData() {
         UserService userService = UserService.getInstance(getActivity());
-        User user = userService.getActiveAccountInfo();
+        user = userService.getActiveAccountInfo();
+        String gender = user.getGender().equals("f") ? "女" : (user.getGender().equals("m") ? "男" : "未知");
         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("性别", gender, 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));
+        personalData.add(new PersonalData("", "退出", PersonalData.TYPE_LOGOUT));
+        adapter.updateItems(personalData);
     }
  
     private void init() {
-        ((UserPersonalActivity)getActivity()).setTitle("个人资料");
+        ((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);
     }
  
@@ -87,36 +124,200 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
             Intent intent = null;
             switch (program.getItemType()) {
                 case PersonalData.TYPE_HEADER:
-                    Toast.makeText(getActivity(), "头像点击", Toast.LENGTH_LONG).show();
+                    showTakePhoto();
                     break;
                 case PersonalData.TYPE_NICK:
                     intent = new Intent(getActivity(), UserPersonalActivity.class);
-                    intent.putExtra("isEdit",true);
+                    intent.putExtra("isEdit", true);
                     intent.putExtra("type", UserPersonalEditFragment.TYPE_NICK);
                     startActivity(intent);
                     break;
                 case PersonalData.TYPE_GENDER:
-                    Toast.makeText(getActivity(), "性别点击", Toast.LENGTH_LONG).show();
+                    showSelectGender();
                     break;
                 case PersonalData.TYPE_MOBILE:
                     intent = new Intent(getActivity(), UserPersonalActivity.class);
-                    intent.putExtra("isEdit",true);
+                    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("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("isEdit", true);
                     intent.putExtra("type", UserPersonalEditFragment.TYPE_ADDRESS);
                     startActivity(intent);
                     break;
             }
+        } else if (v.getId() == R.id.logout) {
+            UserService userService = UserService.getInstance(getActivity());
+            userService.clearUser();
+            getActivity().finish();
+        }
+    }
+
+    /**
+     * 底部弹出上传头像的PopupWindow
+     */
+    public void showTakePhoto() {
+        menuWindow = new SelectPopupWindow(getActivity(), R.layout.pop_take_photo);
+        menuWindow.showAtLocation(getView().findViewById(R.id.layout), Gravity.BOTTOM, 0, 0);
+        menuWindow.getContentView().findViewById(R.id.ll_pick_photo).setOnClickListener(itemsOnClick);
+        menuWindow.getContentView().findViewById(R.id.ll_take_photo).setOnClickListener(itemsOnClick);
+    }
+
+    /**
+     * 底部弹出修改性别的PopupWindow
+     */
+    public void showSelectGender() {
+        menuWindow = new SelectPopupWindow(getActivity(), R.layout.pop_modify_gender);
+        menuWindow.showAtLocation(getView().findViewById(R.id.layout), Gravity.BOTTOM, 0, 0);
+        menuWindow.getContentView().findViewById(R.id.boy).setOnClickListener(itemsOnClick);
+        menuWindow.getContentView().findViewById(R.id.girl).setOnClickListener(itemsOnClick);
+    }
+
+    //为弹出窗口实现监听类
+    private View.OnClickListener itemsOnClick = new View.OnClickListener() {
+
+        public void onClick(View v) {
+            if (menuWindow != null && menuWindow.isShowing()) {
+                menuWindow.dismiss();
+            }
+            switch (v.getId()) {
+                case R.id.ll_take_photo:
+                    fromCamera();
+                    break;
+                case R.id.ll_pick_photo:
+                    fromPicture();
+                    break;
+                case R.id.girl:
+                    UserUtil.modifyUserInfo(String.valueOf(user.getUid()), "gender", "f", UserPersonalFragment.this);
+                    break;
+                case R.id.boy:
+                    UserUtil.modifyUserInfo(String.valueOf(user.getUid()), "gender", "m", UserPersonalFragment.this);
+                    break;
+                default:
+                    break;
+            }
+        }
+    };
+
+    public void fromPicture() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            int checkCallPhonePermission = ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE);
+            if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, PICTURE_REQUEST_CODE);
+                return;
+            } else {
+                toIntentPicture();
+            }
+        } else {
+            toIntentPicture();
+        }
+    }
+
+    private void toIntentPicture() {
+        Intent intent = new Intent();
+        intent.setType("image/*");
+        intent.setAction(Intent.ACTION_GET_CONTENT);
+        startActivityForResult(intent, IMG_FROM_PICTURE);
+    }
+
+    public void fromCamera() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            int checkCallPhonePermissionStorage = ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.CAMERA);
+            if (checkCallPhonePermissionStorage != PackageManager.PERMISSION_GRANTED) {
+                requestPermissions(new String[]{Manifest.permission.CAMERA}, CAMERA_REQUEST_CODE);
+            } else {
+                toIntentCamera();
+            }
+        } else {
+            toIntentCamera();
+        }
+    }
+
+    private void toIntentCamera() {
+        cameraImagePath = PictureUtil.getImagePath(getActivity());
+        if (!TextUtils.isEmpty(cameraImagePath)) {
+            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            File tmpFile = new File(cameraImagePath);
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(tmpFile));
+            startActivityForResult(intent, IMG_FROM_CAMERA);
+        }
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        switch (requestCode) {
+            case PICTURE_REQUEST_CODE:
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    toIntentPicture();
+                } else {
+                    Toast.makeText(getActivity(), "权限已被禁止，请打开，再使用此功能", Toast.LENGTH_LONG).show();
+                }
+                break;
+            case CAMERA_REQUEST_CODE:
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    toIntentCamera();
+                } else {
+                    Toast.makeText(getActivity(), "权限已被禁止，请打开，再使用此功能", Toast.LENGTH_LONG).show();
+                }
+                break;
+        }
+    }
+
+    @Override
+    public void onState(int i, String s, Object o) {
+        if (i == IUserService.SUCCESS) {
+            updateUserInfo();
+            Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
+        } else {
+            Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private void updateUserInfo() {
+        UserUtil.queryUserInfo(String.valueOf(user.getUid()), String.valueOf(user.getUid()), new Callback() {
+            @Override
+            public void onState(int i, String s, Object obj) {
+
+                if (i == IUserService.SUCCESS) {
+                    UserData userData = (UserData) obj;
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.setActiveAccountInfo(userData.getData());
+                    initData();
+                } else {
+                    Toast.makeText(getActivity(), "提交失败1111" + s, Toast.LENGTH_LONG).show();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == Activity.RESULT_OK) {
+            File file = null;
+            switch (requestCode) {
+                case IMG_FROM_CAMERA:
+                    file = new File(cameraImagePath);
+                    UserUtil.uploadFace(String.valueOf(user.getUid()), CNLiveApplication.secret, file, this);
+                    break;
+                case IMG_FROM_PICTURE:
+                    Uri uri = data.getData();
+                    file = new File(PictureUtil.getPath(getActivity(), uri));
+                    UserUtil.uploadFace(String.valueOf(user.getUid()), CNLiveApplication.secret, file, this);
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }
@@ -17,6 +17,7 @@ public class PersonalData {
     public static final int TYPE_MOBILE = 0x1004;
     public static final int TYPE_EMAIL = 0x1005;
     public static final int TYPE_ADDRESS = 0x1006;
+    public static final int TYPE_LOGOUT = 0x1007;
  
     public PersonalData(String itemName, String itemMessage, int itemType) {
         this.itemName = itemName;
+package com.cnlive.gundam.user.util;
+
+import android.annotation.TargetApi;
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.DocumentsContract;
+import android.provider.MediaStore;
+import android.widget.Toast;
+
+import java.io.File;
+
+/**
+ * Created by gujun on 2017/6/29.
+ */
+
+public class PictureUtil {
+    private static final String IMAGE_PATH = "/com.cnlive.gundam/image/";
+
+    public static String getImagePath(Context context){
+        String status = Environment.getExternalStorageState();
+        String path = "";
+        if (status.equals(Environment.MEDIA_MOUNTED)) {
+            String rootPath =  Environment.getExternalStorageDirectory().getAbsolutePath() + IMAGE_PATH;
+            File file = new File(rootPath);
+            if(!file.exists()){
+                file.mkdirs();
+            }
+            path = rootPath + System.currentTimeMillis() + ".png";
+        }else {
+            Toast.makeText(context,"未插入SD卡",Toast.LENGTH_LONG).show();
+        }
+        return path;
+
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public static String getPath(final Context context, final Uri uri) {
+
+        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
+        // DocumentProvider
+        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+            // ExternalStorageProvider
+            if (isExternalStorageDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                if ("primary".equalsIgnoreCase(type)) {
+                    return Environment.getExternalStorageDirectory() + "/" + split[1];
+                }
+
+                // TODO handle non-primary volumes
+            }
+            // DownloadsProvider
+            else if (isDownloadsDocument(uri)) {
+
+                final String id = DocumentsContract.getDocumentId(uri);
+                final Uri contentUri = ContentUris.withAppendedId(
+                        Uri.parse("content://downloads/public_downloads"), Long.parseLong(id));
+
+                return getDataColumn(context, contentUri, null, null);
+            }
+            // MediaProvider
+            else if (isMediaDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                Uri contentUri = null;
+                if ("image".equals(type)) {
+                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                } else if ("video".equals(type)) {
+                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                } else if ("audio".equals(type)) {
+                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                }
+
+                final String selection = "_id=?";
+                final String[] selectionArgs = new String[]{
+                        split[1]
+                };
+
+                return getDataColumn(context, contentUri, selection, selectionArgs);
+            }
+        }
+        // MediaStore (and general)
+        else if ("content".equalsIgnoreCase(uri.getScheme())) {
+
+            // Return the remote address
+            if (isGooglePhotosUri(uri))
+                return uri.getLastPathSegment();
+
+            return getDataColumn(context, uri, null, null);
+        }
+        // File
+        else if ("file".equalsIgnoreCase(uri.getScheme())) {
+            return uri.getPath();
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the value of the data column for this Uri. This is useful for
+     * MediaStore Uris, and other file-based ContentProviders.
+     *
+     * @param context       The context.
+     * @param uri           The Uri to query.
+     * @param selection     (Optional) Filter used in the query.
+     * @param selectionArgs (Optional) Selection arguments used in the query.
+     * @return The value of the _data column, which is typically a file path.
+     */
+    public static String getDataColumn(Context context, Uri uri, String selection,
+                                       String[] selectionArgs) {
+
+        Cursor cursor = null;
+        final String column = "_data";
+        final String[] projection = {
+                column
+        };
+
+        try {
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
+                    null);
+            if (cursor != null && cursor.moveToFirst()) {
+                final int index = cursor.getColumnIndexOrThrow(column);
+                return cursor.getString(index);
+            }
+        } finally {
+            if (cursor != null)
+                cursor.close();
+        }
+        return null;
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is ExternalStorageProvider.
+     */
+    public static boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is DownloadsProvider.
+     */
+    public static boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is MediaProvider.
+     */
+    public static boolean isMediaDocument(Uri uri) {
+        return "com.android.providers.media.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is Google Photos.
+     */
+    public static boolean isGooglePhotosUri(Uri uri) {
+        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
+    }
+}
+package com.cnlive.gundam.user.view;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
+
+import com.cnlive.gundam.R;
+
+
+public class SelectPopupWindow extends PopupWindow {
+
+    private View view;
+    private View tv_cancel;
+
+    public SelectPopupWindow(Context mContext, int layout) {
+
+        this.view = LayoutInflater.from(mContext).inflate(layout, null);
+
+        tv_cancel = view.findViewById(R.id.tv_cancel);
+
+        tv_cancel.setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
+
+        this.setOutsideTouchable(true);
+        this.view.setOnTouchListener(new View.OnTouchListener() {
+
+            public boolean onTouch(View v, MotionEvent event) {
+                int height = view.findViewById(R.id.pop_layout).getTop();
+                int y = (int) event.getY();
+                if (event.getAction() == MotionEvent.ACTION_UP) {
+                    if (y < height) {
+                        dismiss();
+                    }
+                }
+                return true;
+            }
+        });
+
+    /* 设置弹出窗口特征 */
+        // 设置视图
+        this.setContentView(this.view);
+        // 设置弹出窗体的宽和高
+        this.setHeight(RelativeLayout.LayoutParams.MATCH_PARENT);
+        this.setWidth(RelativeLayout.LayoutParams.MATCH_PARENT);
+        // 设置弹出窗体可点击
+        this.setFocusable(true);
+        // 实例化一个ColorDrawable颜色为透明
+        ColorDrawable dw = new ColorDrawable(0x30000000);
+        // 设置弹出窗体的背景
+        this.setBackgroundDrawable(dw);
+        // 设置弹出窗体显示时的动画，从底部向上弹出
+        this.setAnimationStyle(R.style.take_photo_anim);
+    }
+}
@@ -22,14 +22,11 @@ import com.cnlive.gundam.video.utils.PlayerUtils;
  */
  
 public class PlayerActivity extends AppCompatActivity {
-    private final String SCREEN_DIRECT_P = "0";
-    private final String SCREEN_DIRECT_L = "1";
  
     private Fragment fragment;
     private VideoListProgram program;
     //默认横屏
-    private String screenDirect = SCREEN_DIRECT_L;
-    private String screenDirectName = "screenDirect";
+    private int screenDirect = 1;
  
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -69,10 +66,9 @@ public class PlayerActivity extends AppCompatActivity {
         }
  
         if (fragment instanceof PlayerUgcLiveFragment || fragment instanceof PlayerUgcVodFragment) {
-            if (intent.hasExtra(screenDirectName)) {
-                screenDirect = intent.getStringExtra(screenDirectName);
-            }
-            if (SCREEN_DIRECT_P.equals(screenDirect)) {
+            PlayerUtils.setStatusBarVisibility(this, false);
+            screenDirect = program.getIsHorizontalScreen();
+            if (screenDirect == 0) {
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
             } else {
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
 package com.cnlive.gundam.video.fragment;
  
+import android.Manifest;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 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.FragmentPlayerUgcVodBinding;
+import com.cnlive.gundam.databinding.FragmentPlayerUgcLiveBinding;
 import com.cnlive.gundam.main.model.VideoListProgram;
 import com.cnlive.gundam.video.model.VideoModel;
 import com.cnlive.gundam.video.utils.PlayerUtils;
+import com.cnlive.gundam.video.view.BaseVideoView;
 import com.cnlive.gundam.video.view.VideoView;
  
 /**
  * Created by gujun on 2017/4/5.
  */
  
-public class PlayerUgcLiveFragment extends Fragment {
-    private FragmentPlayerUgcVodBinding binding;
+public class PlayerUgcLiveFragment extends Fragment implements BaseVideoView.OnUgcLiveStatusPermissionListener{
+    private final int PERMISSION_REQUEST_CODE = 0x1001;
+    private FragmentPlayerUgcLiveBinding binding;
  
     private VideoListProgram program;
     private String title;
@@ -57,6 +63,7 @@ public class PlayerUgcLiveFragment extends Fragment {
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        binding.videoView.setUgcLiveStatusPermissionListener(this);//必须在设置播放数据前调用
         binding.videoView.setVideoInfo(new VideoModel(title, id, VideoView.TYPE_UGC_LIVE, rates));
     }
  
@@ -85,4 +92,21 @@ public class PlayerUgcLiveFragment extends Fragment {
         super.onDestroyView();
     }
  
+    @Override
+    public void onShouldRequestPermission() {
+        requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE}, PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if(requestCode == PERMISSION_REQUEST_CODE){
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                if(binding != null && binding.videoView != null)
+                    binding.videoView.addUgcLiveStatus();
+            } else {
+                Toast.makeText(getActivity(), "权限已被禁止，您将接收不到直播状态", Toast.LENGTH_LONG).show();
+            }
+        }
+    }
 }
 package com.cnlive.gundam.video.view;
  
+import android.Manifest;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.databinding.DataBindingUtil;
+import android.os.Build;
+import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -58,8 +62,12 @@ public abstract class BaseVideoView extends RelativeLayout implements
  
     private DataSource curDataSource;
  
+    //播放器播放状态的监听
     private OnVideoViewPlayStatusListener l;
  
+    //ugclive需要权限监听
+    private OnUgcLiveStatusPermissionListener ugcLivePermissionListener;
+
     public BaseVideoView(Context context) {
         this(context, null);
     }
@@ -97,8 +105,17 @@ public abstract class BaseVideoView extends RelativeLayout implements
     public void setDataSource() {
         //只有ugcLive视频才有状态监听
         if (videoModel.getType().equals(VideoView.TYPE_UGC_LIVE)) {
-            VideoStatusUtil.setOnVideoPlayStatusCallback(mOnVideoStatusCallback);
-            VideoStatusUtil.init(videoModel.getId());
+            if (Build.VERSION.SDK_INT >= 23) {
+                int checkCallPhonePermission = ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_PHONE_STATE);
+                if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
+                    if(ugcLivePermissionListener != null)
+                        ugcLivePermissionListener.onShouldRequestPermission();
+                } else {
+                    addUgcLiveStatus();
+                }
+            } else {
+                addUgcLiveStatus();
+            }
         }
  
         if (isLive) {
@@ -111,7 +128,21 @@ public abstract class BaseVideoView extends RelativeLayout implements
  
         preRate = Config.TYPE_PLAY_RATE_2;
  
+    }
  
+    /**
+     * 设置UGC LIVE的直播状态监听
+     */
+    public void setUgcLiveStatusPermissionListener(OnUgcLiveStatusPermissionListener l){
+        ugcLivePermissionListener = l;
+    }
+
+    /**
+     * 添加UGC LIVE的直播状态监听
+     */
+    public void addUgcLiveStatus(){
+        VideoStatusUtil.setOnVideoPlayStatusCallback(mOnVideoStatusCallback);
+        VideoStatusUtil.init(videoModel.getId());
     }
  
     /**
@@ -311,4 +342,9 @@ public abstract class BaseVideoView extends RelativeLayout implements
     public interface OnVideoViewPlayStatusListener {
         void onVideoViewPlayStatus(boolean isPlay);
     }
+
+    //ugc live 监听直播状态得需要android.permission.READ_PHONE_STATE
+    public interface OnUgcLiveStatusPermissionListener{
+        void onShouldRequestPermission();
+    }
 }
@@ -13,25 +13,40 @@
  
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/gray_bg"
+        android:paddingTop="10dp">
  
-        <EditText
-            android:id="@+id/editText"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:visibility="gone"/>
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@android:color/white">
+
+            <EditText
+                android:id="@+id/editText"
+                style="@style/LoginContentStyle"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="11dp"
+                android:layout_marginRight="11dp"
+                android:visibility="gone" />
+
+            <include
+                android:id="@+id/includeMobileLayout"
+                layout="@layout/mobile_keycode_layout" />
  
-        <include
-            android:id="@+id/includeMobileLayout"
-            layout="@layout/mobile_keycode_layout"/>
+        </LinearLayout>
  
         <Button
             android:id="@+id/submit"
+            style="@style/LoginButtonStyle"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="200dp"
             android:onClick="@{userPersonalEditFragment.onClick}"
+            android:background="@drawable/user_btn_login"
             android:text="提交" />
  
     </RelativeLayout>
@@ -23,9 +23,8 @@
  
         <RelativeLayout
             android:id="@+id/contentLayout"
-            android:background="@android:color/black"
             android:layout_width="match_parent"
-            android:layout_height="400dp"
+            android:layout_height="match_parent"
             android:layout_alignParentBottom="true">
  
         </RelativeLayout>
@@ -17,6 +17,7 @@
     </data>
  
     <RelativeLayout
+        android:id="@+id/layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
  
@@ -27,7 +28,7 @@
             android:clipToPadding="true"
             android:clipChildren="true"
             android:paddingTop="5dp"
-            android:background="@color/list_divider"
+            android:background="@color/gray_bg"
             app:adapter="@{listAdapter}"
             app:layoutManager="@{layoutManager}"/>
  
@@ -8,6 +8,7 @@
     android:layout_height="?attr/actionBarSize"
     android:theme="@style/ThemeOverlay.AppCompat.Light"
     app:contentInsetEnd="?attr/actionBarSize"
+    android:background="@android:color/white"
     android:visibility="gone"
     tools:visibility="visible">
  
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
  
     <data>
  
         <import type="com.cnlive.gundam.main.model.ActiveInfo" />
-        <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter.OnAdapterViewClickListener"/>
+        <import type="android.view.View"/>
+        <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter.OnAdapterViewClickListener" />
  
         <variable
             name="activeInfo"
@@ -13,7 +15,7 @@
  
         <variable
             name="viewClickListner"
-            type="OnAdapterViewClickListener&lt;ActiveInfo>"/>
+            type="OnAdapterViewClickListener&lt;ActiveInfo>" />
  
     </data>
  
@@ -26,25 +28,61 @@
         <ImageView
             android:id="@+id/image"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="300dp"
             android:scaleType="centerCrop"
             app:error="@{@drawable/image_error}"
             app:imageUrl="@{activeInfo.getCoverImgUrl()}" />
  
         <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:background="#60494747"
+            android:padding="3dp"
+            android:text="@{activeInfo.getActivityStatus() == 1 ? @string/ugc_live : @string/ugc_vod}"
+            android:textColor="@{activeInfo.getActivityStatus() == 1 ? @android:color/holo_red_light : @android:color/white}"
+            tools:text="直播" />
+
+        <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/image"
+            android:layout_alignBottom="@+id/image"
+            android:background="#60494747"
             android:padding="10dp"
             android:text="@{activeInfo.getActivityName()}"
-            android:textColor="@android:color/black"
-            android:textSize="16sp"/>
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            tools:text="title" />
+
+        <LinearLayout
+            android:id="@+id/exLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/image"
+            android:visibility="@{activeInfo.getExtensions() != null ? View.VISIBLE : View.GONE}">
+
+            <ImageView
+                android:id="@+id/header"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_margin="5dp"
+                app:error="@{@drawable/image_error}"
+                app:imageUrl="@{activeInfo.getExUrl()}"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="@android:color/black"
+                android:text="@{activeInfo.getExNick()}"
+                tools:text="nick" />
+        </LinearLayout>
  
         <View
             android:layout_width="match_parent"
             android:layout_height="8dp"
-            android:layout_below="@+id/title"
+            android:layout_below="@+id/exLayout"
             android:background="@color/list_divider" />
  
     </RelativeLayout>
@@ -38,6 +38,7 @@
                 android:text="@{data.getItemName()}"
                 android:textColor="@color/black"
                 android:textSize="18sp"
+                android:layout_marginLeft="10dp"
                 tools:text="nick" />
  
             <ImageView
@@ -37,6 +37,7 @@
                 android:text="@{data.getItemName()}"
                 android:textColor="@color/black"
                 android:textSize="18sp"
+                android:layout_marginLeft="10dp"
                 tools:text="nick" />
  
             <TextView
@@ -48,7 +49,7 @@
                 android:layout_toRightOf="@+id/itemName"
                 android:gravity="center_vertical|right"
                 android:text="@{data.getItemMessage()}"
-                android:textColor="@color/black"
+                android:textColor="@color/gray"
                 android:textSize="18sp"
                 tools:text="haha" />
  
@@ -56,7 +57,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"/>
+                android:layout_centerVertical="true"
+                android:src="@drawable/user_list_arrows"
+                android:layout_marginRight="10dp"/>
  
         </RelativeLayout>
  
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <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="wrap_content">
+
+        <Button
+            android:id="@+id/logout"
+            style="@style/LoginButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/user_btn_login"
+            android:layout_marginTop="50dp"
+            android:onClick="@{(view)->viewClickListner.onViewClick(view,data)}"
+            android:text="退出" />
+
+    </RelativeLayout>
+
+</layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/pop_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_alignParentBottom="true"
+            android:background="#ffffff"
+            android:gravity="center"
+            android:text="取消"
+            android:textColor="#FF6633"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:id="@+id/boy"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_above="@id/tv_cancel"
+            android:background="#ffffff"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_alignParentBottom="true"
+                android:gravity="center"
+                android:text="男"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="#D8D8D8" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/girl"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_above="@id/boy"
+            android:background="#ffffff"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_alignParentBottom="true"
+                android:gravity="center"
+                android:text="女"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#D8D8D8" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/ll_changeHead"
+            android:layout_width="match_parent"
+            android:layout_height="51dp"
+            android:layout_above="@id/girl"
+            android:background="#ffffff"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/changeTitleTag"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_alignParentBottom="true"
+                android:gravity="center"
+                android:text="性别修改"
+                android:textColor="@color/black"
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/color_list_bg" />
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</RelativeLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/pop_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_alignParentBottom="true"
+            android:background="#ffffff"
+            android:gravity="center"
+            android:text="取消"
+            android:textColor="#FF6633"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:id="@+id/ll_pick_photo"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_above="@id/tv_cancel"
+            android:background="#ffffff"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_alignParentBottom="true"
+                android:gravity="center"
+                android:text="从手机相册中选取"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="#D8D8D8" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/ll_take_photo"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_above="@id/ll_pick_photo"
+            android:background="#ffffff"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_alignParentBottom="true"
+                android:gravity="center"
+                android:text="拍照"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#D8D8D8" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/ll_changeHead"
+            android:layout_width="match_parent"
+            android:layout_height="51dp"
+            android:layout_above="@id/ll_take_photo"
+            android:background="#ffffff"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/changeTitleTag"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_alignParentBottom="true"
+                android:gravity="center"
+                android:text="头像修改"
+                android:textColor="@color/black"
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/color_list_bg" />
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</RelativeLayout>
 \ No newline at end of file
@@ -8,4 +8,7 @@
  
     <color name="rate_sel">#ff0000</color>
     <color name="rate_nor">#ffffff</color>
+
+    <color name="gray">#9e9e9e</color>
+    <color name="gray_bg">#dedbdb</color>
 </resources>
@@ -37,6 +37,9 @@
     <string name="request_state_error">获取活动状态失败</string>
     <string name="request_state_play_error">此活动状态无法播放</string>
  
+    <string name="ugc_live">直播</string>
+    <string name="ugc_vod">回放</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>
     <string name="debug_verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s&amp;type=0 </string>
 </resources>