app/src/main/java/ai/pai/client/activity/MainActivity.java

@@ -298,12 +298,12 @@ public class MainActivity extends AppCompatActivity

                 
              

                             String urlInfo = data.getStringExtra("info");
              

                 
              

                -            if(!urlInfo.contains(UrlContainer.QR_GUIDE_APP_GROUP_URL) && !urlInfo.contains(UrlContainer.QR_APP_GROUP_URL) && !urlInfo.contains(UrlContainer.QR_SESSION_GROUP_URL)){
              

                +            if(!urlInfo.contains("pai.ai")){
              

                                 Toast.makeText(this,R.string.scan_qr_wrong,Toast.LENGTH_SHORT).show();
              

                                 return;
              

                             }
              

                             LogHelper.d("czy","qr scan result = "+urlInfo);
              

                -            boolean isFromGuideApp = urlInfo.startsWith(UrlContainer.QR_GUIDE_APP_GROUP_URL);
              

                +            boolean isFromGuideApp = urlInfo.contains("tgu");
              

                             if(isFromGuideApp){
              

                                 guideId = urlInfo.substring(urlInfo.lastIndexOf("/") + 1);
              

                                 if(!TextUtils.isEmpty(Preferences.getInstance(this).getUserPhone())){
              
@@ -314,7 +314,7 @@ public class MainActivity extends AppCompatActivity

                                 }
              

                                return;
              

                             }
              

                -            boolean isFromAPP = urlInfo.startsWith(UrlContainer.QR_APP_GROUP_URL);
              

                +            boolean isFromAPP = urlInfo.contains("pai.ai/g/");
              

                             String groupId = urlInfo.substring(urlInfo.lastIndexOf("/") + 1);
              

                             if (requestCode == JOIN_REQUEST_CODE) {
              

                                 Intent intent = new Intent(this, GroupService.class);
              

app/src/main/java/ai/pai/client/services/GroupService.java

@@ -123,6 +123,7 @@ public class GroupService extends Service implements UploadTask.OnPhotoUploadLis

                                 doQuitGroupTask(bundle);
              

                                 break;
              

                             case GroupCommand.COMMAND_JOIN_GUIDE_GROUP:
              

                +                doJoinGuideGroupTask(bundle);
              

                                 break;
              

                         }
              

                         return START_STICKY;
              

app/src/main/java/ai/pai/client/views/PersonInfoPopup.java

@@ -84,7 +84,7 @@ public class PersonInfoPopup extends BasePopupWindow {

                 
              

                     @Override
              

                     public View getPopupView() {
              

                -        return LayoutInflater.from(mContext).inflate(R.layout.popup_comment_input,null);
              

                +        return LayoutInflater.from(mContext).inflate(R.layout.popup_person_info,null);
              

                     }
              

                 
              

                     @Override