合并代码

陈硕
2 parents b0c461a7 f79818f5
Showing 48 changed files with 1017 additions and 128 deletions
.idea/modules.xml
app/build.gradle
app/src/main/AndroidManifest.xml
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/model/VodListPage.java
app/src/main/java/com/cnlive/gundam/main/network/ApiService.java
app/src/main/java/com/cnlive/gundam/main/network/RetrofitUtil.java
app/src/main/java/com/cnlive/gundam/main/network/util/SHA1.java
app/src/main/java/com/cnlive/gundam/main/network/util/SignUtil.java
app/src/main/java/com/cnlive/gundam/main/ui/activity/MainActivity.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/HomeFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/LiveFragment.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/UGCListFragment.java
app/src/main/java/com/cnlive/gundam/main/utils/ActivityJumpUtil.java
app/src/main/java/com/cnlive/gundam/stream/ui/activity/StreamActivity.java
app/src/main/java/com/cnlive/gundam/user/util/FileUtils.java
app/src/main/java/com/cnlive/gundam/user/util/ToastUtil.java
app/src/main/java/com/cnlive/gundam/video/activity/PlayerActivity.java
app/src/main/java/com/cnlive/gundam/video/view/VideoView.java
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNLiveApp.iml" filepath="$PROJECT_DIR$/CNLiveApp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNLiveApp5.iml" filepath="$PROJECT_DIR$/CNLiveApp5.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/user/user.iml" filepath="$PROJECT_DIR$/user/user.iml" />
     </modules>
@@ -30,11 +30,8 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'org.greenrobot:eventbus:3.0.0'
-    compile files('libs/libcnliveuser.jar')
-    //Smack
-    compile 'org.igniterealtime.smack:smack-android-extensions:4.1.4'
-    compile 'org.igniterealtime.smack:smack-tcp:4.1.4'
-    compile 'org.greenrobot:greendao-encryption:2.2.2'
-    compile 'com.gyf.barlibrary:barlibrary:2.2.4'
-    compile project(':user')
+
+    compile 'com.squareup.retrofit2:retrofit:2.3.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+
 }
@@ -26,21 +26,10 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <!-- account start -->
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission
         android:name="android.permission.ACCOUNT_MANAGER"
         tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application
         android:name=".main.application.CNLiveApplication"
+package com.cnlive.gundam.main.model;
+
+
+
+import java.io.Serializable;
+
+/**
+ * Created by Lynn on 5/27/2017.
+ */
+
+public class ActivePlayInfo extends ErrorMessage {
+
+    private ActiveModel data;
+
+    public ActivePlayInfo() {
+
+    }
+
+    public ActiveModel getData() {
+        return data;
+    }
+
+    public void setData(ActiveModel data) {
+        this.data = data;
+    }
+
+    public class ActiveModel   implements Serializable {
+        private String activityId;
+        private String activityName;
+        private int activityStatus;
+        private int isHorizontalScreen;
+        private String channelId;
+        private String createTime;
+        private String startTime;
+        private String endTime;
+        private String coverImgUrl;
+        private String activityCategory;
+        private String extensions;
+        private String rates;
+        private String extViews;
+
+        public ActiveModel() {
+        }
+
+        public String getActivityId() {
+            return activityId;
+        }
+
+        public void setActivityId(String activityId) {
+            this.activityId = activityId;
+        }
+
+        public String getActivityName() {
+            return activityName;
+        }
+
+        public void setActivityName(String activityName) {
+            this.activityName = activityName;
+        }
+
+        public int getActivityStatus() {
+            return activityStatus;
+        }
+
+        public void setActivityStatus(int activityStatus) {
+            this.activityStatus = activityStatus;
+        }
+
+        public int getIsHorizontalScreen() {
+            return isHorizontalScreen;
+        }
+
+        public void setIsHorizontalScreen(int isHorizontalScreen) {
+            this.isHorizontalScreen = isHorizontalScreen;
+        }
+
+        public String getChannelId() {
+            return channelId;
+        }
+
+        public void setChannelId(String channelId) {
+            this.channelId = channelId;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getStartTime() {
+            return startTime;
+        }
+
+        public void setStartTime(String startTime) {
+            this.startTime = startTime;
+        }
+
+        public String getEndTime() {
+            return endTime;
+        }
+
+        public void setEndTime(String endTime) {
+            this.endTime = endTime;
+        }
+
+        public String getCoverImgUrl() {
+            return coverImgUrl;
+        }
+
+        public void setCoverImgUrl(String coverImgUrl) {
+            this.coverImgUrl = coverImgUrl;
+        }
+
+        public String getActivityCategory() {
+            return activityCategory;
+        }
+
+        public void setActivityCategory(String activityCategory) {
+            this.activityCategory = activityCategory;
+        }
+
+        public String getExtensions() {
+            return extensions;
+        }
+
+        public void setExtensions(String extensions) {
+            this.extensions = extensions;
+        }
+
+        public String getRates() {
+            return rates;
+        }
+
+        public void setRates(String rates) {
+            this.rates = rates;
+        }
+
+        public String getExtViews() {
+            return extViews;
+        }
+
+        public void setExtViews(String extViews) {
+            this.extViews = extViews;
+        }
+
+        @Override
+        public String toString() {
+            return "ActiveModel{" +
+                    "activityId='" + activityId + '\'' +
+                    ", activityName='" + activityName + '\'' +
+                    ", activityStatus=" + activityStatus +
+                    ", isHorizontalScreen=" + isHorizontalScreen +
+                    ", channelId='" + channelId + '\'' +
+                    ", createTime='" + createTime + '\'' +
+                    ", startTime='" + startTime + '\'' +
+                    ", endTime='" + endTime + '\'' +
+                    ", coverImgUrl='" + coverImgUrl + '\'' +
+                    ", activityCategory='" + activityCategory + '\'' +
+                    ", extensions='" + extensions + '\'' +
+                    ", rates='" + rates + '\'' +
+                    ", extViews='" + extViews + '\'' +
+                    '}';
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ActivePlayInfo{" +
+                "data=" + data +
+                '}';
+    }
+}
@@ -8,21 +8,21 @@ import java.io.Serializable;
  */
 public class VideoListProgram implements Serializable {
-    //点播的id
-    private String vId;
-    //直播的id
-    private String channelId;
+
+    private String vId;//点播的id
+    private String channelId;//直播的id
     private String title;
     private String subTitle;
     private String img;
-    //直播使用
-    private String docID;
+    private String docID;//直播使用
     private String rates;
     private String type;
+    private String category;//点播用
     public VideoListProgram() {
     }
+    //ugc点播使用
     public VideoListProgram(String vId, String title, String img, String subTitle, String rates, String type) {
         this.vId = vId;
         this.title = title;
@@ -32,6 +32,7 @@ public class VideoListProgram implements Serializable {
         this.type = type;
     }
+    //直播使用
     public VideoListProgram(String channelId, String title, String img, String docID, String type) {
         this.channelId = channelId;
         this.title = title;
+package com.cnlive.gundam.main.model;
+
+import java.util.List;
+
+/**
+ * Created by gujun on 2017/6/28.
+ */
+
+public class VodListPage extends ErrorMessage {
+
+    private List<VideoListProgram> data;
+
+    public List<VideoListProgram> getData() {
+        return data;
+    }
+
+    public void setData(List<VideoListProgram> data) {
+        this.data = data;
+    }
+}
+package com.cnlive.gundam.main.network;
+
+import com.cnlive.gundam.main.model.ActiveListModel;
+import com.cnlive.gundam.main.model.ActivePlayInfo;
+import com.cnlive.gundam.main.model.VodListPage;
+
+import java.util.Map;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.QueryMap;
+
+/**
+ * Created by gujun on 2017/6/28.
+ */
+
+public interface ApiService {
+
+    //获取sp对应下的活动列表
+    @GET("live_epg/sp/activityList4App")
+    Call<ActiveListModel> getSpActivityList(@QueryMap Map<String, String> options);
+
+    //判断活动的状态
+    @GET("live_epg/getLiveActivityPlayInfo4App")
+    Call<ActivePlayInfo> getActivityPlayInfo(@QueryMap Map<String, String> options);
+
+    //判断活动的状态
+    @GET("vod_epg/getVodInfo4App")
+    Call<VodListPage> getVodInfoList(@QueryMap Map<String, String> options);
+}
+package com.cnlive.gundam.main.network;
+
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+/**
+ * Created by gujun on 2017/6/28.
+ */
+
+public class RetrofitUtil {
+
+    private static final String BASE_URL = "http://test.open.cnlive.com/openapi/api2/";
+
+    public static ApiService getApiService(){
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .addConverterFactory(GsonConverterFactory.create())
+                .client(new OkHttpClient())
+                .build();
+        return retrofit.create(ApiService.class);
+    }
+}
+package com.cnlive.gundam.main.network.util;
+
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class SHA1 {
+    private final int[] abcde = {0x67452301, 0xefcdab89, 0x98badcfe,
+            0x10325476, 0xc3d2e1f0};
+
+    // 摘要数据存储数组
+    private int[] digestInt = new int[5];
+
+    // 计算过程中的临时数据存储数组
+    private int[] tmpData = new int[80];
+
+    /**
+     * 将字节转换为十六进制字符串
+     *
+     * @param ib
+     * @return
+     */
+    private static String byteToHexString(byte ib) {
+        char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A',
+                'B', 'C', 'D', 'E', 'F'};
+        char[] ob = new char[2];
+        ob[0] = Digit[(ib >>> 4) & 0X0F];
+        ob[1] = Digit[ib & 0X0F];
+        String s = new String(ob);
+        return s;
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param bytearray
+     * @return
+     */
+    private static String byteArrayToHexString(byte[] bytearray) {
+        String strDigest = "";
+        for (byte aBytearray : bytearray) {
+            strDigest += byteToHexString(aBytearray);
+        }
+        return strDigest;
+    }
+
+    /**
+     * @param text
+     * @return
+     */
+    public static String SHA1Digest(String text) {
+        String pwd = "";
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA1");
+            md.update(text.getBytes());
+            pwd = new BigInteger(1, md.digest()).toString(16);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return pwd;
+    }
+
+    /**
+     * 计算sha-1摘要
+     *
+     * @param bytedata
+     * @return
+     */
+    private int process_input_bytes(byte[] bytedata) {
+        // 初试化常量
+        System.arraycopy(abcde, 0, digestInt, 0, abcde.length);
+        // 格式化输入字节数组，补10及长度数据
+        byte[] newbyte = byteArrayFormatData(bytedata);
+        // 获取数据摘要计算的数据单元个数
+        int MCount = newbyte.length / 64;
+        // 循环对每个数据单元进行摘要计算
+        for (int pos = 0; pos < MCount; pos++) {
+            // 将每个单元的数据转换成16个整型数据，并保存到tmpData的前16个数组元素中
+            for (int j = 0; j < 16; j++) {
+                tmpData[j] = byteArrayToInt(newbyte, (pos * 64) + (j * 4));
+            }
+            // 摘要计算函数
+            encrypt();
+        }
+        return 20;
+    }
+
+    /**
+     * 格式化输入字节数组格式
+     *
+     * @param bytedata
+     * @return
+     */
+    private byte[] byteArrayFormatData(byte[] bytedata) {
+        // 补0数量
+        int zeros = 0;
+        // 补位后总位数
+        int size = 0;
+        // 原始数据长度
+        int n = bytedata.length;
+        // 模64后的剩余位数
+        int m = n % 64;
+        // 计算添加0的个数以及添加10后的总长度
+        if (m < 56) {
+            zeros = 55 - m;
+            size = n - m + 64;
+        } else if (m == 56) {
+            zeros = 63;
+            size = n + 8 + 64;
+        } else {
+            zeros = 63 - m + 56;
+            size = (n + 64) - m + 64;
+        }
+        // 补位后生成的新数组内容
+        byte[] newbyte = new byte[size];
+        // 复制数组的前面部分
+        System.arraycopy(bytedata, 0, newbyte, 0, n);
+        // 获得数组Append数据元素的位置
+        int l = n;
+        // 补1操作
+        newbyte[l++] = (byte) 0x80;
+        // 补0操作
+        for (int i = 0; i < zeros; i++) {
+            newbyte[l++] = (byte) 0x00;
+        }
+        // 计算数据长度，补数据长度位共8字节，长整型
+        long N = (long) n * 8;
+        byte h8 = (byte) (N & 0xFF);
+        byte h7 = (byte) ((N >> 8) & 0xFF);
+        byte h6 = (byte) ((N >> 16) & 0xFF);
+        byte h5 = (byte) ((N >> 24) & 0xFF);
+        byte h4 = (byte) ((N >> 32) & 0xFF);
+        byte h3 = (byte) ((N >> 40) & 0xFF);
+        byte h2 = (byte) ((N >> 48) & 0xFF);
+        byte h1 = (byte) (N >> 56);
+        newbyte[l++] = h1;
+        newbyte[l++] = h2;
+        newbyte[l++] = h3;
+        newbyte[l++] = h4;
+        newbyte[l++] = h5;
+        newbyte[l++] = h6;
+        newbyte[l++] = h7;
+        newbyte[l++] = h8;
+        return newbyte;
+    }
+
+    private int f1(int x, int y, int z) {
+        return (x & y) | (~x & z);
+    }
+
+    private int f2(int x, int y, int z) {
+        return x ^ y ^ z;
+    }
+
+    private int f3(int x, int y, int z) {
+        return (x & y) | (x & z) | (y & z);
+    }
+
+    //
+
+    private int f4(int x, int y) {
+        return (x << y) | x >>> (32 - y);
+    }
+
+    /**
+     * 单元摘要计算函数
+     */
+    private void encrypt() {
+        for (int i = 16; i <= 79; i++) {
+            tmpData[i] = f4(tmpData[i - 3] ^ tmpData[i - 8] ^ tmpData[i - 14]
+                    ^ tmpData[i - 16], 1);
+        }
+        int[] tmpabcde = new int[5];
+        System.arraycopy(digestInt, 0, tmpabcde, 0, tmpabcde.length);
+        for (int j = 0; j <= 19; j++) {
+            int tmp = f4(tmpabcde[0], 5)
+                    + f1(tmpabcde[1], tmpabcde[2], tmpabcde[3]) + tmpabcde[4]
+                    + tmpData[j] + 0x5a827999;
+            tmpabcde[4] = tmpabcde[3];
+            tmpabcde[3] = tmpabcde[2];
+            tmpabcde[2] = f4(tmpabcde[1], 30);
+            tmpabcde[1] = tmpabcde[0];
+            tmpabcde[0] = tmp;
+        }
+        for (int k = 20; k <= 39; k++) {
+            int tmp = f4(tmpabcde[0], 5)
+                    + f2(tmpabcde[1], tmpabcde[2], tmpabcde[3]) + tmpabcde[4]
+                    + tmpData[k] + 0x6ed9eba1;
+            tmpabcde[4] = tmpabcde[3];
+            tmpabcde[3] = tmpabcde[2];
+            tmpabcde[2] = f4(tmpabcde[1], 30);
+            tmpabcde[1] = tmpabcde[0];
+            tmpabcde[0] = tmp;
+        }
+        for (int l = 40; l <= 59; l++) {
+            int tmp = f4(tmpabcde[0], 5)
+                    + f3(tmpabcde[1], tmpabcde[2], tmpabcde[3]) + tmpabcde[4]
+                    + tmpData[l] + 0x8f1bbcdc;
+            tmpabcde[4] = tmpabcde[3];
+            tmpabcde[3] = tmpabcde[2];
+            tmpabcde[2] = f4(tmpabcde[1], 30);
+            tmpabcde[1] = tmpabcde[0];
+            tmpabcde[0] = tmp;
+        }
+        for (int m = 60; m <= 79; m++) {
+            int tmp = f4(tmpabcde[0], 5)
+                    + f2(tmpabcde[1], tmpabcde[2], tmpabcde[3]) + tmpabcde[4]
+                    + tmpData[m] + 0xca62c1d6;
+            tmpabcde[4] = tmpabcde[3];
+            tmpabcde[3] = tmpabcde[2];
+            tmpabcde[2] = f4(tmpabcde[1], 30);
+            tmpabcde[1] = tmpabcde[0];
+            tmpabcde[0] = tmp;
+        }
+        for (int i2 = 0; i2 < tmpabcde.length; i2++) {
+            digestInt[i2] = digestInt[i2] + tmpabcde[i2];
+        }
+        for (int n = 0; n < tmpData.length; n++) {
+            tmpData[n] = 0;
+        }
+    }
+
+    /**
+     * 4字节数组转换为整数
+     *
+     * @param bytedata
+     * @param i
+     * @return
+     */
+    private int byteArrayToInt(byte[] bytedata, int i) {
+        return ((bytedata[i] & 0xff) << 24) | ((bytedata[i + 1] & 0xff) << 16)
+                | ((bytedata[i + 2] & 0xff) << 8) | (bytedata[i + 3] & 0xff);
+    }
+
+    /**
+     * 整数转换为4字节数组
+     *
+     * @param intValue
+     * @param byteData
+     * @param i
+     */
+    private void intToByteArray(int intValue, byte[] byteData, int i) {
+        byteData[i] = (byte) (intValue >>> 24);
+        byteData[i + 1] = (byte) (intValue >>> 16);
+        byteData[i + 2] = (byte) (intValue >>> 8);
+        byteData[i + 3] = (byte) intValue;
+    }
+
+    /**
+     * 计算sha-1摘要，返回相应的字节数组
+     *
+     * @param byteData
+     * @return
+     */
+    public byte[] getDigestOfBytes(byte[] byteData) {
+        process_input_bytes(byteData);
+        byte[] digest = new byte[20];
+        for (int i = 0; i < digestInt.length; i++) {
+            intToByteArray(digestInt[i], digest, i * 4);
+        }
+        return digest;
+    }
+
+    /**
+     * 计算sha-1摘要，返回相应的十六进制字符串
+     *
+     * @param byteData
+     * @return
+     */
+    public String getDigestOfString(byte[] byteData) {
+        return byteArrayToHexString(getDigestOfBytes(byteData));
+    }
+
+    /**
+     * @param data
+     * @return
+     */
+    public String Digest(String data) {
+        return this.getDigestOfString(data.getBytes());
+    }
+
+    /**
+     * @param data
+     * @return
+     */
+    public String Digest(String data, String encode) {
+        try {
+            return this.getDigestOfString(data.getBytes(encode));
+        } catch (UnsupportedEncodingException e) {
+            return this.Digest(data);
+        }
+    }
+}
+package com.cnlive.gundam.main.network.util;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.cnlive.gundam.main.network.util.SHA1;
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.util.data.okhttp3.Headers;
+import com.cnlive.libs.util.data.okhttp3.OkHttpClient;
+import com.cnlive.libs.util.data.okhttp3.Request;
+import com.cnlive.libs.util.data.okhttp3.Response;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Created by Lynn on 5/25/2017.
+ */
+
+public class SignUtil {
+    //时间服务器地址
+    private static final String URL_TIME_SERVICE = "https://api.cnlive.com/open/api2/timestamp";
+
+    private static final String TAG = "SignUtil";
+
+    public static Map<String, String> getSignParamM(Context context, Map<String, String> params) {
+        if (context == null || params == null) return new HashMap<>();
+        params.put("platform_id", context.getPackageName());
+        params.put("timestamp", String.valueOf(getTime() / 1000));
+        Map<String, String> map = order(params);
+        if (map.containsKey("sign")) {
+            map.remove("sign");
+        }
+        String signValue = SHA1
+                .SHA1Digest(mapJoin(map, false).concat("&key=").concat(Config.getSpKey()))
+                .toUpperCase(Locale.getDefault());
+        map.put("sign", signValue);
+        return map;
+    }
+
+    private static String getSignParam(Context context, Map<String, String> params) {
+        if (context == null || params == null) return "";
+        params.put("platform_id", context.getPackageName());
+        params.put("timestamp", String.valueOf(getTime() / 1000));
+
+        String signParam = mapParam(params);
+
+        Map<String, String> map = order(params);
+
+        if (map.containsKey("sign")) {
+            map.remove("sign");
+        }
+
+        String signValue = SHA1.SHA1Digest(mapJoin(map, false).concat("&key=").concat(Config.getSpKey()))
+                .toUpperCase(Locale.getDefault());
+        return signParam.concat("&sign=").concat(signValue);
+    }
+
+    private static long getTime() {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        try {
+            Request request = new Request.Builder().url(URL_TIME_SERVICE).build();
+            Response response = okHttpClient.newCall(request).execute();
+            Headers headers = response.headers();
+
+            Date date = headers.getDate("Date");
+            return date == null ? System.currentTimeMillis() : date.getTime();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return System.currentTimeMillis();
+    }
+
+    public static String mapParam(Map<String, String> map) {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String key : map.keySet()) {
+            stringBuilder.append(key).append("=").append(map.get(key)).append("&");
+        }
+        if (stringBuilder.length() > 0) {
+            stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+        }
+        return stringBuilder.toString();
+    }
+
+    private static Map<String, String> order(Map<String, String> map) {
+        HashMap<String, String> tempMap = new LinkedHashMap<>();
+        List<Map.Entry<String, String>> infoIds = new ArrayList<>(map.entrySet());
+
+        Collections.sort(infoIds, new Comparator<Map.Entry<String, String>>() {
+            public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
+                return o1.getKey().compareTo(o2.getKey());
+            }
+        });
+
+        for (int i = 0; i < infoIds.size(); i++) {
+            Map.Entry<String, String> item = infoIds.get(i);
+            tempMap.put(item.getKey(), item.getValue());
+        }
+        return tempMap;
+    }
+
+    private static String mapJoin(Map<String, String> map, boolean valueUrlencode) {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String key : map.keySet()) {
+            if (map.get(key) != null && !"".equals(map.get(key))) {
+                try {
+                    stringBuilder.append(key)
+                            .append("=")
+                            .append(valueUrlencode ? URLEncoder.encode(map.get(key), "utf-8").replace("+", "%20") : map.get(key))
+                            .append("&");
+                } catch (UnsupportedEncodingException e) {
+                    Log.e(TAG, "Load:" + e.getMessage(), e);
+                }
+            }
+        }
+        if (stringBuilder.length() > 0) {
+            stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+        }
+        return stringBuilder.toString();
+    }
+}
 package com.cnlive.gundam.main.ui.activity;
-import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -12,7 +11,6 @@ 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.stream.ui.activity.StreamActivity;
 import java.util.Arrays;
@@ -41,16 +39,14 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
     public boolean onSetCurrentTab(String tag) {
         switch (tag) {
             case "stream":
-                Intent intent = new Intent(this, StreamActivity.class);
-                intent.putExtra("activityId", ""+System.currentTimeMillis());
-                intent.putExtra("channelId", "androidtest");
-                intent.putExtra("channelName", "androidTest");
-                intent.putExtra("coverImgUrl", "");
-                intent.putExtra("landscape", false);
-                startActivity(intent);
+                onSetStreamTab();
                 return true;
         }
         return false;
     }
+    private void onSetStreamTab(){
+
+    }
+
 }
 \ No newline at end of file
 package com.cnlive.gundam.main.ui.fragment;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+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.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.cnlive.gundam.BR;
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.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.main.ui.adapter.DataBindingAdapter;
+import com.cnlive.gundam.main.utils.ActivityJumpUtil;
+import com.cnlive.libs.util.Config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 /**
  * Created by xiansong on 2017/6/27.
+ * 此demo没有实现分页逻辑
  */
-public class HomeFragment extends Fragment {
-}
+public class HomeFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener,
+        DataBindingAdapter.OnAdapterViewClickListener<VideoListProgram>,
+        DataBindingAdapter.OnAdapterViewLoadMoreListener, Callback<VodListPage> {
+
+    private FragmentActiveListBinding binding;
+    private DataBindingAdapter adapter;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_active_list, container, false);
+        binding.setListAdapter(adapter = new DataBindingAdapter(getActivity(), R.layout.layout_item_video_list, BR.program));
+        adapter.setOnViewClickListener(this);
+        adapter.setOnLoadMoreListener(this);
+        binding.setLayoutManager(new LinearLayoutManager(getActivity()));
+        binding.contentView.setOnRefreshListener(this);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        loadData();
+    }
+
+    private void loadData() {
+        Map<String, String> params = new HashMap<>();
+        params.put("appId", Config.getAppId());
+        params.put("pageNumber", "1");
+        params.put("pageSize", "15");
+        RetrofitUtil.getApiService().getVodInfoList(SignUtil.getSignParamM(getActivity(), params)).enqueue(this);
+    }
+
+    @Override
+    public void onRefresh() {
+        loadData();
+    }
+
+    @Override
+    public void onViewClick(View v, VideoListProgram program) {
+        if (v.getId() == R.id.itemLayout) {
+            ActivityJumpUtil.jumpByProgramType(getActivity(), program);
+        }
+    }
+
+    @Override
+    public void onLoadMore() {
+
+    }
+
+    @Override
+    public void onResponse(Call<VodListPage> call, Response<VodListPage> response) {
+        binding.contentView.setRefreshing(false);
+        if (response.isSuccessful()) {
+            VodListPage model = response.body();
+            if (model != null && "0".equals(model.getCode())) {
+                if (model.getData() == null) {
+                    Toast.makeText(getActivity(), getString(R.string.request_null), Toast.LENGTH_LONG).show();
+                } else {
+                    adapter.updateItems(model.getData());
+                }
+            } else {
+                Toast.makeText(getActivity(), getString(R.string.request_error), Toast.LENGTH_LONG).show();
+            }
+        } else {
+            Toast.makeText(getActivity(), getString(R.string.request_error), Toast.LENGTH_LONG).show();
+        }
+    }
+
+    @Override
+    public void onFailure(Call<VodListPage> call, Throwable t) {
+        binding.contentView.setRefreshing(false);
+        Toast.makeText(getActivity(), getString(R.string.request_error), Toast.LENGTH_LONG).show();
+    }
+}
 \ No newline at end of file
@@ -50,12 +50,12 @@ public class LiveFragment extends Fragment implements DataBindingAdapter.OnAdapt
     private void initData() {
         programs = new ArrayList<>();
-        programs.add(new VideoListProgram("liveshow", "LiveShow", "http://yweb0.cnliveimg.com/cnlive/public/150417133551285_693.png", "408481", "live"));
-        programs.add(new VideoListProgram("news", "快新闻", "http://yweb1.cnliveimg.com/img/cnlive/160121113653827_867.png", "85697", "live"));
-        programs.add(new VideoListProgram("eyule", "e娱乐", "http://yweb2.cnliveimg.com/img/cnlive/160121113659992_585.png", "408480", "live"));
-        programs.add(new VideoListProgram("chaotiyu", "潮体育", "http://yweb3.cnliveimg.com/img/cnlive/160121113706887_696.png", "285698", "live"));
-        programs.add(new VideoListProgram("xuanhanyu", "炫韩娱", "http://yweb0.cnliveimg.com/cnlive/public/150417133341123_878.png", "408487", "live"));
-        programs.add(new VideoListProgram("inyuetai", "in乐台", "http://yweb1.cnliveimg.com/cnlive/public/150417144750615_185.png", "285696", "live"));
+        programs.add(new VideoListProgram("82_liveshow", "LiveShow", "http://yweb0.cnliveimg.com/cnlive/public/150417133551285_693.png", "408481", "live"));
+        programs.add(new VideoListProgram("82_news", "快新闻", "http://yweb1.cnliveimg.com/img/cnlive/160121113653827_867.png", "85697", "live"));
+        programs.add(new VideoListProgram("82_eyule", "e娱乐", "http://yweb2.cnliveimg.com/img/cnlive/160121113659992_585.png", "408480", "live"));
+        programs.add(new VideoListProgram("82_chaotiyu", "潮体育", "http://yweb3.cnliveimg.com/img/cnlive/160121113706887_696.png", "285698", "live"));
+        programs.add(new VideoListProgram("82_xuanhanyu", "炫韩娱", "http://yweb0.cnliveimg.com/cnlive/public/150417133341123_878.png", "408487", "live"));
+        programs.add(new VideoListProgram("82_inyuetai", "in乐台", "http://yweb1.cnliveimg.com/cnlive/public/150417144750615_185.png", "285696", "live"));
     }
     @Override
@@ -9,18 +9,34 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.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.main.ui.adapter.DataBindingAdapter;
+import com.cnlive.gundam.main.utils.ActivityJumpUtil;
+import com.cnlive.libs.util.Config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 /**
  * Created by xiansong on 2017/6/27.
+ * 此 demo 没有实现分页加载
  */
-public class UGCListFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener, DataBindingAdapter.OnAdapterViewClickListener<ActiveInfo>, DataBindingAdapter.OnAdapterViewLoadMoreListener {
+public class UGCListFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener,
+        DataBindingAdapter.OnAdapterViewClickListener<ActiveInfo>,
+        DataBindingAdapter.OnAdapterViewLoadMoreListener, Callback<ActiveListModel> {
     private FragmentActiveListBinding binding;
     private DataBindingAdapter adapter;
@@ -33,7 +49,7 @@ public class UGCListFragment extends Fragment implements SwipeRefreshLayout.OnRe
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_active_list, container, false);
-        binding.setListAdapter(adapter = new DataBindingAdapter(getActivity(), R.layout.layout_item_video_list, BR.program));
+        binding.setListAdapter(adapter = new DataBindingAdapter(getActivity(), R.layout.layout_item_active_video_list, BR.activeInfo));
         adapter.setOnViewClickListener(this);
         adapter.setOnLoadMoreListener(this);
         binding.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -48,22 +64,55 @@ 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("pageNo", "1");
+        params.put("pageSize", "15");
+        RetrofitUtil.getApiService().getSpActivityList(SignUtil.getSignParamM(getActivity(), params)).enqueue(this);
     }
     @Override
     public void onRefresh() {
-
+        loadData();
     }
     @Override
     public void onViewClick(View v, ActiveInfo program) {
-
+        if (v.getId() == R.id.itemLayout) {
+            ActivityJumpUtil.jumpByProgramType(getActivity(), program);
+        }
     }
     @Override
     public void onLoadMore() {
     }
+
+    @Override
+    public void onResponse(Call<ActiveListModel> call, Response<ActiveListModel> response) {
+        binding.contentView.setRefreshing(false);
+        if (response.isSuccessful()) {
+            ActiveListModel model = response.body();
+            if (model != null && "0".equals(model.getCode())) {
+                if (model.getData() == null) {
+                    Toast.makeText(getActivity(), getString(R.string.request_null), Toast.LENGTH_LONG).show();
+                } else {
+                    adapter.updateItems(model.getData().getActivityList());
+                }
+            } else {
+                Toast.makeText(getActivity(), getString(R.string.request_error), Toast.LENGTH_LONG).show();
+            }
+        } else {
+            Toast.makeText(getActivity(), getString(R.string.request_error), Toast.LENGTH_LONG).show();
+        }
+    }
+
+    @Override
+    public void onFailure(Call<ActiveListModel> call, Throwable t) {
+        binding.contentView.setRefreshing(false);
+        Toast.makeText(getActivity(), getString(R.string.request_error), Toast.LENGTH_LONG).show();
+    }
 }
 package com.cnlive.gundam.main.utils;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.widget.Toast;
+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.video.activity.PlayerActivity;
+import com.cnlive.gundam.video.view.VideoView;
+import com.cnlive.libs.util.Config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 /**
  * Created by Lynn on 5/27/2017.
@@ -13,70 +27,43 @@ import com.cnlive.gundam.video.activity.PlayerActivity;
 public class ActivityJumpUtil {
-//    //活动视频页面跳转
-//    public static void jumpByProgramType(final Context context, final VideoListPage.Program program) {
-//        if (context == null || program == null)
-//            return;
-////        intentByStatus(context, program);
-//        ApiServiceUtil.getActivePlayInfo(context, program.getActivityId()).subscribe(new com.cnlive.granzon.data.network.network.Subscriber<ActivePlayInfo>() {
-//            @Override
-//            public void onCompleted(ActivePlayInfo data) {
-//                program.setIsHorizontalScreen(data.getData().getIsHorizontalScreen());
-//                program.setActivityId(data.getData().getActivityId());
-//                program.setChannelId(data.getData().getChannelId());
-//                program.setRates(data.getData().getRates());
-//                program.setActivityName(data.getData().getActivityName());
-//                intentByStatus(context, program);
-//            }
-//
-//            @Override
-//            public void onError(String code, String message) {
-//                intentByStatus(context, program);
-//            }
-//        });
-//
-//
-//    }
-//
-//    private static void intentByStatus(Context context, VideoListPage.Program program) {
-//        switch (program.getActivityStatus()) {
-//            case 0:
-//            case 3:
-//            case 4:
-//                if (context instanceof Activity) {
-//                    Intent intentVod = new Intent(context, PlayerActivity.class);
-//                    VideoListProgram videoListProgram = VideoListProgram.toVideoListProgram(program, "ugcVod");
-//                    intentVod.putExtra("program", videoListProgram);
-//                    intentVod.putExtra("screenDirect", program.getIsHorizontalScreen() + "");
-//                    context.startActivity(intentVod);
-//                } else {
-//                    Intent intentVod = new Intent(context, PlayerActivity.class);
-//                    VideoListProgram videoListProgram = VideoListProgram.toVideoListProgram(program, "ugcVod");
-//                    intentVod.putExtra("program", videoListProgram);
-//                    intentVod.putExtra("screenDirect", program.getIsHorizontalScreen() + "");
-//                    intentVod.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                    context.startActivity(intentVod);
-//                }
-//                break;
-//            case -2:
-//            case 1:
-//                if (context instanceof Activity) {
-//                    Intent intentLive = new Intent(context, PlayerActivity.class);
-//                    VideoListProgram videoListProgram = VideoListProgram.toVideoListProgram(program, "ugcLive");
-//                    intentLive.putExtra("program", videoListProgram);
-//                    intentLive.putExtra("screenDirect", program.getIsHorizontalScreen() + "");
-//                    context.startActivity(intentLive);
-//                } else {
-//                    Intent intentLive = new Intent(context, PlayerActivity.class);
-//                    VideoListProgram videoListProgram = VideoListProgram.toVideoListProgram(program, "ugcLive");
-//                    intentLive.putExtra("program", videoListProgram);
-//                    intentLive.putExtra("screenDirect", program.getIsHorizontalScreen() + "");
-//                    intentLive.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                    context.startActivity(intentLive);
-//                }
-//                break;
-//        }
-//    }
+    //活动视频页面跳转
+    public static void jumpByProgramType(final Context context, ActiveInfo activeInfo) {
+        if (context == null || activeInfo == null)
+            return;
+        Map<String, String> params = new HashMap<>();
+        params.put("appId", Config.getAppId());
+        params.put("activityId", activeInfo.getActivityId());
+        RetrofitUtil.getApiService().getActivityPlayInfo(SignUtil.getSignParamM(context, params)).enqueue(new Callback<ActivePlayInfo>() {
+            @Override
+            public void onResponse(Call<ActivePlayInfo> call, Response<ActivePlayInfo> response) {
+                if (response.isSuccessful()) {
+                    ActivePlayInfo info = response.body();
+                    if (info != null && "0".equals(info.getCode())) {
+                        jumpByStatus(context, info.getData());
+                    } else {
+                        Toast.makeText(context, context.getString(R.string.request_state_error), Toast.LENGTH_LONG).show();
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<ActivePlayInfo> call, Throwable t) {
+                Toast.makeText(context, context.getString(R.string.request_state_error), Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    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));
+        } else {
+            Toast.makeText(context, context.getString(R.string.request_state_play_error), Toast.LENGTH_LONG).show();
+        }
+    }
     //视频页面跳转
     public static void jumpByProgramType(final Context context, final VideoListProgram program) {
@@ -2,7 +2,9 @@ package com.cnlive.gundam.stream.ui.activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.os.Handler;
@@ -70,6 +72,16 @@ public class StreamActivity extends BaseStreamActivity implements ChatConnect.Ch
     private TimerUtil timerUtil;
     private String extensions;
+    public static void start(Context context, String activityId, String channelId, String channelName, String coverImgUrl, boolean landscage) {
+        Intent intent = new Intent(context, StreamActivity.class);
+        intent.putExtra("activityId", activityId);
+        intent.putExtra("channelId", channelId);
+        intent.putExtra("channelName", channelName);
+        intent.putExtra("coverImgUrl", coverImgUrl);
+        intent.putExtra("landscape", landscage);
+        context.startActivity(intent);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -10,7 +10,6 @@ import android.text.format.Formatter;
 import com.cnlive.libs.util.SharedPreferencesHelper;
-import org.jivesoftware.smack.util.StringUtils;
 import java.io.File;
 import java.io.IOException;
@@ -186,7 +185,7 @@ public class FileUtils {
     }
     public static String getUrlFileExtensionName(String url) {
-        if(StringUtils.isEmpty(url)) return "";
+        if(TextUtils.isEmpty(url)) return "";
         int slashIndex = url.lastIndexOf('/');
         String filenameWithoutExtension;
         filenameWithoutExtension = url.substring(slashIndex + 1);
@@ -206,7 +205,7 @@ public class FileUtils {
     }
     public static String getUrlExtension(String url) {
-        if (!StringUtils.isEmpty(url)) {
+        if (!TextUtils.isEmpty(url)) {
             int i = url.lastIndexOf('.');
             if (i > 0 && i < url.length() - 1) {
                 return url.substring(i + 1).toLowerCase(Locale.getDefault());
 package com.cnlive.gundam.user.util;
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -9,7 +10,6 @@ import android.widget.Toast;
 import com.cnlive.gundam.R;
-import org.jivesoftware.smack.util.StringUtils;
 /**
@@ -32,7 +32,7 @@ public class ToastUtil {
 //        if (!ShockwaveApplication.appOnline)
 //            return;
         hide();
-        if (null == context || StringUtils.isEmpty(msg))
+        if (null == context || TextUtils.isEmpty(msg))
             return null;
         if (back_pressed + 2000 < System.currentTimeMillis() || !show_msg.equals(msg)) {
             hideToast();
@@ -51,7 +51,7 @@ public class PlayerActivity extends AppCompatActivity {
             case "live":
                 fragment = PlayerLiveFragment.newInstance(program);
                 break;
-            case "program":
+            case "vod":
                 fragment = PlayerVodFragment.newInstance(program);
                 break;
             case "ugcLive":
@@ -429,7 +429,7 @@ public class VideoView extends BaseVideoView implements PlayerTouchView.VideoTou
     public void onCompletion(IMediaPlayer iMediaPlayer) {
         super.onCompletion(iMediaPlayer);
         //非因为异常导致的结束
-        if (!isPlayerError) {
+        if (!isPlayerError && !isLive) {
             binding.infoView.show(PlayerInfoView.SHOW_END);
         }
     }
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_meiyan_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_meiyan" android:state_pressed="false" />
+</selector>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_meiyan_on_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_meiyan_on" android:state_pressed="false" />
+</selector>
 \ No newline at end of file
@@ -162,7 +162,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@{isShow.beautifulBtn ? @drawable/icon_record_meiyan_on : @drawable/icon_record_meiyan_off}" />
+                android:src="@{isShow.beautifulBtn ? @drawable/icon_record_meiyan_on : @drawable/icon_record_meiyan}" />
             <ImageButton
                 android:id="@+id/btn_flip"
@@ -4,16 +4,16 @@
     <data>
-        <import type="com.cnlive.gundam.main.model.VideoListProgram" />
+        <import type="com.cnlive.gundam.main.model.ActiveInfo" />
         <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter.OnAdapterViewClickListener"/>
         <variable
-            name="program"
-            type="VideoListProgram" />
+            name="activeInfo"
+            type="ActiveInfo" />
         <variable
             name="viewClickListner"
-            type="OnAdapterViewClickListener&lt;VideoListProgram>"/>
+            type="OnAdapterViewClickListener&lt;ActiveInfo>"/>
     </data>
@@ -21,7 +21,7 @@
         android:id="@+id/itemLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:onClick="@{(view)->viewClickListner.onViewClick(view,program)}">
+        android:onClick="@{(view)->viewClickListner.onViewClick(view,activeInfo)}">
         <ImageView
             android:id="@+id/image"
@@ -29,7 +29,7 @@
             android:layout_height="200dp"
             android:scaleType="centerCrop"
             app:error="@{@drawable/image_error}"
-            app:imageUrl="@{program.getImg()}" />
+            app:imageUrl="@{activeInfo.getCoverImgUrl()}" />
         <TextView
             android:id="@+id/title"
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/image"
             android:padding="10dp"
-            android:text="@{program.getTitle()}"
+            android:text="@{activeInfo.getActivityName()}"
             android:textColor="@android:color/black"
             android:textSize="16sp"/>
@@ -4,7 +4,7 @@
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
-    <color name="list_divider">#9e9e9e</color>
+    <color name="list_divider">#dedbdb</color>
     <color name="rate_sel">#ff0000</color>
     <color name="rate_nor">#ffffff</color>
@@ -31,4 +31,76 @@
     <string name="loaded_rate_last">""</string>
     <string name="loaded_rate_error_pre">提醒您切换</string>
     <string name="loaded_rate_error_last">失败，请重试</string>
+
+    <string name="request_error">获取数据失败</string>
+    <string name="request_null">暂无数据</string>
+    <string name="request_state_error">获取活动状态失败</string>
+    <string name="request_state_play_error">此活动状态无法播放</string>
+
+
+    <string name="net_connect_toast">"你好像掉线了"</string>
+
+    //我的
+    <string name="main_tab_config">我的</string>
+    <string name="click_login">点击登录</string>
+    <string name="login_china_coin">登录就送中国币哟</string>
+    <string name="my_config_money_desc">中国币、兑换码、金额</string>
+    <string name="logout">注销</string>
+
+    //登录页面
+    <string name="user_login_account">账号：</string>
+    <string name="user_login_account_hint">Email/手机号码</string>
+    <string name="user_login_code">密码：</string>
+    <string name="user_login_code_hint">6&#8211;20位字母或数字</string>
+    <string name="user_login_recall_code">忘记密码？</string>
+    <string name="string_fast_access">短信验证登录</string>
+    <string name="user_login">登录</string>
+    <string name="user_login_third_part_login">第三方账号登录</string>
+    <string name="third_login_sina">微博</string>
+    <string name="third_login_qq">QQ</string>
+    <string name="third_login_weixin">微信</string>
+
+    //注册页面
+    <string name="register_mobile_hint">请输入您的手机号</string>
+    <string name="getmobile_identify_code">获取验证码</string>
+    <string name="register_mobile_keycode_hint">请输入您收到的验证码</string>
+    <string name="register_password_hint">请设置密码：6&#8211;20位字母或数字</string>
+    <string name="register_show_password">显示密码</string>
+    <string name="register_and_agree">我已阅读并同意</string>
+    <string name="register_btn">注册</string>
+
+    //找回密码页面
+    <string name="find_password_btn">找回密码</string>
+    <string name="find_password_hint">请确认密码：6&#8211;20位字母或数字</string>
+    <string name="save_btn">保存</string>
+
+    //昵称修改页面
+    <string name="user_input_nickname">请输入昵称</string>
+
+    //手机号修改页面
+    <string name="register_mobile">手机号：</string>
+    <string name="user_personal_telephone_hint">手机号码</string>
+    <string name="register_mobile_keycode">验证码：</string>
+    <string name="hint_6_numbers_code">6位数字验证码</string>
+
+    //邮箱修改页面
+    <string name="email_notify">修改后，您输入的邮箱将会收到确认邮件，请按邮件中的说明去完成验证，谢谢！</string>
+
+    //关于我们页面
+    <string name="about_us_visit">访问视讯中国官网</string>
+    <string name="about_us_call_phone">拨打客服电话</string>
+    <string name="about_us_disclaimer">免责声明</string>
+    <string name="about_us_company_name">北京中投视讯文化传媒股份有限公司</string>
+
+    //分享
+    <string name="toast_msg_share_success">分享成功！</string>
+    <string name="toast_msg_share_fail">分享失败，请再试一次</string>
+    <string name="toast_msg_share_cancel">取消分享</string>
+    <string name="share_program_download_targetUrl"> http://www.cnlive.com/web/guide.jsp</string>
+
+    //AccountManager用户管理
+    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
+    <string name="ACCOUNT_LABEL">@string/app_name</string>
+
+    <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
 </resources>