zengjiebin лет назад: 7
Родитель
Сommit
a5647bac5f

+ 0 - 9
app/src/main/AndroidManifest.xml

@@ -923,15 +923,6 @@
             android:name="com.sheep.gamegroup.module.user.activity.ActVip"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme"/>
-        <!-- media界面 -->
-        <activity android:name="com.kfzs.cfyl.media.activity.ActCutVideo"
-            android:theme="@style/media_AppTheme"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:screenOrientation="sensor"/>
-        <activity android:name="com.kfzs.cfyl.media.activity.ActEditVideo"
-            android:theme="@style/media_AppTheme"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:screenOrientation="sensor"/>
     </application>
 
 </manifest>

+ 2 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -267,7 +267,8 @@ public class SheepApp extends MultiDexApplication {
 //        RemitStoreOnSQLite.setRemitToDBDelayMillis(3000);
         //webView 缓存优化初始化 https://github.com/yale8848/CacheWebView
         WebViewCacheInterceptorInst.getInstance().init(new WebViewCacheInterceptor.Builder(this).setDebug(BuildConfig.DEBUG).setCacheSize(Long.MAX_VALUE));
-        MediaApp.initCgeLibrary(this);
+        boolean result = MediaApp.initCgeLibrary(this);
+
     }
 
     private void initBdLocationOption() {

+ 3 - 1
media/app/src/main/java/com/kfzs/cfyl/media/MediaApp.java

@@ -25,7 +25,7 @@ public class MediaApp extends Application {
         initCgeLibrary(this);
     }
 
-    public static void initCgeLibrary(final Context context) {
+    public static boolean initCgeLibrary(final Context context) {
         //The second param will be passed as the second arg of the callback function.
         //第二个参数根据自身需要设置, 将作为 loadImage 第二个参数回传
         CGENativeLibrary.LoadImageCallback mLoadImageCallback = new CGENativeLibrary.LoadImageCallback() {
@@ -63,7 +63,9 @@ public class MediaApp extends Application {
             CGENativeLibrary.setLoadImageCallback(mLoadImageCallback, null);
         } catch (Exception e){
             e.printStackTrace();
+            return false;
         }
+        return true;
     }
 
 }

+ 19 - 3
media/share_library/src/main/java/com/kfzs/cfyl/share_library/util/CallBackAPI.java

@@ -26,27 +26,43 @@ public class CallBackAPI {
         return instance;
     }
 
+    private boolean isVirtualapkLoadMedia = false;
+
     //剪切视频并选择主题
     public void goCutVideo(Activity activity, Video video, ArrayList<String> arrayList) {
         Intent intent = new Intent();
-        intent.setClassName("com.kfzs.cfyl.media", "com.kfzs.cfyl.media.activity.ActCutVideo");
+        if (isVirtualapkLoadMedia) {
+            intent.setClassName("com.kfzs.cfyl.media", "com.kfzs.cfyl.media.activity.ActCutVideo");
+        } else {
+            intent.setClassName(activity.getPackageName(), "com.kfzs.cfyl.media.activity.ActCutVideo");
+        }
         intent.putExtra(Integer.class.getSimpleName(), Constant.MEDIA_ACTION_CUT_VIDEO);
         intent.putExtra(String.class.getSimpleName(), JSONObject.toJSONString(video));
         intent.putExtra(ArrayList.class.getSimpleName(), arrayList);
         activity.startActivityForResult(intent, Constant.MEDIA_ACTION_CUT_VIDEO);
     }
+
     //编辑视频
     public void goEditVideo(Activity activity, Serializable data) {
         Intent intent = new Intent();
-        intent.setClassName("com.kfzs.cfyl.media", "com.kfzs.cfyl.media.activity.ActEditVideo");
+        if (isVirtualapkLoadMedia) {
+            intent.setClassName("com.kfzs.cfyl.media", "com.kfzs.cfyl.media.activity.ActEditVideo");
+        } else {
+            intent.setClassName(activity.getPackageName(), "com.kfzs.cfyl.media.activity.ActEditVideo");
+        }
         intent.putExtra(Integer.class.getSimpleName(), Constant.MEDIA_ACTION_EDIT_VIDEO);
         intent.putExtra(Video.class.getSimpleName(), data);
         activity.startActivityForResult(intent, Constant.MEDIA_ACTION_EDIT_VIDEO);
     }
+
     //编辑视频
     public void goAct(Activity activity, String act) {
         Intent intent = new Intent();
-        intent.setClassName("com.kfzs.cfyl.media", "com.kfzs.cfyl.media.activity."+act);
+        if (isVirtualapkLoadMedia) {
+            intent.setClassName("com.kfzs.cfyl.media", "com.kfzs.cfyl.media.activity." + act);
+        } else {
+            intent.setClassName(activity.getPackageName(), "com.kfzs.cfyl.media.activity." + act);
+        }
         activity.startActivityForResult(intent, Constant.MEDIA_ACTION_EDIT_VIDEO);
     }
 }