@@ -240,11 +240,15 @@ public class MainActivity extends AppCompatActivity |
||
| 240 | 240 |
} |
| 241 | 241 |
|
| 242 | 242 |
String urlInfo = data.getStringExtra("info");
|
| 243 |
- if(!urlInfo.contains(UrlContainer.QR_APP_GROUP_URL) && !urlInfo.contains(UrlContainer.QR_SESSION_GROUP_URL)){
|
|
| 243 |
+ |
|
| 244 |
+ if(!urlInfo.contains(UrlContainer.QR_GUIDE_APP_GROUP_URL) && !urlInfo.contains(UrlContainer.QR_APP_GROUP_URL) && !urlInfo.contains(UrlContainer.QR_SESSION_GROUP_URL)){
|
|
| 244 | 245 |
Toast.makeText(this,R.string.scan_qr_wrong,Toast.LENGTH_SHORT).show(); |
| 245 | 246 |
return; |
| 246 | 247 |
} |
| 247 | 248 |
LogHelper.d("czy","qr scan result = "+urlInfo);
|
| 249 |
+ boolean isFromGuideApp = urlInfo.startsWith(UrlContainer.QR_GUIDE_APP_GROUP_URL); |
|
| 250 |
+ //TODO 导游群处理 |
|
| 251 |
+ |
|
| 248 | 252 |
boolean isFromAPP = urlInfo.startsWith(UrlContainer.QR_APP_GROUP_URL); |
| 249 | 253 |
String groupId = urlInfo.substring(urlInfo.lastIndexOf("/") + 1);
|
| 250 | 254 |
if (requestCode == JOIN_REQUEST_CODE) {
|
@@ -15,6 +15,9 @@ public class UrlContainer {
|
||
| 15 | 15 |
|
| 16 | 16 |
public static final String QR_APP_GROUP_URL = "https://pai.ai/g/"; |
| 17 | 17 |
|
| 18 |
+ //TODO |
|
| 19 |
+ public static final String QR_GUIDE_APP_GROUP_URL= "https://pai.ai/guide/"; |
|
| 20 |
+ |
|
| 18 | 21 |
public static final String APP_GROUP_JOIN_URL = HOST_URL+"g/join"; |
| 19 | 22 |
|
| 20 | 23 |
public static final String SESSION_GROUP_JOIN_URL = HOST_URL+"s/join"; |