Commit f382650a authored by sheteng's avatar sheteng

合规修改 2

parent 9a91dce9
...@@ -99,7 +99,7 @@ dependencies { ...@@ -99,7 +99,7 @@ dependencies {
implementation("com.github.xuexiangjys:XUI:1.1.8") implementation("com.github.xuexiangjys:XUI:1.1.8")
//工具类 //工具类
implementation("com.github.xuexiangjys.XUtil:xutil-core:2.0.0") implementation("com.github.xuexiangjys.XUtil:xutil-core:2.0.0")
implementation("com.github.xuexiangjys.XUtil:xutil-sub:2.0.0") // implementation("com.github.xuexiangjys.XUtil:xutil-sub:2.0.0")
implementation("com.tencent:mmkv:1.2.10") implementation("com.tencent:mmkv:1.2.10")
//美团多渠道打包 //美团多渠道打包
implementation("com.mcxiaoke.packer-ng:helper:2.0.1") implementation("com.mcxiaoke.packer-ng:helper:2.0.1")
......
...@@ -144,29 +144,33 @@ ...@@ -144,29 +144,33 @@
<!-- android:name="android.support.FILE_PROVIDER_PATHS"--> <!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
<!-- android:resource="@xml/filepaths"/>--> <!-- android:resource="@xml/filepaths"/>-->
<!-- </provider>--> <!-- </provider>-->
<activity <activity
android:name="com.chuanglan.shanyan_sdk.view.CmccLoginActivity" android:name="com.chuanglan.shanyan_sdk.view.CmccLoginActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="behind" /> android:screenOrientation="behind"
/>
<activity-alias <activity-alias
android:name="com.cmic.sso.sdk.view.LoginAuthActivity" android:name="com.cmic.gen.sdk.view.GenLoginAuthActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="behind" android:screenOrientation="behind"
android:targetActivity="com.chuanglan.shanyan_sdk.view.CmccLoginActivity" /> android:targetActivity="com.chuanglan.shanyan_sdk.view.CmccLoginActivity"
/>
<activity <activity
android:name="com.chuanglan.shanyan_sdk.view.ShanYanOneKeyActivity" android:name="com.chuanglan.shanyan_sdk.view.ShanYanOneKeyActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="behind" /> android:screenOrientation="behind"
/>
<activity <activity
android:name="com.chuanglan.shanyan_sdk.view.CTCCPrivacyProtocolActivity" android:name="com.chuanglan.shanyan_sdk.view.CTCCPrivacyProtocolActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="behind" /> android:screenOrientation="behind"
/>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
...@@ -54,16 +54,15 @@ class MainActivity() : XPageActivity() { ...@@ -54,16 +54,15 @@ class MainActivity() : XPageActivity() {
acceleratorViewModel = acceleratorViewModel =
ViewModelProvider(this).get(AccelertorViewModel::class.java) ViewModelProvider(this).get(AccelertorViewModel::class.java)
initPhoneUtils()
//隐私协议 //隐私协议
if (!SettingSPUtils.isAgreePrivacy) { if (!SettingSPUtils.isAgreePrivacy) {
PrivacyDialog(this, HttpConfig.HTML_HOST_PRIVACY + "index.html") { PrivacyDialog(this, HttpConfig.HTML_HOST_PRIVACY + "index.html") {
if (it) { if (it) {
SettingSPUtils.isAgreePrivacy = true SettingSPUtils.isAgreePrivacy = true
PhoneUtils.initSdk(application)
PhoneUtils.getPhoneInfo()
PermissionDialog(this) { PermissionDialog(this) {
PhoneUtils.initSdk(application)
PhoneUtils.getPhoneInfo()
getPermission() getPermission()
DataRePortUtils.report("st_agrmt_ok") DataRePortUtils.report("st_agrmt_ok")
}.show<PermissionDialog>() }.show<PermissionDialog>()
...@@ -86,6 +85,7 @@ class MainActivity() : XPageActivity() { ...@@ -86,6 +85,7 @@ class MainActivity() : XPageActivity() {
} }
private fun getPermission() { private fun getPermission() {
initPhoneUtils()
Bugly.init(this, "e030f74df5", false) Bugly.init(this, "e030f74df5", false)
UMConfigure.init(this,"61f0aa7fe014255fcb06a0bd" UMConfigure.init(this,"61f0aa7fe014255fcb06a0bd"
,"umeng", UMConfigure.DEVICE_TYPE_PHONE,"") ,"umeng", UMConfigure.DEVICE_TYPE_PHONE,"")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment