Преглед на файлове

修改H5协议跳转参数格式

Pq преди 3 години
родител
ревизия
e9f705fd72
променени са 2 файла, в които са добавени 19 реда и са изтрити 18 реда
  1. 11 11
      student/src/main/AndroidManifest.xml
  2. 8 7
      teacher/src/main/AndroidManifest.xml

+ 11 - 11
student/src/main/AndroidManifest.xml

@@ -28,23 +28,22 @@
             android:theme="@style/SplashTheme">
             android:theme="@style/SplashTheme">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
-
-
             </intent-filter>
             </intent-filter>
             <intent-filter>
             <intent-filter>
+                <!--colexiustudent://html:8888/SplashActivity?url=10011002-->
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
 
                 <data
                 <data
-                    android:host="html:8888/SplashActivity"
-                    android:scheme="ColexiuStudent"
-                    tools:ignore="AppLinkUrlError" />
+                    android:host="html"
+                    android:path="/SplashActivity"
+                    android:port="8888"
+                    android:scheme="colexiustudent" />
             </intent-filter>
             </intent-filter>
         </activity>
         </activity>
+
         <activity
         <activity
             android:name=".ui.splash.GuideActivity"
             android:name=".ui.splash.GuideActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:configChanges="orientation|screenSize|keyboardHidden"
@@ -54,6 +53,7 @@
             android:name=".ui.main.MainActivity"
             android:name=".ui.main.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="false"
             android:exported="false"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
             android:screenOrientation="portrait" />
 
 
         <activity
         <activity
@@ -131,14 +131,14 @@
         <activity
         <activity
             android:name=".ui.course.SparringCourseDetailActivity"
             android:name=".ui.course.SparringCourseDetailActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustNothing"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing" />
 
 
         <activity
         <activity
             android:name=".ui.course.PianoRoomCourseDetailActivity"
             android:name=".ui.course.PianoRoomCourseDetailActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustNothing"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing" />
 
 
         <activity
         <activity
             android:name=".ui.course.PracticeCourseDetailActivity"
             android:name=".ui.course.PracticeCourseDetailActivity"

+ 8 - 7
teacher/src/main/AndroidManifest.xml

@@ -47,9 +47,10 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
 
                 <data
                 <data
-                    android:host="html:8888/SplashActivity"
-                    android:scheme="ColexiuTeacher"
-                    tools:ignore="AppLinkUrlError" />
+                    android:host="html"
+                    android:path="/SplashActivity"
+                    android:port="8888"
+                    android:scheme="colexiuteacher" />
             </intent-filter>
             </intent-filter>
         </activity>
         </activity>
         <activity
         <activity
@@ -86,14 +87,14 @@
         <activity
         <activity
             android:name=".ui.course.SparringCourseDetailActivity"
             android:name=".ui.course.SparringCourseDetailActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustNothing"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing" />
 
 
         <activity
         <activity
             android:name=".ui.course.PianoRoomCourseDetailActivity"
             android:name=".ui.course.PianoRoomCourseDetailActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustNothing"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing" />
 
 
         <activity
         <activity
             android:name=".ui.course.PianoRoomCourseHomeWorkActivity"
             android:name=".ui.course.PianoRoomCourseHomeWorkActivity"