Commit 7c5739a3 authored by 张释方's avatar 张释方

第一次尝试打马甲包

parent ec9831dd
......@@ -34,10 +34,10 @@ android {
SHARE_SECRET : RELEASE_SHARESDK_SECRET]
}
buildFeatures{
buildFeatures {
dataBinding = true
// for view binding :
viewBinding = true
viewBinding = true
}
compileOptions {
......@@ -59,6 +59,18 @@ android {
keyAlias RELEASE_KEY_ALIAS
keyPassword RELEASE_KEY_PASSWORD
}
fiveworld {
storeFile file(FIVEWORLD_RELEASE_STORE_FILE)
storePassword FIVEWORLD_RELEASE_STORE_PASSWORD
keyAlias FIVEWORLD_RELEASE_KEY_ALIAS
keyPassword FIVEWORLD_RELEASE_KEY_PASSWORD
}
freeworld {
storeFile file(FREEWORLD_RELEASE_STORE_FILE)
storePassword FREEWORLD_RELEASE_STORE_PASSWORD
keyAlias FREEWORLD_RELEASE_KEY_ALIAS
keyPassword FREEWORLD_RELEASE_KEY_PASSWORD
}
}
buildTypes {
......@@ -106,6 +118,26 @@ android {
productFlavors {
streetpkg {}
toutiao {}
// 5G世界马甲包
fiveworld {
applicationId "com.mints.fiveworld"
manifestPlaceholders = [CHANNEL_NAME_VALUE: "fiveworld",
UMENG_KEY : RELEASE_UMENG_KEY,
SHARE_KEY : RELEASE_SHARESDK_KEY,
SHARE_SECRET : RELEASE_SHARESDK_SECRET
]
signingConfig signingConfigs.fiveworld//签名信息
}
//自由世界马甲包
freeworld {
applicationId "com.mints.freeworld"
manifestPlaceholders = [CHANNEL_NAME_VALUE: "freeworld",
UMENG_KEY : RELEASE_UMENG_KEY,
SHARE_KEY : RELEASE_SHARESDK_KEY,
SHARE_SECRET : RELEASE_SHARESDK_SECRET
]
signingConfig signingConfigs.freeworld//签名信息
}
}
productFlavors.all {
......@@ -137,7 +169,7 @@ android {
}
dependencies {
implementation fileTree(include:['*.jar'], dir:'libs')
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
......@@ -192,7 +224,7 @@ dependencies {
api rootProject.ext.dependencies["room-runtime"]
api rootProject.ext.dependencies["room-rxjava2"]
api rootProject.ext.dependencies["room-guava"]
kapt rootProject.ext.dependencies["room-compiler"]
kapt rootProject.ext.dependencies["room-compiler"]
// jsbridge
api 'com.github.lzyzsd:jsbridge:1.0.4'
......
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
android:layout_width="match_parent"
android:background="#061b45"
android:layout_height="match_parent">
<View
android:id="@+id/view_splash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@+id/fl_splash"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
</RelativeLayout>
<data>
<variable
name="viewModel"
type="com.mints.street.splash.SplashViewModel" />
</data>
</layout>
\ No newline at end of file
<resources>
<string name="app_name">5G世界</string>
<string name="package_name">com.mints.fiveworld</string>
<string name="register_url">map5g/register.html</string>
<string name="privacy_url">map5g/privacy.html</string>
<string name="activity_premissions_content">您的个人信息将受到严格的保密,5G世界不会将您的个
人信息泄露给他人。您也可以在系统设置中关闭授权,但可能影响部分功能使用。</string>
<string name="dialog_is_backvip">5G世界会员吗?</string>
<string name="dialog_back_vip_explanation">我们依据最新的法律,向您说明5G世界软件的隐私政策,特向您推送本提示。
请您阅读并充分理解相关条款。</string>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
android:layout_width="match_parent"
android:background="#061b45"
android:layout_height="match_parent">
<View
android:id="@+id/view_splash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@+id/fl_splash"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
</RelativeLayout>
<data>
<variable
name="viewModel"
type="com.mints.street.splash.SplashViewModel" />
</data>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="CircleImageView">
<attr name="border_width" format="dimension" />
<attr name="border_color" format="color" />
</declare-styleable>
<declare-styleable name="HorizontalselectedView">
<!--可见数目-->
<attr name="HorizontalselectedViewSeesize" format="integer"></attr>
<!--被选择文字的大小和颜色-->
<attr name="HorizontalselectedViewSelectedTextSize" format="float"></attr>
<attr name="HorizontalselectedViewSelectedTextColor" format="color|reference"></attr>
<!--未被被选择文字的大小和颜色-->
<attr name="HorizontalselectedViewTextSize" format="float"></attr>
<attr name="HorizontalselectedViewTextColor" format="color|reference"></attr>
</declare-styleable>
<declare-styleable name="RatingStar">
<attr name="starNormal" format="reference"/>
<attr name="starFocus" format="reference"/>
<attr name="starNumber" format="integer"/>
</declare-styleable>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#ffffffff</color>
<color name="colorPrimaryDark">#ffffffff</color>
<color name="colorAccent">#FF4081</color>
<color name="color_FF9837">#FF9837</color>
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<color name="gray">#808080</color>
<color name="color_668BFF">#668BFF</color>
<color name="color_7EE2FF">#7EE2FF</color>
<color name="color_A7BCFE">#A7BCFE</color>
<color name="color_FEFFFF">#FEFFFF</color>
<color name="color_323334">#323334</color>
<color name="color_333">#333333</color>
<color name="color_172B54">#172B54</color>
<color name="color_121B32">#121B32</color>
<color name="color_F9F9F9">#F9F9F9</color>
<color name="color_BEC2CC">#BEC2CC</color>
<color name="color_E6E6E6">#E6E6E6</color>
<color name="color_555">#555555</color>
<color name="color_8F6D21">#8F6D21</color>
<color name="color_505050">#505050</color>
<color name="color_0000">#00000000</color>
<color name="color_60000000">#60000000</color>
<color name="color_2B3238">#2B3238</color>
<color name="color_002444">#002444</color>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2015 [1076559197@qq.com | tchen0707@gmail.com]
~
~ Licensed under the Apache License, Version 2.0 (the "License”);
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources>
<drawable name="progress_bar_bg">@color/color_0000</drawable>
<drawable name="sr_primary">@color/color_2B3238</drawable>
<drawable name="sr_primary_r">@color/color_002444</drawable>
</resources>
\ No newline at end of file
<resources>
<string name="app_name">自由世界</string>
<string name="package_name">com.mints.freeworld</string>
<string name="register_url">mapzy/register.html</string>
<string name="privacy_url">mapzy/privacy.html</string>
<string name="activity_premissions_content">您的个人信息将受到严格的保密,自由世界不会将您的个
人信息泄露给他人。您也可以在系统设置中关闭授权,但可能影响部分功能使用。</string>
<string name="dialog_is_backvip">自由世界会员吗?</string>
<string name="dialog_back_vip_explanation">我们依据最新的法律,向您说明自由世界软件的隐私政策,特向您推送本提示。
请您阅读并充分理解相关条款。</string>
</resources>
\ No newline at end of file
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowIsTranslucent">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@color/appBackColor</item>
<item name="android:windowAnimationStyle">@style/animFade</item>
<!--全局默认竖屏-->
<item name="android:screenOrientation">portrait</item>
<item name="android:configChanges">
screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden
</item>
</style>
<!-- 界面切换动画 -->
<style name="animFade" parent="@android:style/Animation.Activity">
<item name="android:activityOpenEnterAnimation">@anim/slide_in_from_right</item>
<item name="android:activityOpenExitAnimation">@anim/slide_out_to_left</item>
<item name="android:activityCloseExitAnimation">@anim/slide_out_to_right</item>
<item name="android:activityCloseEnterAnimation">@anim/slide_in_from_left</item>
<!--<item name="android:windowEnterAnimation">@anim/slide_in_from_right</item>
<item name="android:windowExitAnimation">@anim/slide_out_to_right</item>-->
</style>
<style name="line_3">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1px</item>
<item name="android:background">#E8E8F0</item>
</style>
<!--浅灰色line-->
<style name="view_line_E6E6E6">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">@color/color_E6E6E6</item>
</style>
<!-- activity 切换 anim -->
<!--设置Tablayout字体加粗-->
<style name="MyCheckBox" parent="Theme.AppCompat.Light">
<item name="colorControlNormal">@color/black</item>
<item name="colorControlActivated">@color/black</item>
</style>
<style name="dialog" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@color/color_0000</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowIsTranslucent">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:background">@null</item>
<item name="android:backgroundDimEnabled">true</item>
<item name="android:gravity">bottom</item>
</style>
<style name="DialogAnimBottom" parent="@android:style/Animation">
<item name="android:windowEnterAnimation">@anim/dialog_bottom_in</item>
<item name="android:windowExitAnimation">@anim/dialog_bottom_out</item>
</style>
<style name="CustomCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
<item name="android:button">@drawable/checkbox_style</item>
</style>
<style name="EndDialogAnim">
<item name="android:windowEnterAnimation">@anim/slide_in_from_right</item>
<item name="android:windowExitAnimation">@anim/slide_out_to_right</item>
</style>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<!--为了适配所有路径可以设置 path = "." -->
<external-path
name="tt_external_root"
path="." />
<external-path
name="tt_external_download"
path="Download" />
<external-files-path
name="tt_external_files_download"
path="Download" />
<files-path
name="tt_internal_file_download"
path="Download" />
<cache-path
name="tt_internal_cache_download"
path="Download" />
</paths>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true" />
<!-- <domain-config>-->
<!-- <domain includeSubdomains="true">i.snssdk.com</domain>-->
<!-- <domain includeSubdomains="true">is.snssdk.com</domain>-->
<!-- <domain includeSubdomains="true">pangolin.snssdk.com</domain>-->
<!-- <domain includeSubdomains="true">extlog.snssdk.com</domain>-->
<!-- <domain includeSubdomains="true">sf3-ttcdn-tos.pstatp.com</domain>-->
<!-- <domain includeSubdomains="true">bds.snssdk.com</domain>-->
<!-- <domain includeSubdomains="true">dig.bdurl.net</domain>-->
<!-- <domain includeSubdomains="true">api-access.pangolin-sdk-toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">sf1-fe-tos.pglstatp-toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">sf1-be-pack.pglstatp-toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">sf3-fe-tos.pglstatp-toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">log-api.pangolin-sdk-toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">s3-fe-scm.pglstatp-toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">s3a.pstatp.com</domain>-->
<!-- <domain includeSubdomains="true">api-access.pangolin-sdk-toutiao-b.com</domain>-->
<!-- <domain includeSubdomains="true">log-api.pangolin-sdk-toutiao-b.com</domain>-->
<!-- <domain includeSubdomains="true">dm.pstatp.com</domain>-->
<!-- <domain includeSubdomains="true">toblog.ctobsnssdk.com</domain>-->
<!-- <domain includeSubdomains="true">sdfp.snssdk.com</domain>-->
<!-- <domain includeSubdomains="true">tosv.byted.org</domain>-->
<!-- <domain includeSubdomains="true">sf1-ttcdn-tos.pstatp.com</domain>-->
<!-- <domain includeSubdomains="true">sf6-fe-tos.pglstatp-toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">log.snssdk.com</domain>-->
<!-- <domain includeSubdomains="true">tosv.boe.byted.org</domain>-->
<!-- <domain includeSubdomains="true">dm.toutiao.com</domain>-->
<!-- <domain includeSubdomains="true">dm.bytedance.com</domain>-->
<!-- <trust-anchors>-->
<!-- <certificates src="user" />//信任用户自己安装的证书-->
<!-- <certificates src="system" />-->
<!-- </trust-anchors>-->
<!-- </domain-config>-->
</network-security-config>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path
name="external"
path="." />
<files-path
name="files"
path="." />
<cache-path
name="cache"
path="." />
<!-- 优量汇 这个下载路径也不可以修改,必须为GDTDOWNLOAD -->
<external-cache-path
name="gdt_sdk_download_path1"
path="com_qq_e_download" />
<cache-path
name="gdt_sdk_download_path2"
path="com_qq_e_download" />
</paths>
......@@ -130,7 +130,7 @@
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.mints.street.fileprovider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true"
tools:replace="android:authorities">
......@@ -141,7 +141,7 @@
</provider> <!-- 穿山甲广告 -->
<provider
android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
android:authorities="com.mints.street.TTMultiProvider"
android:authorities="${applicationId}.TTMultiProvider"
android:exported="false" />
<provider
android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
......
package com.mints.street.common
import com.mints.street.AppApplication
import com.mints.street.BuildConfig
import com.mints.street.R
object Constant {
......@@ -20,8 +22,10 @@ object Constant {
const val FIRST_OPEN_PERMISSIONS = "first_open_permissions"
// 协议地址
var REGISTER_URL = BuildConfig.MainIp + "map/register.html"//服务协议
var PRIVACY_URL = BuildConfig.MainIp + "map/privacy.html"//隐私协议
var REGISTER_URL = "${BuildConfig.MainIp}${AppApplication.mContext
?.getString(R.string.register_url)}"//服务协议
var PRIVACY_URL = "${BuildConfig.MainIp}${AppApplication.mContext
?.getString(R.string.privacy_url)}"//隐私协议
/**
* 第一次授权
......
......@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="25dp"
android:text="3D高清街景"
android:text="@string/app_name"
android:textStyle="bold"
android:textColor="@color/black"
android:textSize="25dp" />
......@@ -183,7 +183,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="您的个人信息将受到严格的保密,3D高清街景不会将您的个人信息泄露给他人。您也可以在系统设置中关闭授权,但可能影响部分功能使用。"
android:text="@string/activity_premissions_content"
android:layout_margin="10dp"
android:textColor="#CD000000" />
......
......@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:elevation="5dp"
android:layout_marginTop="4dp"
android:text="3D高清街景会员吗?"
android:text="@string/dialog_is_backvip"
android:textColor="#8E5832"
android:textSize="26sp"
android:textStyle="bold"
......
......@@ -38,7 +38,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:layout_marginRight="16dp"
android:text="我们依据最新的法律,向您说明3D高清街景软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
android:text="@string/dialog_back_vip_explanation"
android:textColor="@color/black"
android:textSize="14sp" />
......
......@@ -24,6 +24,17 @@ RELEASE_KEY_ALIAS=mints_street
RELEASE_STORE_PASSWORD=mints.street
RELEASE_STORE_FILE=mints_street.jks
#第一步:添加新的签名文件和密码配置--fiveworld--freeworld
FIVEWORLD_RELEASE_KEY_PASSWORD=mints.fiveworld
FIVEWORLD_RELEASE_KEY_ALIAS=mints_fiveworld
FIVEWORLD_RELEASE_STORE_PASSWORD=mints.fiveworld
FIVEWORLD_RELEASE_STORE_FILE=mints_fiveworld.jks
FREEWORLD_RELEASE_KEY_PASSWORD=mints.freeworld
FREEWORLD_RELEASE_KEY_ALIAS=mints_freeworld
FREEWORLD_RELEASE_STORE_PASSWORD=mints.freeworld
FREEWORLD_RELEASE_STORE_FILE=mints_freeworld.jks
#ShareSDK
RELEASE_SHARESDK_KEY=m33e5da5ced828
RELEASE_SHARESDK_SECRET=08ce5b656e724e793787bd9f6d465ae8
......
......@@ -26,7 +26,7 @@
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<!--Android7App私有文件授权-->
<provider
<!--<provider
android:name="com.fry.base.provider.BaseFileProvider"
android:authorities="com.base.android.android7.fileprovider"
android:exported="false"
......@@ -34,7 +34,7 @@
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_provider_paths" />
</provider>
</provider>-->
</application>
</manifest>
......@@ -14,8 +14,7 @@
android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
android:name=".crash.DefaultErrorActivity"
android:process=":error_activity"
android:screenOrientation="portrait"
/>
android:screenOrientation="portrait" />
<provider
android:name=".crash.CaocInitProvider"
......
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