Merge pull request iqiyi#13 from iqiyi/fixPublishEvent

mainly fixed a publish event bug and remove some useless code

Author: HiWong

Andromeda-Lib/src/main/java/org/qiyi/video/svg/fragment/RemoteManagerFragment.java

@@ -1,27 +1,27 @@
 /*
-* Copyright (c) 2018-present, iQIYI, Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-*        1. Redistributions of source code must retain the above copyright notice,
-*        this list of conditions and the following disclaimer.
-*
-*        2. Redistributions in binary form must reproduce the above copyright notice,
-*        this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-*
-*        3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
-*
-*        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-*        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-*        IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-*        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-*        OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-*        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-*        EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
+ * Copyright (c) 2018-present, iQIYI, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *        1. Redistributions of source code must retain the above copyright notice,
+ *        this list of conditions and the following disclaimer.
+ *
+ *        2. Redistributions in binary form must reproduce the above copyright notice,
+ *        this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ *        3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived
+ *        from this software without specific prior written permission.
+ *
+ *        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *        IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ *        OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *        EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
 package org.qiyi.video.svg.fragment;
 
 import android.annotation.SuppressLint;
@@ -34,7 +34,6 @@
 import org.qiyi.video.svg.life.ActivityFragLifecycle;
 import org.qiyi.video.svg.log.Logger;
 import org.qiyi.video.svg.remote.IRemoteManager;
-import org.qiyi.video.svg.remote.IRemoteManagerTreeNode;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -56,8 +55,6 @@ public class RemoteManagerFragment extends Fragment {
 
     private final Set<RemoteManagerFragment> childRemoteManagerFrags = new HashSet<>();
 
-    private final FragmentRemoteManagerTreeNode remoteManagerTreeNode = new FragmentRemoteManagerTreeNode();
-
     public RemoteManagerFragment() {
         this(new ActivityFragLifecycle());
     }
@@ -192,28 +189,10 @@ private Fragment getParentFragmentUsingHint() {
         return fragment != null ? fragment : parentFragmentHint;
     }
 
-    private class FragmentRemoteManagerTreeNode implements IRemoteManagerTreeNode {
-        @Override
-        public Set<IRemoteManager> getDescendants() {
-            Set<RemoteManagerFragment> descendantFragments = getDescendantRemoteManagerFragments();
-            Set<IRemoteManager> descendants = new HashSet<>(descendantFragments.size());
-            for (RemoteManagerFragment fragment : descendantFragments) {
-                if (fragment.getRemoteManager() != null) {
-                    descendants.add(fragment.getRemoteManager());
-                }
-            }
-            return descendants;
-        }
-    }
-
     public ActivityFragLifecycle getLifecycle() {
         return lifecycle;
     }
 
-    public FragmentRemoteManagerTreeNode getRemoteManagerTreeNode() {
-        return remoteManagerTreeNode;
-    }
-
     public void setRemoteManager(IRemoteManager remoteManager) {
         this.remoteManager = remoteManager;
     }

Andromeda-Lib/src/main/java/org/qiyi/video/svg/fragment/SupportRemoteManagerFragment.java

@@ -1,27 +1,27 @@
 /*
-* Copyright (c) 2018-present, iQIYI, Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-*        1. Redistributions of source code must retain the above copyright notice,
-*        this list of conditions and the following disclaimer.
-*
-*        2. Redistributions in binary form must reproduce the above copyright notice,
-*        this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-*
-*        3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
-*
-*        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-*        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-*        IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-*        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-*        OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-*        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-*        EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
+ * Copyright (c) 2018-present, iQIYI, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *        1. Redistributions of source code must retain the above copyright notice,
+ *        this list of conditions and the following disclaimer.
+ *
+ *        2. Redistributions in binary form must reproduce the above copyright notice,
+ *        this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ *        3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived
+ *        from this software without specific prior written permission.
+ *
+ *        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *        IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ *        OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *        EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
 package org.qiyi.video.svg.fragment;
 
 import android.annotation.SuppressLint;
@@ -33,7 +33,6 @@
 import org.qiyi.video.svg.life.ActivityFragLifecycle;
 import org.qiyi.video.svg.log.Logger;
 import org.qiyi.video.svg.remote.IRemoteManager;
-import org.qiyi.video.svg.remote.IRemoteManagerTreeNode;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -55,8 +54,6 @@ public class SupportRemoteManagerFragment extends Fragment {
 
     private final Set<SupportRemoteManagerFragment> childRemoteManagerFrags = new HashSet<>();
 
-    private final IRemoteManagerTreeNode remoteManagerTreeNode = new SupportFragTreeNode();
-
     public SupportRemoteManagerFragment() {
         this(new ActivityFragLifecycle());
     }
@@ -186,22 +183,4 @@ public void setRemoteManager(IRemoteManager remoteManager) {
         this.remoteManager = remoteManager;
     }
 
-    public IRemoteManagerTreeNode getRemoteManagerTreeNode() {
-        return remoteManagerTreeNode;
-    }
-
-    private class SupportFragTreeNode implements IRemoteManagerTreeNode {
-        @Override
-        public Set<IRemoteManager> getDescendants() {
-            Set<SupportRemoteManagerFragment> descendantFrags = getDescendantRequestManagerFrags();
-            Set<IRemoteManager> descendants = new HashSet<>(descendantFrags.size());
-            for (SupportRemoteManagerFragment fragment : descendantFrags) {
-                if (fragment.getRemoteManager() != null) {
-                    descendants.add(fragment.getRemoteManager());
-                }
-            }
-            return descendants;
-        }
-    }
-
 }

Andromeda-Lib/src/main/java/org/qiyi/video/svg/remote/EmptyRemoteManagerTreeNode.java

@@ -1,27 +1,27 @@
 /*
-* Copyright (c) 2018-present, iQIYI, Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-*        1. Redistributions of source code must retain the above copyright notice,
-*        this list of conditions and the following disclaimer.
-*
-*        2. Redistributions in binary form must reproduce the above copyright notice,
-*        this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-*
-*        3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
-*
-*        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-*        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-*        IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-*        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-*        OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-*        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-*        EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
+ * Copyright (c) 2018-present, iQIYI, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *        1. Redistributions of source code must retain the above copyright notice,
+ *        this list of conditions and the following disclaimer.
+ *
+ *        2. Redistributions in binary form must reproduce the above copyright notice,
+ *        this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ *        3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived
+ *        from this software without specific prior written permission.
+ *
+ *        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *        IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ *        OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *        EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
 package org.qiyi.video.svg.remote;
 
 import android.content.Context;
@@ -47,18 +47,16 @@
 public class RemoteManager implements IRemoteManager, LifecycleListener {
 
     private Lifecycle lifecycle;
-    private IRemoteManagerTreeNode treeNode;
 
     private Handler handler = new Handler(Looper.getMainLooper());
 
     private Context appContext;
 
     private Set<String> commuStubServiceNames = new HashSet<>();
 
-    public RemoteManager(Context context, final Lifecycle lifecycle, IRemoteManagerTreeNode treeNode) {
+    public RemoteManager(Context context, final Lifecycle lifecycle) {
         this.appContext = context;
         this.lifecycle = lifecycle;
-        this.treeNode = treeNode;
 
         if (Utils.isOnBackgroundThread()) {
             handler.post(new Runnable() {
@@ -88,6 +86,10 @@ public synchronized IBinder getRemoteService(String serviceCanonicalName) {
             return null;
         }
         BinderBean binderBean = RemoteTransfer.getInstance().getRemoteServiceBean(serviceCanonicalName);
+        if (binderBean == null) {
+            Logger.e("Found no binder for "+serviceCanonicalName+"! Please check you have register implementation for it or proguard reasons!");
+            return null;
+        }
         String commuStubServiceName = ConnectionManager.getInstance().bindAction(appContext, binderBean.getProcessName());
         commuStubServiceNames.add(commuStubServiceName);
         return binderBean.getBinder();