1.开发者app兼容最新的Vid 2.修改开发者app架构 mvc --> mvpeoOS SDK

Author: videopls

VideoOS/videoos_dev_app/build.gradle

@@ -1,27 +1,5 @@
 apply plugin: 'com.android.application'
 
-def keystoreFilepath = ''
-def keystorePSW = ''
-def keystoreAlias = ''
-def keystoreAliasPSW = ''
-
-Properties properties = new Properties()
-properties.load(project.rootProject.file('key.properties').newDataInputStream())
-keystoreFilepath = properties.getProperty("keystore.path")
-
-if (keystoreFilepath) {
-    keystorePSW = properties.getProperty("keystore.password")
-    keystoreAlias = properties.getProperty("keystore.alias")
-    keystoreAliasPSW = properties.getProperty("keystore.alias_password")
-} else {
-    keystoreFilepath = "${System.properties['user.home']}/.android/debug.keystore"
-    println("No release keystore found. Using default at [$keystoreFilepath]")
-    keystorePSW = 'android'
-    keystoreAlias = 'androiddebugkey'
-    keystoreAliasPSW = 'android'
-}
-
-
 configurations.all {
     resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
@@ -32,7 +10,7 @@ android {
     defaultConfig {
         applicationId "both.video.venvy.com.appdemodev"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0.0"
         javaCompileOptions {
@@ -46,28 +24,23 @@ android {
             targetCompatibility JavaVersion.VERSION_1_7
         }
     }
-
-    signingConfigs {
-        release {
-            storeFile file(keystoreFilepath)
-            storePassword keystorePSW
-            keyAlias keystoreAlias
-            keyPassword keystoreAliasPSW
-        }
-    }
-
-
     buildTypes {
         debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
+            //是否混淆
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+
+        preRelease {
+            //是否混淆
             minifyEnabled true
-            zipAlignEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
         }
     }
 
@@ -107,6 +80,7 @@ dependencies {
     compile 'com.squareup.okhttp3:okhttp:3.4.1'
     compile 'com.squareup.okio:okio:1.12.0'
     compile 'com.just.agentweb:agentweb:4.1.2'
+    compile 'com.alibaba:fastjson:1.1.70.android'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.6.2'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'

VideoOS/videoos_dev_app/proguard-rules.pro

@@ -24,166 +24,16 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--optimizationpasses 5
-
-# 混合时不使用大小写混合，混合后的类名为小写
--dontusemixedcaseclassnames
-
-# 指定不去忽略非公共库的类
--dontskipnonpubliclibraryclasses
-
-# 不做预校验，preverify是proguard的四个步骤之一，Android不需要preverify，去掉这一步能够加快混淆速度。
--dontpreverify
-
-# 保留Annotation不混淆
--keepattributes *Annotation*,Exceptions
-#javascriript与webview交互
--keepattributes *JavascriptInterface*
-
-# 避免混淆泛型
--keepattributes Signature
-
-#-keepattributes InnerClasses
-
-# 抛出异常时保留代码行号
--keepattributes SourceFile,LineNumberTable
-
--keepattributes EnclosingMethod
-
-# 指定混淆是采用的算法，后面的参数是一个过滤器
-# 这个过滤器是谷歌推荐的算法，一般不做更改
--optimizations !code/simplification/cast,!field/*,!class/merging/*
-
-# 保留我们使用的四大组件，自定义的Application等等这些类不被混淆
-# 因为这些子类都有可能被外部调用
--keep public class * extends android.support.v7.app.AppCompatActivity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.app.Fragment
--keep public class * extends android.support.v4.app.Fragment
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class * extends android.view.View
--keep public class com.android.vending.licensing.ILicensingService
-
-# 保留support下的所有类及其内部类
--keep class android.support.** {*;}
-
-# 保留继承的
--keep public class * extends android.support.v4.**
--keep public class * extends android.support.v7.**
--keep public class * extends android.support.annotation.**
-
-# 保留枚举类不被混淆
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
-# 保留我们自定义控件（继承自View）不被混淆
--keep public class * extends android.view.View{
-    *** get*();
-    void set*(***);
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
-# 保留Parcelable序列化类不被混淆
--keep class * implements android.os.Parcelable {
-    public static final android.os.Parcelable$Creator *;
-}
-
-# 保留Serializable序列化的类不被混淆
--keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-    private static final java.io.ObjectStreamField[] serialPersistentFields;
-    !static !transient <fields>;
-    !private <fields>;
-    !private <methods>;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object writeReplace();
-    java.lang.Object readResolve();
-}
-
-
-# webView处理，项目中没有使用到webView忽略即可
--keepclassmembers class cn.com.venvy.video.huoxbao.webview.InviteBridge {
-    public *;
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keep class com.bumptech.glide.**{*;}
--dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
-
--keep class com.alibaba.fastjson.** { *; }
-
-
--keep class org.apache.http.** { *; }
--dontwarn org.apache.http.**
--keep class android.net.http.** { *; }
--dontwarn android.net.http.**
-
-### okhttp
-### see https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro
--dontwarn javax.annotation.**
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
--dontwarn org.codehaus.mojo.animal_sniffer.*
--dontwarn okhttp3.internal.platform.ConscryptPlatform
-
-
-
--keep class com.chad.library.adapter.** {
-*;
-}
--keep public class * extends com.chad.library.adapter.base.BaseQuickAdapter
--keep public class * extends com.chad.library.adapter.base.BaseViewHolder
--keepclassmembers  class **$** extends com.chad.library.adapter.base.BaseViewHolder {
-     <init>(...);
-}
-
-
+-ignorewarnings
 #videojj
 -keep public class cn.com.venvy.processor.build.venvy_pub$$VenvyRoleMapUtil{ *; }
 -keep class cn.com.venvy.lua.** {
      <fields>;
      <methods>;
 }
-
-
-# videojj
--keep class cn.com.venvy.** {
-   <fields>;
-   <methods>;
-}
--keep class com.taobao.luaview.** {
-   <fields>;
-   <methods>;
-}
--keep class org.luaj.vm2.** {
-   <fields>;
-   <methods>;
-}
 -keep class cn.com.videopls.** {
-   *;
-}
--dontwarn cn.com.videopls.**
-
-# Mqtt
--keep class org.eclipse.paho.client.mqttv3.** {
-   <fields>;
-   <methods>;
+    <fields>;
+    <methods>;
 }
 
 #gsyPlayer
@@ -202,10 +52,4 @@
     public <init>(android.content.Context);
     public <init>(android.content.Context, android.util.AttributeSet);
     public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keep class com.just.agentweb.** {
-    *;
-}
--dontwarn com.just.agentweb.**
--keepclassmembers class com.just.agentweb.sample.common.AndroidInterface{ *; }
+}

VideoOS/videoos_dev_app/src/main/assets/blocal/dev_config.json

@@ -1,13 +1,15 @@
 {
-  "miniAppId":"123456",
   "display":{
     "navTitle":"开发模式测试"
   },
   "h5Url":"",
-  "luaList":[
-    {
-      "url":"os_video_test_hotspot.lua"
-    }
-  ],
-  "template":"os_video_test_hotspot.lua"
+  "miniAppInfo":{
+    "miniAppId":"123456",
+    "template":"os_video_test_hotspot.lua",
+    "luaList":[
+      {
+        "url":"os_video_test_hotspot.lua"
+      }
+    ]
+  }
 }

VideoOS/videoos_dev_app/src/main/assets/common/luaConfig.json

@@ -0,0 +1,18 @@
+{
+    "creativeId":686,
+    "data":{
+    },
+    "deviceType":3,
+    "duration":30000,
+    "hotspotOrder":0,
+    "id":"8dc95f91-7c98-477b-a8fa-9586999ff228",
+    "launchPlanId":"34520",
+    "miniAppInfo":{
+        "miniAppId":""
+    },
+    "sumHotspot":1,
+    "template":"",
+    "videoEndTime":35000,
+    "videoStartTime":5000
+}
+

VideoOS/videoos_dev_app/src/main/java/both/video/venvy/com/appdemo/MyApp.java

@@ -33,7 +33,7 @@ public void onCreate() {
         appContext = this;
 
         //测试环境
-        DebugStatus.changeEnvironmentStatus(DebugStatus.EnvironmentStatus.RELEASE);
+        DebugStatus.changeEnvironmentStatus(DebugStatus.EnvironmentStatus.DEV);
         VenvyLog.needLog = true;
         VideoPlus.appCreateSAAS(MyApp.this, ConfigUtil.getAppKey(), ConfigUtil.getAppSecret());
     }

VideoOS/videoos_dev_app/src/main/java/both/video/venvy/com/appdemo/activity/BasePlayerActivity.java

@@ -140,7 +140,9 @@ protected void startDefaultVideo(String videoId, String videoUrl) {
             }else{
                 videoName = FileUtil.getFileName(ConfigUtil.getVideoName());
             }
-            mVideoPlayer.setUp(TextUtils.isEmpty(videoUrl) ? ConfigUtil.getVideoName() : videoUrl, true, videoName);
+            String url = TextUtils.isEmpty(videoUrl) ? ConfigUtil.getVideoName() : videoUrl;
+            mVideoPlayer.setUp(url,true, videoName);
+            mVideoPlayer.setPlayTag(url);
         }
         mVideoPlusView.start();
         // 开启前贴

VideoOS/videoos_dev_app/src/main/java/both/video/venvy/com/appdemo/activity/ConfigActivity.java

@@ -41,8 +41,8 @@ private void initView() {
             appKeyView.setText(ConfigUtil.getAppKey());
             appSecretView.setText(ConfigUtil.getAppSecret());
         }
-//        appKeyView.setText("dc8b6c9b-a592-4100-a532-9886ffce7dce");
-//        appSecretView.setText("0b511c09045c4876");
+//        appKeyView.setText("9085f724-5490-4331-9f3e-ae492e97f167");
+//        appSecretView.setText("f57716f935b94378");
     }