Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/AndroidManifest.xml

@@ -457,7 +457,7 @@
             android:screenOrientation="user"
             android:theme="@style/AppTheme.noTitleBar" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.ActPlayVideoArticle"
+            android:name="com.sheep.gamegroup.view.activity.ActVideoDetail"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
             android:screenOrientation="user"
             android:theme="@style/AppTheme.noTitleBar" />

app/src/main/java/com/sheep/gamegroup/absBase/BaseUMActivity.java

@@ -3,15 +3,41 @@ package com.sheep.gamegroup.absBase;
 import android.content.Intent;
 
 
+import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.UMShareListener;
+import com.umeng.socialize.bean.SHARE_MEDIA;
 
 /**
  * Created by Administrator on 2018/3/21.
  */
 
-public  abstract  class BaseUMActivity extends BaseActivity {
+public  abstract  class BaseUMActivity extends BaseActivity implements UMShareListener {
 
     @Override
+    public void onStart(SHARE_MEDIA share_media) {
+        LogUtil.println("UMShareListener", "start", share_media.getName());
+    }
+
+    @Override
+    public void onResult(SHARE_MEDIA share_media) {
+        LogUtil.println("UMShareListener", "result", share_media.getName());
+    }
+
+    @Override
+    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
+        String msg = throwable.getMessage();
+        G.showToast(msg != null && msg.contains("没有安装应用") ? "没有安装应用" : msg);
+        LogUtil.println("UMShareListener", "error", share_media.getName() +
+                ",msg:" + throwable.getMessage());
+    }
+
+    @Override
+    public void onCancel(SHARE_MEDIA share_media) {
+        LogUtil.println("UMShareListener", "delete", share_media.getName());
+    }
+    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         try {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,26 +21,26 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        ProcessRecordDao.createTable(db, ifNotExists);
+        AcceptTaskRecordDao.createTable(db, ifNotExists);
         AppdownloadBeanDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
+        DownLoadInfoDao.createTable(db, ifNotExists);
+        ProcessRecordDao.createTable(db, ifNotExists);
         ScreenShotRecordDao.createTable(db, ifNotExists);
-        AcceptTaskRecordDao.createTable(db, ifNotExists);
-        AccountDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
         SearchRecordDao.createTable(db, ifNotExists);
-        DownLoadInfoDao.createTable(db, ifNotExists);
+        AccountDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        ProcessRecordDao.dropTable(db, ifExists);
+        AcceptTaskRecordDao.dropTable(db, ifExists);
         AppdownloadBeanDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
+        DownLoadInfoDao.dropTable(db, ifExists);
+        ProcessRecordDao.dropTable(db, ifExists);
         ScreenShotRecordDao.dropTable(db, ifExists);
-        AcceptTaskRecordDao.dropTable(db, ifExists);
-        AccountDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
         SearchRecordDao.dropTable(db, ifExists);
-        DownLoadInfoDao.dropTable(db, ifExists);
+        AccountDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(ProcessRecordDao.class);
         registerDaoClass(ScreenShotRecordDao.class);
-        registerDaoClass(AcceptTaskRecordDao.class);
-        registerDaoClass(AccountDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
         registerDaoClass(SearchRecordDao.class);
-        registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(AccountDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.ProcessRecord;
 import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
-import com.sheep.gamegroup.greendao.download.Account;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.greendao.download.SearchRecord;
-import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.Account;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
 import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
-import com.sheep.gamegroup.greendao.download.AccountDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
 import com.sheep.gamegroup.greendao.download.SearchRecordDao;
-import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.AccountDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig processRecordDaoConfig;
     private final DaoConfig screenShotRecordDaoConfig;
-    private final DaoConfig acceptTaskRecordDaoConfig;
-    private final DaoConfig accountDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
     private final DaoConfig searchRecordDaoConfig;
-    private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig accountDaoConfig;
 
-    private final ProcessRecordDao processRecordDao;
+    private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AppdownloadBeanDao appdownloadBeanDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
+    private final DownLoadInfoDao downLoadInfoDao;
+    private final ProcessRecordDao processRecordDao;
     private final ScreenShotRecordDao screenShotRecordDao;
-    private final AcceptTaskRecordDao acceptTaskRecordDao;
-    private final AccountDao accountDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
     private final SearchRecordDao searchRecordDao;
-    private final DownLoadInfoDao downLoadInfoDao;
+    private final AccountDao accountDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
-        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
         screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
-        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
-        accountDao = new AccountDao(accountDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
         searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
-        downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        accountDao = new AccountDao(accountDaoConfig, this);
 
-        registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(ProcessRecord.class, processRecordDao);
         registerDao(ScreenShotRecord.class, screenShotRecordDao);
-        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
-        registerDao(Account.class, accountDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
         registerDao(SearchRecord.class, searchRecordDao);
-        registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(Account.class, accountDao);
     }
     
     public void clear() {
-        processRecordDaoConfig.clearIdentityScope();
+        acceptTaskRecordDaoConfig.clearIdentityScope();
         appdownloadBeanDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
+        downLoadInfoDaoConfig.clearIdentityScope();
+        processRecordDaoConfig.clearIdentityScope();
         screenShotRecordDaoConfig.clearIdentityScope();
-        acceptTaskRecordDaoConfig.clearIdentityScope();
-        accountDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
         searchRecordDaoConfig.clearIdentityScope();
-        downLoadInfoDaoConfig.clearIdentityScope();
+        accountDaoConfig.clearIdentityScope();
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -89,7 +89,7 @@ import com.sheep.gamegroup.view.activity.ActPlayGameList;
 import com.sheep.gamegroup.view.activity.ActPlayGameRecommendList;
 import com.sheep.gamegroup.view.activity.ActPlayGameUserLikeList;
 import com.sheep.gamegroup.view.activity.ActPlayVideo;
-import com.sheep.gamegroup.view.activity.ActPlayVideoArticle;
+import com.sheep.gamegroup.view.activity.ActVideoDetail;
 import com.sheep.gamegroup.view.activity.ActPublishArticle;
 import com.sheep.gamegroup.view.activity.ActReservation;
 import com.sheep.gamegroup.view.activity.ActSearchApp;
@@ -2264,7 +2264,7 @@ public class Jump2View {
      */
     public void goActPlayVideoArticle(Serializable item) {
         Activity activity = ActivityManager.getInstance().currentActivity();
-        activity.startActivity(DataUtil.putObject(new Intent(activity, ActPlayVideoArticle.class), item));
+        activity.startActivity(DataUtil.putObject(new Intent(activity, ActVideoDetail.class), item));
     }
 
     /**

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -259,7 +259,7 @@ public class TestUtil {
      */
     public static void test(final Activity activity) {
         final String[] items = {"复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
-                "游戏搜索", "测试bitmap", "根据原始图片生成滤镜图片", "编辑视频", "我的关注", "足迹",
+                "游戏搜索", "测试bitmap", "根据原始图片生成滤镜图片", "剪切视频","编辑视频", "我的关注", "足迹",
                 "测试联通卡", "测试联通卡2", "测试签名1", "测试签名2", "测试孔剑秋faq正式服",
                 "跳转QQ1", "跳转QQ2", "跳转QQ3", "跳转白白QQ", "龙猫竞猜", "龙猫竞猜-scheme",
                 "有米科技", "手机型号测试", "测试通知栏", "测试自定义通知栏", "测试自定义通知栏2",
@@ -284,6 +284,9 @@ public class TestUtil {
                             case "根据原始图片生成滤镜图片":
                                 testCreateFilterbleImg(ViewUtil.getNetImgByName("alter_original"));
                                 break;
+                            case "剪切视频":
+                                testCutVideo();
+                                break;
                             case "编辑视频":
                                 testEditVideo();
                                 break;
@@ -671,6 +674,25 @@ public class TestUtil {
 
     }
 
+    private static void testCutVideo() {
+        Observable.create(new ObservableOnSubscribe<MediaBean>() {
+            @Override
+            public void subscribe(ObservableEmitter<MediaBean> emitter) throws Exception {
+                List<MediaBean> mediaBeanList = MediaUtils.getMediaWithVideoList(SheepApp.getInstance(), 1, 1);
+                MediaBean item = ListUtil.getItem(mediaBeanList, 0);
+                emitter.onNext(item);
+            }
+        })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new AbsObserver<MediaBean>() {
+                    @Override
+                    public void onNext(MediaBean mediaBean) {
+                        Jump2View.getInstance().goActCutVideo(Video.from(mediaBean));
+                    }
+                });
+
+    }
     private static void testEditVideo() {
         Observable.create(new ObservableOnSubscribe<MediaBean>() {
             @Override

app/src/main/java/com/sheep/gamegroup/util/js/BaseActWeb.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.util.js;
 import android.view.View;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
@@ -11,6 +12,9 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+
+import java.util.Locale;
 
 import rx.functions.Action1;
 
@@ -18,7 +22,7 @@ import rx.functions.Action1;
  * Created by realicing on 2018/11/23.
  * realicing@sina.com
  */
-public abstract class BaseActWeb extends BaseActivity {
+public abstract class BaseActWeb extends BaseUMActivity {
     public abstract boolean isResponseBack();
 
     public abstract void setResponseBack(boolean responseBack);
@@ -67,4 +71,29 @@ public abstract class BaseActWeb extends BaseActivity {
                 break;
         }
     }
+    @Override
+    public void onStart(SHARE_MEDIA share_media) {
+        //开始分享
+        loadJs(String.format(Locale.CHINA, "callback(\"onStart\", %s)", share_media.getName()));
+    }
+
+    @Override
+    public void onResult(SHARE_MEDIA share_media) {
+        //分享成功 微信分享时，取消也会成功
+        loadJs(String.format(Locale.CHINA, "callback(\"onResult\", %s)", share_media.getName()));
+    }
+
+    @Override
+    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
+        //分享出错
+        String msg = throwable.getMessage();
+        G.showToast(msg != null && msg.contains("没有安装应用") ? "没有安装应用" : msg);
+        loadJs(String.format(Locale.CHINA, "callback(\"onError\", %s)", share_media.getName()));
+    }
+
+    @Override
+    public void onCancel(SHARE_MEDIA share_media) {
+        //取消分享 微信分享时，没有取消
+        loadJs(String.format(Locale.CHINA, "callback(\"onCancel\", %s)", share_media.getName()));
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -112,33 +112,7 @@ public class KFZSJs {
         shareLink(link, iconUrl, title, des, ShareLinkConfig.ALL);
     }
     private void shareLink(String link, String iconUrl, String title, String des,@ShareLinkConfig.SHARE_TYPE String shareType) {
-        new ShareLinkConfig().setLink(link).setIconUrl(iconUrl).setTitle(title).setDes(des).setShareType(shareType).toShare(activity, new UMShareListener() {
-            @Override
-            public void onStart(SHARE_MEDIA share_media) {
-                //开始分享
-                activity.loadJs(String.format(Locale.CHINA, "callback(\"onStart\", %s)", share_media.getName()));
-            }
-
-            @Override
-            public void onResult(SHARE_MEDIA share_media) {
-                //分享成功 微信分享时，取消也会成功
-                activity.loadJs(String.format(Locale.CHINA, "callback(\"onResult\", %s)", share_media.getName()));
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA share_media, Throwable throwable) {
-                //分享出错
-                String msg = throwable.getMessage();
-                G.showToast(msg != null && msg.contains("没有安装应用") ? "没有安装应用" : msg);
-                activity.loadJs(String.format(Locale.CHINA, "callback(\"onError\", %s)", share_media.getName()));
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA share_media) {
-                //取消分享 微信分享时，没有取消
-                activity.loadJs(String.format(Locale.CHINA, "callback(\"onCancel\", %s)", share_media.getName()));
-            }
-        });
+        new ShareLinkConfig().setLink(link).setIconUrl(iconUrl).setTitle(title).setDes(des).setShareType(shareType).toShare(activity);
     }
 
     @JavascriptInterface

app/src/main/java/com/sheep/gamegroup/util/share/CommonUMShareListener.java

@@ -6,7 +6,7 @@ import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 
 /**
- * Created by realicing on 2018/11/23.
+ * Created by realicing on 2018/12/6.
  * realicing@sina.com
  */
 public class CommonUMShareListener implements UMShareListener {

app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java

@@ -29,6 +29,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.PictureInvitationEntity;
@@ -68,7 +69,7 @@ import static com.sheep.gamegroup.util.ViewUtil.getNetImgByName;
  * Created by realicing on 2018/9/7.
  * realicing@sina.com
  */
-public class ActInvitation extends BaseActivity {
+public class ActInvitation extends BaseUMActivity {
     @BindView(R.id.ask_share_list)
     RecyclerView ask_share_list;
     @BindView(R.id.img_baseactivity_title)

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayVideoArticle.java

@@ -15,13 +15,12 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.ImageView;
-import android.widget.MediaController;
 import android.widget.TextView;
 import android.widget.VideoView;
 
-import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.absBase.IRefresh;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DiscoveryVideo;
@@ -33,7 +32,6 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.util.share.CommonUMShareListener;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.view.fragment.FgtArticleVideo;
 import com.sheep.jiuyan.samllsheep.R;
@@ -50,7 +48,7 @@ import io.reactivex.schedulers.Schedulers;
  * realicing@sina.com
  * 小绵羊3.4.5新增 -- 视频详情
  */
-public class ActPlayVideoArticle extends BaseActivity implements MediaPlayer.OnInfoListener, MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener, View.OnLayoutChangeListener {
+public class ActVideoDetail extends BaseUMActivity implements MediaPlayer.OnInfoListener, MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener, View.OnLayoutChangeListener {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -88,7 +86,7 @@ public class ActPlayVideoArticle extends BaseActivity implements MediaPlayer.OnI
 
     @Override
     protected int getLayoutId() {
-        return R.layout.act_play_video_article;
+        return R.layout.act_video_detail;
     }
 
     private int video_id;
@@ -189,12 +187,11 @@ public class ActPlayVideoArticle extends BaseActivity implements MediaPlayer.OnI
         if (newVideo != null) {
             shareLinkConfig.setDes(newVideo.getTitle());
         }
-        shareLinkConfig.setShareType(ShareLinkConfig.ALL).toShare(this, new CommonUMShareListener() {
-            @Override
-            public void onResult(SHARE_MEDIA share_media) {
-                ApiUtil.postVideoShare(video_id);
-            }
-        });
+        shareLinkConfig.setShareType(ShareLinkConfig.ALL).toShare(this);
+    }
+    @Override
+    public void onResult(SHARE_MEDIA share_media) {
+        ApiUtil.postVideoShare(video_id);
     }
 
     //点击头像跳转用户游戏主页
@@ -383,8 +380,8 @@ public class ActPlayVideoArticle extends BaseActivity implements MediaPlayer.OnI
                                 float distanceX, float distanceY) {
             float mOldX = e1.getX(), mOldY = e1.getY();
             int y = (int) e2.getRawY();
-            int windowWidth = ActPlayVideoArticle.this.windowWidth;
-            int windowHeight = ActPlayVideoArticle.this.windowHeight;
+            int windowWidth = ActVideoDetail.this.windowWidth;
+            int windowHeight = ActVideoDetail.this.windowHeight;
             int lineMiddle = windowWidth / 2;
             if (mOldX > lineMiddle)// 左边滑动
                 onBrightnessSlide((mOldY - y) / windowHeight);

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -11,6 +11,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
+import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Lp;
 import com.sheep.gamegroup.model.entity.PunchAndSign;
@@ -54,7 +55,7 @@ import rx.functions.Action1;
  * Created date: 2018/10/31.
  * Description: 签到
  */
-public class SignActivity extends BaseActivity implements UMShareListener {
+public class SignActivity extends BaseUMActivity {
 
     @BindView(R.id.eggs_view)
     EggView eggsView;