rc

modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java

@@ -18,7 +18,6 @@ public class HostConst {
     public static final String STRATEGY_PUSH_HOST = "http://dzt-strategyPush.zhidaozhixing.com";
     public static final String TRAVEL_CONDITION_HOST = "http://dzt-travelCondition.zhidaozhixing.com";
     public static final String TMC_HOST = "http://dzt-tmcServer.zhidaozhixing.com";
-
     public static final String IM_SOCKET_DOMAIN = "dzt-im.zhidaozhixing.com";
     public static final String WEBSOCKET_DOMAIN = "dzt-Instant.zhidaozhixing.com";
 

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -385,7 +385,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             mUploadRoadCondition.setVisibility(View.VISIBLE);
             groupUserHead.setVisibility(View.VISIBLE);
             if(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isSeekHelping()) {
-                seekHelpGroup.setVisibility( View.VISIBLE );
+                seekHelpGroup.setVisibility(View.VISIBLE);
             }
 //        mWeatherContainer.setVisibility(View.VISIBLE);
 //        mMsgContainer.setVisibility(View.VISIBLE);

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java

@@ -83,6 +83,9 @@ public class TopViewAnimHelper {
         cameraMode = rootView.findViewById(R.id.module_ext_id_north);
         // 初始化默认隐藏导航
         hideNaviView();
+
+        showStickView();
+
     }
 
     private volatile boolean isTopViewOut = true;
@@ -185,10 +188,32 @@ public class TopViewAnimHelper {
         }).start();
     }
 
+    private final List<MotionViewCache> stickViewCache = new ArrayList<>();
+
+    private void showStickView() {
+        if (stickViewCache.isEmpty()) {
+            return;
+        } else if (stickViewCache.size() == 1) {
+            MotionViewCache stickView = stickViewCache.remove(0);
+            startTopInAnim(stickView.view, stickView.params, stickView.statusListener);
+            return;
+        }
+        for (int i = 0; i < stickViewCache.size() - 2; i++) {
+            MotionViewCache stickView = stickViewCache.get(i);
+            stickView.statusListener.beforeViewRemoveAnim(stickView.view);
+            stickView.statusListener.onViewRemoved(stickView.view);
+        }
+        MotionViewCache stickView = stickViewCache.get(stickViewCache.size() - 1);
+        stickViewCache.clear();
+        startTopInAnim(stickView.view, stickView.params, stickView.statusListener);
+    }
+
     public void startTopInAnim(View view, ViewGroup.LayoutParams params,
                                IMogoTopViewStatusListener statusListener) {
 
         if (topMotionLayout == null) {
+            // 增加黏性事件
+            stickViewCache.add(new MotionViewCache(view, params, statusListener));
             return;
         }
 
@@ -442,6 +467,8 @@ public class TopViewAnimHelper {
 
     /**
      * 用于和{@link TopViewNoLinkageAnimHelper}互斥显示
+     *
+     * 网约车新增与网约车界面互斥
      */
     public void removeAllViewExceptVrNav() {
         Logger.d(TAG, "remove all view except vr nav");

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java

@@ -141,4 +141,14 @@ public class TopViewManager implements IMogoTopViewManager {
             return false;
         }
     }
+
+    @Override
+    public void removeAllViewInVrMode() {
+        try {
+            TopViewAnimHelper.getInstance().removeAllViewExceptVrNav();
+            TopViewNoLinkageAnimHelper.getInstance().removeAllView();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }