From f219a0c1d96e6a2befc94f4114df61c6c66aa17a Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Wed, 16 Dec 2020 10:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=99=E9=A1=B5?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=86=99linkedme=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 71 +++++++++----------
 .../com/yizhuan/erban/MiddleActivity.java     |  3 +
 .../login/fragment/AddUserInfoFragment.java   | 14 ++--
 .../linked/bean/LinkedInfo.java               |  1 +
 4 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25e8998e2..26b673ec8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -481,6 +481,41 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!-- URI Scheme方式 在dashboard配置中,请保持与ios的URI Scheme相同 -->
+            <!--
+            如果程序已存在与此完全相同的data配置,即只包含scheme并且值完全相同,
+            则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
+            参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
+            -->
+            <intent-filter>
+
+                <!-- 此处scheme值需要替换为后台设置中的scheme值 -->
+                <data
+                    android:host="linkedme"
+                    android:scheme="accompanyapp" />
+
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+
+            <!-- APP Links方式,Android 23版本及以后支持 -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- 以下pathPrefix值需要替换为后台设置中 App ID 的值 -->
+                <data
+                    android:host="lkme.cc"
+                    android:pathPrefix="/7BE"
+                    android:scheme="https" />
+                <data
+                    android:host="lkme.cc"
+                    android:pathPrefix="/7BE"
+                    android:scheme="http" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ui.login.LoginActivity"
@@ -539,42 +574,6 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden">
-
-            <!-- URI Scheme方式 在dashboard配置中,请保持与ios的URI Scheme相同 -->
-            <!--
-            如果程序已存在与此完全相同的data配置,即只包含scheme并且值完全相同,
-            则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
-            参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
-            -->
-            <intent-filter>
-
-                <!-- 此处scheme值需要替换为后台设置中的scheme值 -->
-                <data
-                    android:host="linkedme"
-                    android:scheme="accompanyapp" />
-
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-
-            <!-- APP Links方式,Android 23版本及以后支持 -->
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <!-- 以下pathPrefix值需要替换为后台设置中 App ID 的值 -->
-                <data
-                    android:host="lkme.cc"
-                    android:pathPrefix="/7BE"
-                    android:scheme="https" />
-                <data
-                    android:host="lkme.cc"
-                    android:pathPrefix="/7BE"
-                    android:scheme="http" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".ui.keepalive.OnePiexlActivity"
diff --git a/app/src/main/java/com/yizhuan/erban/MiddleActivity.java b/app/src/main/java/com/yizhuan/erban/MiddleActivity.java
index 46632be56..d909e506f 100644
--- a/app/src/main/java/com/yizhuan/erban/MiddleActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/MiddleActivity.java
@@ -47,6 +47,7 @@ public class MiddleActivity extends BaseActivity {
                 String url = hashMap.get("url");
                 String worldId = hashMap.get("worldId");
                 String dynamicId = hashMap.get("dynamicId");
+                String inviteCode = hashMap.get("inviteCode");
                 if (roomuid != null) {
                     linkedInfo.setRoomUid(roomuid);
                 }
@@ -68,6 +69,8 @@ public class MiddleActivity extends BaseActivity {
                 if (dynamicId != null) {
                     linkedInfo.setDynamicId(dynamicId);
                 }
+
+                linkedInfo.setInviteCode(inviteCode);
                 //发送 log 到阿里
                 StatisticManager.Instance().sendAliyunLog(LogFactory.create(
                         LogProtocol.LogLevel.LEVEL_VERBOSE,
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
index e06fb923b..4664b3b28 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
@@ -43,7 +43,7 @@ public class AddUserInfoFragment extends BaseFragment
         TimePickerDialog.OnTimeSetListener {
 
     private static final String TAG = "AddUserInfoFragment";
-    private TextInputEditText tvNick,tvCode;
+    private TextInputEditText tvNick, tvCode;
     private Button okBtn;
     private ImageView tvRandomNick;
     private int gender = -1;
@@ -89,12 +89,18 @@ public class AddUserInfoFragment extends BaseFragment
                 rgGender.check(gender == UserInfo.GENDER_MALE ? R.id.rb_male : R.id.rb_female);
                 tvNick.setText(thirdUserInfo.getUserName());
             }
-        }else {
+        } else {
             // 设置默认昵称
             setRandomNick();
         }
         tvNick.setFilters(new InputFilter[]{new InputFilter.LengthFilter(8)});
         rgGender.setOnCheckedChangeListener((radioGroup, i) -> gender = i == rbMale.getId() ? UserInfo.GENDER_MALE : UserInfo.GENDER_FEMALE);
+
+        //如果有邀请码的话,自动填写
+        LinkedInfo linkedInfo = LinkedModel.get().getLinkedInfo();
+        if (linkedInfo != null && !TextUtils.isEmpty(linkedInfo.getInviteCode())) {
+            tvCode.setText(linkedInfo.getInviteCode());
+        }
     }
 
     @Override
@@ -109,7 +115,7 @@ public class AddUserInfoFragment extends BaseFragment
                     toast("必须要选性别哦");
                     return;
                 }
-                commit(tvNick.getText().toString().trim(), avatarUrl, gender,tvCode.getText()==null?"":tvCode.getText().toString().trim());
+                commit(tvNick.getText().toString().trim(), avatarUrl, gender, tvCode.getText() == null ? "" : tvCode.getText().toString().trim());
                 break;
             case R.id.tv_random_nick:
                 StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_NAME,
@@ -143,7 +149,7 @@ public class AddUserInfoFragment extends BaseFragment
                 });
     }
 
-    private void commit(String nick, String avatarUrl, int gender,String shareCode) {
+    private void commit(String nick, String avatarUrl, int gender, String shareCode) {
         UserInfo userInfo = new UserInfo();
         userInfo.setUid(AuthModel.get().getCurrentUid());
         userInfo.setNick(nick);
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java
index 6387f706a..cc84ec6b2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java
@@ -20,5 +20,6 @@ public class LinkedInfo {
     private String url;
     private String worldId;// 话题ID
     private String dynamicId; //动态id
+    private String inviteCode;
 
 }