合并代码

陈硕
2 parents 68d7d1ae 05ffc32d
Showing 72 changed files with 1343 additions and 213 deletions
.gitignore
.idea/inspectionProfiles/Project_Default.xml
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/application/CNLiveApplication.java
app/src/main/java/com/cnlive/gundam/main/network/ApiService.java → app/src/main/java/com/cnlive/gundam/data/network/ApiService.java
app/src/main/java/com/cnlive/gundam/main/network/RetrofitUtil.java → app/src/main/java/com/cnlive/gundam/data/network/RetrofitUtil.java
app/src/main/java/com/cnlive/gundam/main/network/util/SHA1.java → app/src/main/java/com/cnlive/gundam/data/network/util/SHA1.java
app/src/main/java/com/cnlive/gundam/main/network/util/SignUtil.java → app/src/main/java/com/cnlive/gundam/data/network/util/SignUtil.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/presenter/AnchorInfoPresenter.java
app/src/main/java/com/cnlive/gundam/main/presenter/view/AnchorInfoView.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/HomeFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/UGCListFragment.java
@@ -5,6 +5,7 @@
 /.idea/libraries
 /.idea/gradle.xml
 /.idea/misc.xml
+/.idea/dictionaries
 .DS_Store
 /build
 /captures
@@ -2,7 +2,6 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintNewApi" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="AndroidLintSetTextI18n" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
@@ -31,8 +31,13 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    //Retrofit
+    compile 'com.squareup.retrofit2:retrofit:2.0.2'
+    compile 'com.squareup.retrofit2:converter-gson:2.0.2'
+    //OKhttp
+    compile 'com.squareup.okhttp3:okhttp:3.2.0'
+    compile 'com.squareup.okhttp3:okhttp-ws:3.2.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
     compile project(':user')
 }
@@ -33,14 +33,17 @@
         tools:ignore="ProtectedPermissions" />
     <application
-        android:name=".main.application.CNLiveApplication"
+        android:name=".application.CNLiveApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-        <activity android:name=".main.ui.activity.MainActivity">
+        <activity
+            android:name=".main.ui.activity.MainActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboardHidden|screenSize|orientation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -90,15 +93,29 @@
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <service
+            android:name=".user.auth.UserAccountService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
+        <service
             android:name="io.rong.imlib.ipc.RongService"
             android:exported="true"
             android:process=":ipc" />
-        <service android:name="io.rong.imlib.ReConnectService"
-            android:exported="true"/>
+        <service
+            android:name="io.rong.imlib.ReConnectService"
+            android:exported="true" />
-        <receiver android:name="io.rong.imlib.ConnectChangeReceiver"
-            android:exported="true"/>
+        <receiver
+            android:name="io.rong.imlib.ConnectChangeReceiver"
+            android:exported="true" />
         <receiver
             android:name="io.rong.imlib.HeartbeatReceiver"
-package com.cnlive.gundam.main.application;
+package com.cnlive.gundam.application;
 import android.app.Application;
@@ -10,11 +10,11 @@ import com.cnlive.libs.util.Config;
 public class CNLiveApplication extends Application {
+    public static final String secret = "c2faeb120f0ea2e2d47020d4b03cb8a93bed2585897a94";
+
     @Override
     public void onCreate() {
         super.onCreate();
-        //TODO 测试ID 在正式与测试环境均可通过，正式ID则不行~！
-//        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9",true);
-        Config.init(getApplicationContext(), "60_j4faozoq85", "7b6da5a6e2955aaf7f73a06b5bdc6d50e6d5bfda3da86b");
+        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9", true);//测试信息
     }
 }
-package com.cnlive.gundam.main.network;
+package com.cnlive.gundam.data.network;
 import com.cnlive.gundam.main.model.ActiveListModel;
 import com.cnlive.gundam.main.model.ActivePlayInfo;
 import com.cnlive.gundam.main.model.VodListPage;
-import com.cnlive.gundam.user.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import java.util.Map;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.POST;
 import retrofit2.http.QueryMap;
 /**
@@ -26,7 +27,7 @@ public interface ApiService {
     Call<ActivePlayInfo> getActivityPlayInfo(@QueryMap Map<String, String> options);
     //判断活动的状态
-    @GET("vod_epg/getVodInfo4App")
+    @POST("vod_epg/getVodListInfo4App")
     Call<VodListPage> getVodInfoList(@QueryMap Map<String, String> options);
     //主播信息接口
-package com.cnlive.gundam.main.network;
+package com.cnlive.gundam.data.network;
+
+
+import com.cnlive.libs.util.Config;
 import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -10,14 +14,25 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class RetrofitUtil {
-    private static final String BASE_URL = "http://test.open.cnlive.com/openapi/api2/";
-    public static ApiService getApiService(){
+    private static final String BASE_URL_DEBUG = "http://test.open.cnlive.com/openapi/api2/";
+
+    private static final String BASE_URL_RELEASE = "https://api.cnlive.com/open/api2/";
+
+    public static ApiService getApiService() {
+
+
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl(BASE_URL)
+                .baseUrl(Config.debug ? BASE_URL_DEBUG : BASE_URL_RELEASE)
                 .addConverterFactory(GsonConverterFactory.create())
-                .client(new OkHttpClient())
+                .client(getNewClient())
                 .build();
         return retrofit.create(ApiService.class);
     }
+
+    private static OkHttpClient getNewClient() {
+        HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
+        httpLoggingInterceptor.setLevel(Config.debug ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.NONE);
+        return new OkHttpClient.Builder().addInterceptor(httpLoggingInterceptor).build();
+    }
 }
-package com.cnlive.gundam.main.network.util;
+package com.cnlive.gundam.data.network.util;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
-package com.cnlive.gundam.main.network.util;
+package com.cnlive.gundam.data.network.util;
 import android.content.Context;
 import android.util.Log;
+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() : "";
+    }
 }
@@ -35,9 +35,9 @@ public class ActivePlayInfo extends ErrorMessage {
         private String endTime;
         private String coverImgUrl;
         private String activityCategory;
-        private String extensions;
         private String rates;
         private String extViews;
+        private ActiveExInfo extensions;
         public ActiveModel() {
         }
@@ -122,14 +122,6 @@ public class ActivePlayInfo extends ErrorMessage {
             this.activityCategory = activityCategory;
         }
-        public String getExtensions() {
-            return extensions;
-        }
-
-        public void setExtensions(String extensions) {
-            this.extensions = extensions;
-        }
-
         public String getRates() {
             return rates;
         }
@@ -146,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{" +
@@ -159,7 +159,6 @@ public class ActivePlayInfo extends ErrorMessage {
                     ", endTime='" + endTime + '\'' +
                     ", coverImgUrl='" + coverImgUrl + '\'' +
                     ", activityCategory='" + activityCategory + '\'' +
-                    ", extensions='" + extensions + '\'' +
                     ", rates='" + rates + '\'' +
                     ", extViews='" + extViews + '\'' +
                     '}';
@@ -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;
+    }
 }
@@ -2,12 +2,13 @@ package com.cnlive.gundam.main.presenter;
 import android.content.Context;
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.main.presenter.view.AnchorInfoView;
-import com.cnlive.gundam.user.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import com.cnlive.libs.util.Config;
+import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Map;
@@ -21,12 +22,15 @@ import retrofit2.Response;
 public class AnchorInfoPresenter {
-    private AnchorInfoView mView;
+    private WeakReference<AnchorInfoView> viewRef;
     public AnchorInfoPresenter(AnchorInfoView view) {
-        this.mView = view;
+        viewRef = new WeakReference<>(view);
     }
+    private AnchorInfoView getView(){
+        return viewRef == null ? null : viewRef.get();
+    }
     /**
      * 查询主播信息
      *
@@ -43,16 +47,16 @@ public class AnchorInfoPresenter {
                 if (response.isSuccessful()) {
                     ChannelInfoModel info = response.body();
                     if (info != null && "0".equals(info.getErrorCode())) {
-                        if (mView != null) mView.onAnchorInfo(info);
+                        if (getView() != null) getView().onAnchorInfo(info);
                     } else {
-                        if (mView != null) mView.getAnchorFailure();
+                        if (getView() != null) getView().getAnchorFailure();
                     }
                 }
             }
             @Override
             public void onFailure(Call<ChannelInfoModel> call, Throwable t) {
-                if (mView != null) mView.getAnchorFailure();
+                if (getView() != null) getView().getAnchorFailure();
             }
         });
     }
 package com.cnlive.gundam.main.presenter.view;
-import com.cnlive.gundam.user.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
 public interface AnchorInfoView {
+    /**
+     * 获取主播信息成功
+     *
+     * @param channelInfo 主播信息
+     */
     void onAnchorInfo(ChannelInfoModel channelInfo);
+    /**
+     * 获取主播信息失败
+     */
     void getAnchorFailure();
 }
 \ No newline at end of file
@@ -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);
     }
 package com.cnlive.gundam.main.ui.activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
@@ -18,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.ChannelInfoModel;
 import com.cnlive.gundam.user.model.User;
+import com.cnlive.gundam.video.view.VideoView;
 import com.cnlive.libs.util.Config;
 import java.util.Arrays;
@@ -33,8 +34,6 @@ import java.util.Arrays;
 public class MainActivity extends AppCompatActivity implements FragmentTabHost.OnSetCurrentTabListener, AnchorInfoView {
-    private Dialog verifiedDialog;
-
     private AnchorInfoPresenter mAnchorInfoPresenter;
     @Override
@@ -78,8 +77,8 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
     @Override
-    public void onAnchorInfo(ChannelInfoModel model) {
-        switch (model.getData().getStatus()) {
+    public void onAnchorInfo(ChannelInfoModel info) {
+        switch (info.getData().getStatus()) {
             case -1:
                 Toast.makeText(this, "主播不存在", Toast.LENGTH_SHORT).show();
                 showVerifiedDialog();
@@ -92,11 +91,7 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
                 break;
             case 3:
                 Toast.makeText(this, "开启直播", Toast.LENGTH_SHORT).show();
-                String activityId = System.currentTimeMillis() + "";
-                String channelId = model.getData().getChannelId();
-                String channelName = model.getData().getChannelName();
-                String coverImgUrl = model.getData().getCoverImgUrl();
-                StreamActivity.start(this, activityId, channelId, channelName, coverImgUrl, false);
+                startStreamActivity(info);
                 break;
             case 4:
                 Toast.makeText(this, "主播被禁用", Toast.LENGTH_SHORT).show();
@@ -106,18 +101,33 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
     @Override
     public void getAnchorFailure() {
-        Toast.makeText(this, getString(R.string.request_state_error), Toast.LENGTH_LONG).show();
+        Toast.makeText(this, "主播信息认证失败", Toast.LENGTH_LONG).show();
+    }
+
+    /**
+     * 开启直播推流页面
+     * @param info 主播信息
+     */
+    private void startStreamActivity(ChannelInfoModel info) {
+        String activityId = System.currentTimeMillis() + "";
+        String channelId = info.getData().getChannelId();
+        String channelName = info.getData().getChannelName();
+        String coverImgUrl = info.getData().getCoverImgUrl();
+        StreamActivity.start(this, activityId, channelId, channelName, coverImgUrl, false);
     }
+    /**
+     * 显示主播申请页面
+     */
     private void showVerifiedDialog() {
-        verifiedDialog = new AlertDialog.Builder(this)
+        new AlertDialog.Builder(this)
                 .setMessage("亲，完成实名认证就可以开播啦，现在就去认证吧？")
                 .setPositiveButton("去认证", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        verifiedDialog.dismiss();
+                        dialogInterface.dismiss();
                         String channelId = UserService.getInstance(MainActivity.this).getActiveAccountInfo().getUid() + "";
-                        String url = String.format(getString(R.string.verified_url), channelId, Config.getAppId());
+                        String url = String.format(getString(Config.debug ? R.string.debug_verified_url : R.string.verified_url), channelId, Config.getAppId());
                         Intent intent = new Intent(MainActivity.this, WebViewActivity.class);
                         intent.putExtra("url", url);
                         intent.putExtra("title", "主播认证");
@@ -127,9 +137,14 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
                 .setNegativeButton("取消", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        verifiedDialog.dismiss();
+                        dialogInterface.dismiss();
                     }
-                })
-                .show();
+                }).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));
+        }
     }
 }
@@ -16,8 +16,8 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentActiveListBinding;
 import com.cnlive.gundam.main.model.VideoListProgram;
 import com.cnlive.gundam.main.model.VodListPage;
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
 import com.cnlive.gundam.main.utils.ActivityJumpUtil;
 import com.cnlive.libs.util.Config;
@@ -94,7 +94,7 @@ public class HomeFragment extends Fragment implements SwipeRefreshLayout.OnRefre
         if (response.isSuccessful()) {
             VodListPage model = response.body();
             if (model != null && "0".equals(model.getCode())) {
-                if (model.getData() == null) {
+                if (model.getData() == null || model.getData().size() <= 0) {
                     Toast.makeText(getActivity(), getString(R.string.request_null), Toast.LENGTH_LONG).show();
                 } else {
                     adapter.updateItems(model.getData());
@@ -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;
@@ -16,8 +17,8 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.FragmentActiveListBinding;
 import com.cnlive.gundam.main.model.ActiveInfo;
 import com.cnlive.gundam.main.model.ActiveListModel;
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
 import com.cnlive.gundam.main.utils.ActivityJumpUtil;
 import com.cnlive.libs.util.Config;
@@ -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();
@@ -30,7 +30,6 @@ public class FragmentTabHost extends TabHost
         implements TabHost.OnTabChangeListener {
     private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
     private FrameLayout mRealTabContent;
-    private Context mContext;
     private FragmentManager mFragmentManager;
     private int mContainerId;
     private OnSetCurrentTabListener onSetCurrentTabListener;
@@ -45,7 +44,7 @@ public class FragmentTabHost extends TabHost
         boolean onSetCurrentTab(String tag);
     }
-    public static final class TabItemInfo{
+    public static final class TabItemInfo {
         private final String tag;
         private final int layoutId;
         private final Class<?> clss;
@@ -145,14 +144,14 @@ public class FragmentTabHost extends TabHost
         a = context.obtainStyledAttributes(attrs, new int[]{android.R.attr.inflatedId}, 0, 0);
         try {
             mContainerId = a.getResourceId(0, 0);
-        }finally {
+        } finally {
             a.recycle();
         }
         a = context.obtainStyledAttributes(attrs, R.styleable.FragmentTabHost);
         try {
             mDiciderDrawable = a.getDrawable(R.styleable.FragmentTabHost_dividerDrawable);
-        }finally {
+        } finally {
             a.recycle();
         }
         super.setOnTabChangedListener(this);
@@ -188,8 +187,8 @@ public class FragmentTabHost extends TabHost
     /**
      * @deprecated Don't call the original TabHost setup, you must instead
-     * call {@link #setup(Context, FragmentManager)} or
-     * {@link #setup(Context, FragmentManager, int)}.
+     * call {@link #setup( FragmentManager)} or
+     * {@link #setup( FragmentManager, int)}.
      */
     @Override
     @Deprecated
@@ -198,19 +197,17 @@ public class FragmentTabHost extends TabHost
                 "Must call setup() that takes a Context and FragmentManager");
     }
-    public void setup(Context context, FragmentManager manager) {
-        ensureHierarchy(context);  // Ensure views required by super.setup()
+    public void setup(FragmentManager manager) {
+        ensureHierarchy(getContext());  // Ensure views required by super.setup()
         super.setup();
-        mContext = context;
         mFragmentManager = manager;
         ensureContent();
         setDividerDrawable(mDiciderDrawable);
     }
-    public void setup(Context context, FragmentManager manager, int containerId) {
-        ensureHierarchy(context);  // Ensure views required by super.setup()
+    public void setup(FragmentManager manager, int containerId) {
+        ensureHierarchy(getContext());  // Ensure views required by super.setup()
         super.setup();
-        mContext = context;
         mFragmentManager = manager;
         mContainerId = containerId;
         ensureContent();
@@ -226,15 +223,17 @@ public class FragmentTabHost extends TabHost
     /**
      * 设置内容ID并初始化
+     *
      * @param contentId 展示内容的Layout ID
      */
-    public void setContentId(int contentId){
-        FragmentActivity activity = ((FragmentActivity)getContext());
-        setup(activity, activity.getSupportFragmentManager(), contentId);
+    public void setContentId(int contentId) {
+        FragmentActivity activity = ((FragmentActivity) getContext());
+        setup(activity.getSupportFragmentManager(), contentId);
     }
     /**
      * 添加标签内容信息
+     *
      * @param list
      */
     public void setTabItemList(List<TabItemInfo> list) {
@@ -243,7 +242,7 @@ public class FragmentTabHost extends TabHost
     private void ensureContent() {
         if (mRealTabContent == null) {
-            mRealTabContent = (FrameLayout) findViewById(mContainerId);
+            mRealTabContent = findViewById(mContainerId);
             if (mRealTabContent == null) {
                 throw new IllegalStateException(
                         "No tab content FrameLayout found for id " + mContainerId);
@@ -257,7 +256,7 @@ public class FragmentTabHost extends TabHost
     }
     public void addTab(TabHost.TabSpec tabSpec, Class<?> clss, Bundle args) {
-        tabSpec.setContent(new DummyTabFactory(mContext));
+        tabSpec.setContent(new DummyTabFactory(getContext()));
         String tag = tabSpec.getTag();
         TabInfo info = new TabInfo(tag, clss, args);
@@ -391,7 +390,7 @@ public class FragmentTabHost extends TabHost
         this.onSetCurrentTabListener = onSetCurrentTabListener;
     }
-    public void setDividerDrawable(@Nullable Drawable drawable){
+    public void setDividerDrawable(@Nullable Drawable drawable) {
         getTabWidget().setDividerDrawable(drawable);
     }
@@ -417,7 +416,7 @@ public class FragmentTabHost extends TabHost
             }
             if (newTab != null) {
                 if (newTab.fragment == null) {
-                    newTab.fragment = Fragment.instantiate(mContext,
+                    newTab.fragment = Fragment.instantiate(getContext(),
                             newTab.clss.getName(), newTab.args);
                     ft.add(mContainerId, newTab.fragment, newTab.tag);
                 } else {
@@ -8,8 +8,8 @@ import com.cnlive.gundam.R;
 import com.cnlive.gundam.main.model.ActiveInfo;
 import com.cnlive.gundam.main.model.ActivePlayInfo;
 import com.cnlive.gundam.main.model.VideoListProgram;
-import com.cnlive.gundam.main.network.RetrofitUtil;
-import com.cnlive.gundam.main.network.util.SignUtil;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.video.activity.PlayerActivity;
 import com.cnlive.gundam.video.view.VideoView;
 import com.cnlive.libs.util.Config;
@@ -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();
         }
@@ -9,14 +9,11 @@ import java.util.Set;
 public class SharedPreferencesHelper {
     private static final String APP_NAME = "com.cnlive.granzon";
-    public static SharedPreferencesHelper instance;
-    protected Context mContext;
-    protected SharedPreferences sharedPreferences;
-
+    private static SharedPreferencesHelper instance;
+    private SharedPreferences sharedPreferences;
     private SharedPreferencesHelper(Context context) {
-        mContext = context;
-        sharedPreferences = mContext.getSharedPreferences(APP_NAME, 0);
+        sharedPreferences = context.getSharedPreferences(APP_NAME, 0);
     }
     /**
@@ -43,8 +40,8 @@ public class SharedPreferencesHelper {
         return sharedPreferences.getBoolean(key, defaultValue);
     }
-    public Long getLong(String key){
-        return sharedPreferences.getLong(key,0);
+    public Long getLong(String key) {
+        return sharedPreferences.getLong(key, 0);
     }
     public int getIntValue(String key) {
@@ -95,7 +92,7 @@ public class SharedPreferencesHelper {
         return sharedPreferences.getAll().keySet();
     }
-    public boolean contains(String key){
+    public boolean contains(String key) {
         return sharedPreferences.contains(key);
     }
 }
-package com.cnlive.gundam.user.model;
+package com.cnlive.gundam.stream.model;
 import com.cnlive.gundam.user.model.base.ErrorMessage;
@@ -3,12 +3,12 @@ package com.cnlive.gundam.user.activity;
 import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import com.cnlive.gundam.R;
+import com.cnlive.gundam.user.auth.AccountAuthenticatorActivity;
 import com.cnlive.gundam.user.fragment.LoginFragment;
 import com.cnlive.gundam.user.util.DevilUtil;
@@ -17,7 +17,7 @@ import com.cnlive.gundam.user.util.DevilUtil;
  * Created by luxiaoman on 2017/6/2.
  */
-public class LoginActivity extends AppCompatActivity {
+public class LoginActivity extends AccountAuthenticatorActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -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);
         }
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.cnlive.gundam.user.auth;
+
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Base class for implementing an Activity that is used to help implement an
+ * AbstractAccountAuthenticator. If the AbstractAccountAuthenticator needs to use an activity
+ * to handle the request then it can have the activity extend AccountAuthenticatorActivity.
+ * The AbstractAccountAuthenticator passes in the response to the intent using the following:
+ * <pre>
+ *      intent.putExtra({@link AccountManager#KEY_ACCOUNT_AUTHENTICATOR_RESPONSE}, response);
+ * </pre>
+ * The activity then sets the result that is to be handed to the response via
+ * {@link #setAccountAuthenticatorResult(Bundle)}.
+ * This result will be sent as the result of the request when the activity finishes. If this
+ * is never set or if it is set to null then error {@link AccountManager#ERROR_CODE_CANCELED}
+ * will be called on the response.
+ */
+public class AccountAuthenticatorActivity extends AppCompatActivity {
+    private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
+    private Bundle mResultBundle = null;
+
+    /**
+     * Set the result that is to be sent as the result of the request that caused this
+     * Activity to be launched. If result is null or this method is never called then
+     * the request will be canceled.
+     *
+     * @param result this is returned as the result of the AbstractAccountAuthenticator request
+     */
+    public final void setAccountAuthenticatorResult(Bundle result) {
+        mResultBundle = result;
+    }
+
+    /**
+     * Retreives the AccountAuthenticatorResponse from either the intent of the icicle, if the
+     * icicle is non-zero.
+     *
+     * @param icicle the save instance data of this Activity, may be null
+     */
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mAccountAuthenticatorResponse =
+                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
+
+        if (mAccountAuthenticatorResponse != null) {
+            mAccountAuthenticatorResponse.onRequestContinued();
+        }
+    }
+
+    /**
+     * Sends the result or a Constants.ERROR_CODE_CANCELED error if a result isn't present.
+     */
+    public void finish() {
+        if (mAccountAuthenticatorResponse != null) {
+            // send the result bundle back if set, otherwise send an error.
+            if (mResultBundle != null) {
+                mAccountAuthenticatorResponse.onResult(mResultBundle);
+            } else {
+                mAccountAuthenticatorResponse.onError(AccountManager.ERROR_CODE_CANCELED,
+                        "canceled");
+            }
+            mAccountAuthenticatorResponse = null;
+        }
+        super.finish();
+    }
+}
+package com.cnlive.gundam.user.auth;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.accounts.NetworkErrorException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.cnlive.gundam.user.activity.LoginActivity;
+
+
+public class UserAccountAuthenticator extends AbstractAccountAuthenticator {
+    private String _tag = "UserAccountAuthenticator";
+    private Context _context;
+
+    public UserAccountAuthenticator(Context context) {
+        super(context);
+        _context = context;
+    }
+
+    public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options)
+            throws NetworkErrorException {
+        Log.e("UserAccount", accountType + " - " + authTokenType);
+        Bundle ret = new Bundle();
+
+        Intent intent = new Intent(_context, LoginActivity.class);
+        intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
+
+        ret.putParcelable(AccountManager.KEY_INTENT, intent);
+        return ret;
+    }
+
+
+    @Override
+    public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) {
+        Log.e("UserAccount",".confirmCredentials");
+        return null;
+    }
+
+
+    @Override
+    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+        Log.e("UserAccount",".editProperties");
+        return null;
+    }
+
+
+    @Override
+    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle loginOptions) throws NetworkErrorException {
+         Log.e("UserAccount",".getAuthToken");
+        return null;
+    }
+
+
+    @Override
+    public String getAuthTokenLabel(String authTokenType) {
+         Log.e("UserAccount",".getAuthTokenLabel");
+        return null;
+    }
+
+
+    @Override
+    public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException {
+         Log.e("UserAccount",".hasFeatures");
+        return null;
+    }
+
+
+    @Override
+    public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle loginOptions) {
+         Log.e("UserAccount",".updateCredentials");
+        return null;
+    }
+
+}
+package com.cnlive.gundam.user.auth;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * Created by vclub on 14-8-8.
+ */
+public class UserAccountService extends Service {
+    private UserAccountAuthenticator _saa;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        IBinder ret = null;
+        if (intent.getAction().equals(android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT))
+            ret = getMovieAuthenticator().getIBinder();
+        return ret;
+    }
+
+    private UserAccountAuthenticator getMovieAuthenticator() {
+        if (_saa == null)
+            _saa = new UserAccountAuthenticator(this);
+        return _saa;
+    }
+}
@@ -31,7 +31,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
     private FragmentLoginBinding binding;
     //用户数据信息
-    public static DataEntity data;
+    public DataEntity data;
     private Account account;//密码登录的account
@@ -33,7 +33,7 @@ public class QuickLoginFragment extends Fragment implements View.OnClickListener
     private FragmentQuickLoginBinding binding;
     //用户数据信息
-    public static DataEntity data;
+    public DataEntity data;
     //跳转页面的对话框
     private ProgressDialog dialog;
@@ -34,7 +34,7 @@ public class RegisterFragment extends Fragment implements View.OnClickListener {
     private UserFragmentRegisterBinding binding;
     //用户数据信息
-    public static DataEntity data;
+    public DataEntity data;
     //跳转页面的对话框
     private ProgressDialog dialog;
@@ -17,7 +17,6 @@ import com.cnlive.gundam.user.util.SystemTools;
 import com.cnlive.gundam.user.util.ToastUtil;
 import com.cnlive.libs.user.IUserService;
 import com.cnlive.libs.user.UserUtil;
-import com.cnlive.libs.user.model.DataEntity;
 import com.cnlive.libs.util.data.network.Callback;
@@ -28,9 +27,6 @@ import com.cnlive.libs.util.data.network.Callback;
 public class UserFindPasswardFragment extends Fragment implements View.OnClickListener{
     private UserFragmentFindPasswordBinding binding;
-    //用户数据信息
-    public static DataEntity data;
-
     //跳转页面的对话框
     private ProgressDialog dialog;
@@ -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;
@@ -6,7 +6,7 @@ import com.cnlive.gundam.user.model.base.ErrorMessage;
 import java.io.Serializable;
 public class User extends ErrorMessage implements Serializable {
-    public static final String ACCOUNT_TYPE="com.cnlive.libs.AccountType";
+    public static final String ACCOUNT_TYPE="com.cnlive.gundam.AccountType";
     /**
      * uid : 201601211717200000000000002308
@@ -24,14 +24,8 @@ public class DevilUtil {
             v.getLocationInWindow(l);
             int left=l[0],top=l[1],bottom=top+v.getHeight(),right=left
             +v.getWidth();
-            if(event.getX()>left&&event.getX()<right
-            &&event.getY()>top&&event.getY()<bottom){
-                // 点击EditText的事件，忽略它。
-                return false;
-                }else{
-                // hideSoftInput(v.getWindowToken());
-                return true;
-                }
+            return !(event.getX() > left && event.getX() < right
+                    && event.getY() > top && event.getY() < bottom);
             }
         // 如果焦点不是EditText则忽略，这个发生在视图刚绘制完，第一个焦点不在EditView上，和用户用轨迹球选择其他的焦点
         return false;
@@ -132,9 +132,9 @@ public class DownTimer {
     }
     public interface TimeListener {
-        public void onFinish();
+        void onFinish();
-        public void onInterval(long remainTime);
+        void onInterval(long remainTime);
     }
     public void setTimerLiener(TimeListener listener) {
+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());
+    }
+}
@@ -39,8 +39,8 @@ public class ToastUtil {
             show_msg = msg;
             toast = new Toast(context);
             View view = LayoutInflater.from(context).inflate(TOAST_LAYOUT_ID, null, false);
-            ImageView imageView = (ImageView) view.findViewById(R.id.image);
-            TextView textView = (TextView) view.findViewById(R.id.text);
+            ImageView imageView = view.findViewById(R.id.image);
+            TextView textView = view.findViewById(R.id.text);
             imageView.setVisibility(View.GONE);
             textView.setText(msg);
+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.fragment.chat.UgcLiveChatFragment;
 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;
@@ -59,6 +65,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));
     }
@@ -87,4 +94,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();
+            }
+        }
+    }
 }
@@ -17,7 +17,7 @@ import org.greenrobot.eventbus.EventBus;
 public class NetworkChangeReceive extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        ConnectivityManager manager = (ConnectivityManager) context.getSystemService(context.CONNECTIVITY_SERVICE);
+        ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = manager.getActiveNetworkInfo();
         if (networkInfo != null && networkInfo.isAvailable()) {
             NetworkInfo.State mobile = manager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState();
 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;
@@ -30,7 +34,6 @@ public abstract class BaseVideoView extends RelativeLayout implements
         IMediaPlayer.OnBufferingUpdateListener, ISwitchVideoView.OnSwitchVideoPreparedListener,
         ISwitchVideoView.OnSwitchVideoErrorListener, ISwitchVideoView.OnSwitchVideoCompleteListener {
-    protected Context mContext;
     protected LayoutVideoViewBinding binding;
     //记录当前视频播放状态
@@ -59,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);
     }
@@ -71,7 +78,6 @@ public abstract class BaseVideoView extends RelativeLayout implements
     public BaseVideoView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        this.mContext = context;
         init();
     }
@@ -81,7 +87,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
     protected void init() {
         sharedPreferencesHelper = SharedPreferencesHelper.getInstance(getContext());
-        binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.layout_video_view, this, true);
+        binding = DataBindingUtil.inflate(LayoutInflater.from(getContext()), R.layout.layout_video_view, this, true);
         binding.videoView.setOnPreparedListener(this);
         binding.videoView.setOnInfoListener(this);
         binding.videoView.setOnErrorListener(this);
@@ -99,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) {
@@ -113,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());
     }
     /**
@@ -138,6 +167,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
     }
     public void onDestroy() {
+        binding.videoView.releaseSwitchVideo();
         binding.videoView.release();
         VideoStatusUtil.quit();
         saveCurPlayPosition();
@@ -290,13 +320,13 @@ public abstract class BaseVideoView extends RelativeLayout implements
                     //主播暂时离开
                     canPlay = false;
                     binding.videoView.stop();
-                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, mContext.getString(R.string.player_status_leave));
+                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_leave));
                     break;
                 case IVideoStatus.MEDIA_STATUS_END:
                     //直播结束
                     canPlay = false;
                     binding.videoView.stop();
-                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, mContext.getString(R.string.player_status_end));
+                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_end));
                     break;
             }
@@ -312,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();
+    }
 }
@@ -23,7 +23,7 @@ public class PlayerAccelerometerSensor {
     private double boundaryValue;
     public interface ScreenOrientationListener {
-        public void onOrientationChange(int orientation);
+        void onOrientationChange(int orientation);
     }
     public PlayerAccelerometerSensor(Context context) {
@@ -45,9 +45,6 @@ public class PlayerInfoView extends RelativeLayout {
     //展示手机网视图
     public static final int SHOW_MOBILE_NET = 0x2007;
-    private Context mContext;
-
-    private ViewDataBinding binding;
     //存储展示哪个视图
     private ObservableInt observableShowType;
@@ -64,7 +61,7 @@ public class PlayerInfoView extends RelativeLayout {
     //记录当前视频是否是ugc
     private boolean isUgc = false;
-    private static VideoInfoListener l;
+    private VideoInfoListener l;
     public PlayerInfoView(Context context) {
         this(context, null);
@@ -76,7 +73,6 @@ public class PlayerInfoView extends RelativeLayout {
     public PlayerInfoView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mContext = context;
         init();
     }
@@ -96,7 +92,7 @@ public class PlayerInfoView extends RelativeLayout {
     public void setInfoViewLayout(int infoType) {
         switch (infoType) {
             case VIDEO_INFO_NORMAL:
-                binding = DataBindingUtil.bind(getView(R.layout.layout_player_info));
+                ViewDataBinding binding = DataBindingUtil.bind(getView(R.layout.layout_player_info));
                 binding.setVariable(BR.playerInfoView, this);
                 binding.setVariable(BR.showType, observableShowType);
                 binding.setVariable(BR.isNews, observableIsNews);
@@ -122,7 +118,7 @@ public class PlayerInfoView extends RelativeLayout {
     //获取对应布局的视图
     private View getView(int layout) {
-        View view = LayoutInflater.from(mContext).inflate(layout, null, false);
+        View view = LayoutInflater.from(getContext()).inflate(layout, null, false);
         if (getChildCount() > 0)
             removeAllViews();
         addView(view);
@@ -169,9 +165,9 @@ public class PlayerInfoView extends RelativeLayout {
                 break;
             case R.id.back:
                 if (!PlayerUtils.isPortrait(getContext()) && !isUgc) {
-                    ((Activity) mContext).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                    ((Activity) getContext()).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                 } else {
-                    ((Activity) mContext).onBackPressed();
+                    ((Activity) getContext()).onBackPressed();
                 }
                 break;
             case R.id.playByMobileNet:
@@ -29,7 +29,6 @@ import com.cnlive.gundam.video.utils.PlayerUtils;
 public class PlayerTouchView extends RelativeLayout {
     private VideoTouchListener l;
-    private static Context mContext;
     //点下时的x坐标
     private int downX;
@@ -76,7 +75,6 @@ public class PlayerTouchView extends RelativeLayout {
     public PlayerTouchView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        this.mContext = context;
         audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.layout_player_touch, this, true);
         binding.setLeftAreaMove(leftArea);
@@ -104,11 +102,11 @@ public class PlayerTouchView extends RelativeLayout {
                 if (downX < controlAreaWidth) {
                     if (preVolume == -1)
                         preVolume = getSystemVolume();
-                    brightnessAndVolumeProgress.set(preVolume * DensityUtils.dp2px(mContext, 93) / getSystemMaxVolume());
+                    brightnessAndVolumeProgress.set(preVolume * DensityUtils.dp2px(getContext(), 93) / getSystemMaxVolume());
                 } else if (downX > getWidth() - controlAreaWidth) {
                     if (preBrightness == -1)
                         preBrightness = getSystemBrightness();
-                    brightnessAndVolumeProgress.set(preBrightness * DensityUtils.dp2px(mContext, 93) / 255);
+                    brightnessAndVolumeProgress.set(preBrightness * DensityUtils.dp2px(getContext(), 93) / 255);
                 }
                 curBrightnessProgress = -1;
                 curVolumeProgress = -1;
@@ -190,7 +188,7 @@ public class PlayerTouchView extends RelativeLayout {
         int curBrightness = PlayerUtils.checkSize(preBrightness + moveY * 255 / getHeight(), 1, 255);
         if (curBrightnessProgress == curBrightness) return;
-        int progress = curBrightness * DensityUtils.dp2px(mContext, 93) / 255;
+        int progress = curBrightness * DensityUtils.dp2px(getContext(), 93) / 255;
         brightnessAndVolumeProgress.set(progress);
         curBrightnessProgress = curBrightness;
@@ -237,7 +235,7 @@ public class PlayerTouchView extends RelativeLayout {
         int curVolume = PlayerUtils.checkSize(preVolume + (moveY * getSystemMaxVolume() / getHeight()), 0, getSystemMaxVolume());
         if (curVolumeProgress == curVolume) return;
-        int progress = curVolume * DensityUtils.dp2px(mContext, 93) / getSystemMaxVolume();
+        int progress = curVolume * DensityUtils.dp2px(getContext(), 93) / getSystemMaxVolume();
         brightnessAndVolumeProgress.set(progress);
         curVolumeProgress = curVolume;
@@ -50,13 +50,13 @@ public class VideoView extends BaseVideoView implements PlayerTouchView.VideoTou
     //拖动结束或拖拽进度条时需要seekTo的位置
     private long touchSeekToPosition = 0;
     //记录当前是否是竖屏
-    private static ObservableBoolean observableIsPortrait;
+    private ObservableBoolean observableIsPortrait;
     //记录当前是否是ugc节目
-    private static ObservableBoolean observableIsUgc;
+    private ObservableBoolean observableIsUgc;
     //记录当前视频高度
-    private static ObservableInt observableVideoHeight;
+    private ObservableInt observableVideoHeight;
     //记录当前视频宽度
-    private static ObservableInt observableVideoWidth;
+    private ObservableInt observableVideoWidth;
     //记录当前视频是否已经onError
     private boolean isPlayerError = false;
     //设置touchView 是否拦截touch事件
@@ -109,7 +109,7 @@ public class VideoView extends BaseVideoView implements PlayerTouchView.VideoTou
         observableIsUgc = new ObservableBoolean();
         observableVideoHeight = new ObservableInt();
         observableVideoWidth = new ObservableInt();
-        observableVideoHeight.set((int) mContext.getResources().getDimension(R.dimen.videoPortraitHeight));
+        observableVideoHeight.set((int) getContext().getResources().getDimension(R.dimen.videoPortraitHeight));
         observableVideoWidth.set(ViewGroup.LayoutParams.MATCH_PARENT);
         observableIsPortrait.set(PlayerUtils.isPortrait(getContext()));
         binding.setVideoPortraitHeight(observableVideoHeight);
@@ -343,7 +343,7 @@ public class VideoView extends BaseVideoView implements PlayerTouchView.VideoTou
     @Override
     public boolean canTouch() {
-        return videoInfoViewIsShow() ? false : canTouch;
+        return !videoInfoViewIsShow() && canTouch;
     }
 //    --------------------- touch 相关回调 end-------------------------
@@ -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>
@@ -36,6 +36,10 @@
     <string name="request_null">暂无数据</string>
     <string name="request_state_error">获取活动状态失败</string>
     <string name="request_state_play_error">此活动状态无法播放</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="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>
@@ -36,7 +36,7 @@
     <string name="find_password_hint">请确认密码：6&#8211;20位字母或数字</string>
     <string name="save_btn">保存</string>
-    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
+    <string name="ACCOUNT_TYPE">com.cnlive.gundam.AccountType</string>
     <string name="ACCOUNT_LABEL">@string/app_name</string>