Commit 050455560bad6f418cdeeb4c3d2583adad93cb10

Authored by 韩亚云
2 parents a67cd994 7ccbc6a7

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

moudle_pedometer/src/main/AndroidManifest.xml
@@ -99,15 +99,14 @@ @@ -99,15 +99,14 @@
99 99
100 <activity 100 <activity
101 android:name="com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity" 101 android:name="com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity"
102 - android:launchMode="singleInstance" 102 + android:launchMode="singleTask"
103 android:process=":step" /> 103 android:process=":step" />
104 <activity 104 <activity
105 android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity" 105 android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity"
106 android:process=":step" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" --> 106 android:process=":step" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
107 <activity 107 <activity
108 android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity" 108 android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
109 - android:process=":step"  
110 - android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> 109 + android:process=":step" />
111 </application> 110 </application>
112 111
113 </manifest> 112 </manifest>
114 \ No newline at end of file 113 \ No newline at end of file