Android 更新SDK 7.8.9517

Author: tatemin

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/TCApplication.java

@@ -6,7 +6,7 @@
 
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.qcloud.ugckit.UGCKit;
-import com.tencent.qcloud.ugckit.module.upload.TCUserMgr;
+import com.tencent.qcloud.ugckit.utils.TCUserMgr;
 import com.tencent.qcloud.ugckit.utils.LogReport;
 import com.tencent.qcloud.ugckit.UGCKitConstants;
 import com.tencent.qcloud.xiaoshipin.config.TCConfigManager;

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/login/TCLoginActivity.java

@@ -13,7 +13,7 @@
 import android.widget.TextView;
 
 import com.tencent.qcloud.xiaoshipin.R;
-import com.tencent.qcloud.ugckit.module.upload.TCUserMgr;
+import com.tencent.qcloud.ugckit.utils.TCUserMgr;
 import com.tencent.qcloud.xiaoshipin.userinfo.UserInfoUtil;
 import com.tencent.qcloud.xiaoshipin.mainui.TCMainActivity;
 import com.tencent.qcloud.ugckit.utils.NetworkUtil;

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/login/TCRegisterActivity.java

@@ -16,7 +16,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.tencent.qcloud.ugckit.module.upload.TCUserMgr;
+import com.tencent.qcloud.ugckit.utils.TCUserMgr;
 import com.tencent.qcloud.xiaoshipin.userinfo.UserInfoUtil;
 import com.tencent.qcloud.ugckit.utils.LogReport;
 import com.tencent.qcloud.xiaoshipin.R;

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/mainui/TCMainActivity.java

@@ -23,7 +23,7 @@
 import com.tencent.qcloud.xiaoshipin.config.TCConfigManager;
 import com.tencent.qcloud.xiaoshipin.login.TCLoginActivity;
 import com.tencent.qcloud.xiaoshipin.mainui.list.TCUGCListFragment;
-import com.tencent.qcloud.ugckit.module.upload.TCUserMgr;
+import com.tencent.qcloud.ugckit.utils.TCUserMgr;
 import com.tencent.qcloud.ugckit.utils.FileUtils;
 import com.tencent.qcloud.ugckit.module.record.draft.RecordDraftInfo;
 import com.tencent.qcloud.ugckit.module.record.draft.RecordDraftManager;

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/mainui/list/TCVideoListMgr.java

@@ -1,6 +1,6 @@
 package com.tencent.qcloud.xiaoshipin.mainui.list;
 
-import com.tencent.qcloud.ugckit.module.upload.TCUserMgr;
+import com.tencent.qcloud.ugckit.utils.TCUserMgr;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/play/TCVodPlayerActivity.java

@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Environment;
 import android.support.annotation.Nullable;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
@@ -21,7 +20,7 @@
 import com.tencent.qcloud.xiaoshipin.R;
 import com.tencent.qcloud.xiaoshipin.login.TCLoginActivity;
 import com.tencent.qcloud.xiaoshipin.mainui.list.TCVideoInfo;
-import com.tencent.qcloud.ugckit.module.upload.TCUserMgr;
+import com.tencent.qcloud.ugckit.utils.TCUserMgr;
 import com.tencent.qcloud.ugckit.utils.BitmapUtils;
 import com.tencent.qcloud.ugckit.utils.LogReport;
 import com.tencent.qcloud.ugckit.utils.TelephonyUtil;

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/userinfo/TCUserInfoFragment.java

@@ -19,7 +19,7 @@
 import com.tencent.qcloud.xiaoshipin.R;
 import com.tencent.qcloud.xiaoshipin.login.TCLoginActivity;
 import com.tencent.qcloud.xiaoshipin.mainui.TCSettingActivity;
-import com.tencent.qcloud.ugckit.module.upload.TCUserMgr;
+import com.tencent.qcloud.ugckit.utils.TCUserMgr;
 import com.tencent.qcloud.ugckit.utils.BackgroundTasks;
 import com.tencent.qcloud.ugckit.utils.BitmapUtils;
 

Android/Demo/app/src/main/java/com/tencent/qcloud/xiaoshipin/videopublish/TCVideoPublisherActivity.java

@@ -6,7 +6,6 @@
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.tencent.qcloud.ugckit.module.upload.TCVideoPublishKit;
 import com.tencent.qcloud.ugckit.UGCKitConstants;
 import com.tencent.qcloud.ugckit.UGCKitVideoPublish;
 import com.tencent.qcloud.xiaoshipin.R;
@@ -41,18 +40,18 @@ protected void onCreate(Bundle savedInstanceState) {
         /**
          * 设置发布视频的监听器
          */
-        mUGCKitVideoPublish.setOnPublishListener(new TCVideoPublishKit.OnPublishListener() {
+        mUGCKitVideoPublish.setOnPublishListener(new UGCKitVideoPublish.OnPublishListener() {
 
             @Override
-            public void onPublishCompleted() {
+            public void onPublishComplete() {
                 /**
                  * 发布完成，返回主界面
                  */
                 backToMainActivity();
             }
 
             @Override
-            public void onPublishCanceled() {
+            public void onPublishCancel() {
                 /**
                  * 发布取消，退出发布页面
                  */

Android/Demo/beautysettingkit/src/main/java/com/tencent/liteav/demo/beauty/view/BeautyPanel.java

@@ -170,14 +170,12 @@ public ItemInfo getItemInfo(int tabIndex, int itemIndex) {
     }
 
     public void setCurrentFilterIndex(int index) {
-        mCurrentTabPosition = 1;
-        mCurrentItemPosition[mCurrentTabPosition] = index;
+        mCurrentItemPosition[1] = index;
         mBeauty.setCurrentFilterIndex(mBeautyInfo, index);
     }
 
     public void setCurrentBeautyIndex(int index) {
-        mCurrentTabPosition = 0;
-        mCurrentItemPosition[mCurrentTabPosition] = index;
+        mCurrentItemPosition[0] = index;
         mBeauty.setCurrentBeautyIndex(mBeautyInfo, index);
     }
 
@@ -252,10 +250,10 @@ private void createItemList(@NonNull final TabInfo tabInfo, @NonNull final int t
         ItemAdapter itemAdapter = new ItemAdapter(mContext);
         if (tabInfo.getTabType() == BeautyConstants.TAB_TYPE_FILTER) {
             // 滤镜默认选中白皙
-            itemAdapter.setData(tabInfo, 1);
+            itemAdapter.setData(tabInfo, mCurrentItemPosition[1]);
         } else if(tabInfo.getTabType() == BeautyConstants.TAB_TYPE_BEAUTY) {
             // 美颜默认选中P图
-            itemAdapter.setData(tabInfo, 2);
+            itemAdapter.setData(tabInfo, mCurrentItemPosition[0]);
         } else {
             itemAdapter.setData(tabInfo);
         }

Android/Demo/ugckit/src/main/java/com/tencent/qcloud/ugckit/UGCKit.java

@@ -3,14 +3,15 @@
 import android.content.Context;
 
 public class UGCKit {
+    private static Context sAppContext;
 
     /**
      * UGCKit的初始化函数
      *
      * @param context 应用的上下文，一般为对应应用的ApplicationContext
      */
     public static void init(Context context) {
-        UGCKitImpl.init(context);
+        sAppContext = context;
     }
 
     /**
@@ -19,7 +20,7 @@ public static void init(Context context) {
      * @return
      */
     public static Context getAppContext() {
-        return UGCKitImpl.getAppContext();
+        return sAppContext;
     }
 
 }