diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d2990e366..f0a621286 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,9 +31,9 @@
         tools:node="remove" />
 
     <queries>
-        <package android:name="com.facebook.katana"/>
-        <package android:name="jp.naver.line.android"/>
-        <package android:name="com.android.vending"/>
+        <package android:name="com.facebook.katana" />
+        <package android:name="jp.naver.line.android" />
+        <package android:name="com.android.vending" />
     </queries>
 
     <!-- 云信权限声明 -->
@@ -274,6 +274,7 @@
                     android:scheme="pekoapp" />
 
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
@@ -1058,6 +1059,10 @@
             android:name=".shipantics.RadishRankingActivity"
             android:theme="@style/room_message_activity" />
 
+        <activity
+            android:name=".AgentActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/yizhuan/erban/AgentActivity.java b/app/src/main/java/com/yizhuan/erban/AgentActivity.java
index 540f111b8..86d766a79 100644
--- a/app/src/main/java/com/yizhuan/erban/AgentActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/AgentActivity.java
@@ -15,6 +15,7 @@ import com.yizhuan.erban.other.activity.SplashActivity;
 import com.yizhuan.xchat_android_core.linked.LinkedModel;
 import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
 import com.yizhuan.xchat_android_core.user.UserModel;
+import com.yizhuan.xchat_android_core.utils.TextUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -39,7 +40,7 @@ public class AgentActivity extends AppCompatActivity implements SceneRestorable
             LinkedInfo linkedInfo = new LinkedInfo();
             String roomuid = (String) hashMap.get("roomuid");
             String uid = (String) hashMap.get("uid");
-            String type = (String) hashMap.get("type");
+            String type = String.valueOf(hashMap.get("type"));
             String familyId = (String) hashMap.get("familyId");
             String url = (String) hashMap.get("url");
             String worldId = (String) hashMap.get("worldId");
@@ -48,12 +49,13 @@ public class AgentActivity extends AppCompatActivity implements SceneRestorable
             if (roomuid != null) {
                 linkedInfo.setRoomUid(roomuid);
             }
+            if (TextUtils.isEmptyText(roomuid) && uid != null) {
+                linkedInfo.setRoomUid(uid);
+            }
             if (uid != null) {
                 linkedInfo.setUid(uid);
             }
-            if (type != null) {
-                linkedInfo.setType(type);
-            }
+            linkedInfo.setType(type);
             if (familyId != null) {
                 linkedInfo.setFamilyId(familyId);
             }
diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java
index 0997f4623..75f16c348 100644
--- a/app/src/main/java/com/yizhuan/erban/MainActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java
@@ -188,6 +188,36 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         context.startActivity(intent);
     }
 
+    /**
+     * @return true 如果处理了跳转
+     */
+    public static boolean handleLinkedJump(Context context) {
+        LinkedInfo linkedInfo = LinkedModel.get().getLinkedInfo();
+        LinkedModel.get().setLinkedInfo(null);
+
+        if (linkedInfo == null || linkedInfo.getType() == null || linkedInfo.getType() .equals("null") ) {
+            return false;
+        }
+        LogUtil.print(ResUtil.getString(R.string.yizhuan_erban_mainactivity_01));
+        // 跳转
+        if (!StringUtil.isEmpty(linkedInfo.getRoomUid()) && linkedInfo.getType().equals("2")) {
+            AVRoomActivity.start(context, Long.parseLong(linkedInfo.getRoomUid()));
+        } else if (!StringUtil.isEmpty(linkedInfo.getFamilyId()) && linkedInfo.getType().equals("4")) {
+            FamilyHomeActivity.start(context, linkedInfo.getFamilyId());
+        } else if (!TextUtils.isEmpty(linkedInfo.getUrl()) && linkedInfo.getType().equals("3")) {
+            CommonWebViewActivity.start(context, UriProvider.getLinkUrl(linkedInfo.getUrl()));
+        } else if (!TextUtils.isEmpty(linkedInfo.getWorldId()) && linkedInfo.getType().equals("5")) {
+            MiniWorldGuestPageActivity.start(context, linkedInfo.getWorldId());
+        } else if (linkedInfo.getType().equals("6") && !TextUtils.isEmpty(linkedInfo.getWorldId()) &&
+                !TextUtils.isEmpty(linkedInfo.getDynamicId())) {
+            DynamicDetailActivity.start(context, JavaUtil.str2long(linkedInfo.getDynamicId()),
+                    JavaUtil.str2long(linkedInfo.getWorldId()), 6);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -499,7 +529,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         LoginActivity.start(MainActivity.this);
     }
 
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onKickedOutEvent(KickOutEvent event) {
         toast(getString(R.string.you_have_been_kicked_offline));
@@ -649,7 +678,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         checkShowAnchorCardView();
     }
 
-
     @SuppressLint("CheckResult")
     private void checkProtocolUpdate() {
         UserModel.get()
@@ -761,37 +789,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         return false;
     }
 
-    /**
-     * @return true 如果处理了跳转
-     */
-    public static boolean handleLinkedJump(Context context) {
-        LinkedInfo linkedInfo = LinkedModel.get().getLinkedInfo();
-        LinkedModel.get().setLinkedInfo(null);
-
-        if (linkedInfo == null || linkedInfo.getType() == null) {
-            return false;
-        }
-        LogUtil.print(ResUtil.getString(R.string.yizhuan_erban_mainactivity_01));
-        // 跳转
-        if (!StringUtil.isEmpty(linkedInfo.getRoomUid()) && linkedInfo.getType().equals("2")) {
-            AVRoomActivity.start(context, Long.parseLong(linkedInfo.getRoomUid()));
-        } else if (!StringUtil.isEmpty(linkedInfo.getFamilyId()) && linkedInfo.getType().equals("4")) {
-            FamilyHomeActivity.start(context, linkedInfo.getFamilyId());
-        } else if (!TextUtils.isEmpty(linkedInfo.getUrl()) && linkedInfo.getType().equals("3")) {
-            CommonWebViewActivity.start(context, UriProvider.getLinkUrl(linkedInfo.getUrl()));
-        } else if (!TextUtils.isEmpty(linkedInfo.getWorldId()) && linkedInfo.getType().equals("5")) {
-            MiniWorldGuestPageActivity.start(context, linkedInfo.getWorldId());
-        } else if (linkedInfo.getType().equals("6") && !TextUtils.isEmpty(linkedInfo.getWorldId()) &&
-                !TextUtils.isEmpty(linkedInfo.getDynamicId())) {
-            DynamicDetailActivity.start(context, JavaUtil.str2long(linkedInfo.getDynamicId()),
-                    JavaUtil.str2long(linkedInfo.getWorldId()), 6);
-        } else {
-            return false;
-        }
-        return true;
-    }
-
-
     public LimitEnterRoomHelper getLimitEnterRoomHelper() {
         if (limitEnterRoomHelper == null) {
             limitEnterRoomHelper = new LimitEnterRoomHelper();