Skip to content

A
android_street
Commit 325a3528 authored by fengruiyu's avatar fengruiyu
Browse files
Options

Merge branch 'vest_bag' of http://gitlab.mints-id.com/android/android_street into fry_dev

parents ec9831dd c656fecb
Hide whitespace changes
Inline Side-by-side
Showing with 721 additions and 160 deletions
app/build.gradle
View file @ 325a3528
...@@ -27,11 +27,11 @@ android { ...@@ -27,11 +27,11 @@ android {
//abiFilters "armeabi", "armeabi-v7a", "x86", "mips" //abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
abiFilters "armeabi-v7a", "arm64-v8a" abiFilters "armeabi-v7a", "arm64-v8a"
} }
manifestPlaceholders = [CHANNEL_NAME_VALUE: "street", manifestPlaceholders = [CHANNEL_NAME_VALUE: "street",
UMENG_KEY : RELEASE_UMENG_KEY, UMENG_KEY : RELEASE_UMENG_KEY,
SHARE_KEY : RELEASE_SHARESDK_KEY, SHARE_KEY : RELEASE_SHARESDK_KEY,
SHARE_SECRET : RELEASE_SHARESDK_SECRET] SHARE_SECRET : RELEASE_SHARESDK_SECRET
]
} }
buildFeatures{ buildFeatures{
...@@ -59,6 +59,18 @@ android { ...@@ -59,6 +59,18 @@ android {
keyAlias RELEASE_KEY_ALIAS keyAlias RELEASE_KEY_ALIAS
keyPassword RELEASE_KEY_PASSWORD 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 { buildTypes {
...@@ -106,6 +118,26 @@ android { ...@@ -106,6 +118,26 @@ android {
productFlavors { productFlavors {
streetpkg {} streetpkg {}
toutiao {} 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 { productFlavors.all {
......
app/src/androidTest/java/com/mints/street/ExampleInstrumentedTest.java deleted 100644 → 0
View file @ ec9831dd
package com.mints.street;
import android.content.Context;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
//@RunWith(AndroidJUnit4.class)
//public class ExampleInstrumentedTest {
// @Test
// public void useAppContext() {
// // Context of the app under test.
// Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
// assertEquals("com.mints.goodnews", appContext.getPackageName());
// }
//}
\ No newline at end of file
app/src/fiveworld/res/layout/activity_splash.xml 0 → 100644
View file @ 325a3528
<?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
app/src/fiveworld/res/values/attrs.xml 0 → 100644
View file @ 325a3528
<?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
app/src/fiveworld/res/values/colors.xml 0 → 100644
View file @ 325a3528
<?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
app/src/fiveworld/res/values/drawables.xml 0 → 100644
View file @ 325a3528
<?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
app/src/fiveworld/res/values/strings.xml 0 → 100644
View file @ 325a3528
<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
app/src/fiveworld/res/values/styles.xml 0 → 100644
View file @ 325a3528
<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
app/src/fiveworld/res/xml/file_paths.xml 0 → 100644
View file @ 325a3528
<?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
app/src/fiveworld/res/xml/network_security_config.xml 0 → 100644
View file @ 325a3528
<?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
app/src/fiveworld/res/xml/provider_paths.xml 0 → 100644
View file @ 325a3528
<?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>
app/src/freeworld/res/layout/activity_splash.xml 0 → 100644
View file @ 325a3528
<?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
app/src/freeworld/res/values/attrs.xml 0 → 100644
View file @ 325a3528
<?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
app/src/freeworld/res/values/colors.xml 0 → 100644
View file @ 325a3528
<?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
app/src/freeworld/res/values/drawables.xml 0 → 100644
View file @ 325a3528
<?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
app/src/freeworld/res/values/strings.xml 0 → 100644
View file @ 325a3528
<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
app/src/freeworld/res/values/styles.xml 0 → 100644
View file @ 325a3528
<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
app/src/freeworld/res/xml/file_paths.xml 0 → 100644
View file @ 325a3528
<?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
app/src/freeworld/res/xml/network_security_config.xml 0 → 100644
View file @ 325a3528
<?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
app/src/freeworld/res/xml/provider_paths.xml 0 → 100644
View file @ 325a3528
<?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>
app/src/main/AndroidManifest.xml
View file @ 325a3528
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.mints.street.fileprovider" android:authorities="${applicationId}.fileprovider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true" android:grantUriPermissions="true"
tools:replace="android:authorities"> tools:replace="android:authorities">
...@@ -141,11 +141,11 @@ ...@@ -141,11 +141,11 @@
</provider> <!-- 穿山甲广告 --> </provider> <!-- 穿山甲广告 -->
<provider <provider
android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider" android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
android:authorities="com.mints.street.TTMultiProvider" android:authorities="${applicationId}.TTMultiProvider"
android:exported="false" /> android:exported="false" />
<provider <provider
android:name="com.bytedance.sdk.openadsdk.TTFileProvider" android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
android:authorities="com.mints.street.TTFileProvider" android:authorities="${applicationId}.TTFileProvider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true" android:grantUriPermissions="true"
tools:replace="android:authorities"> tools:replace="android:authorities">
......
app/src/main/java/com/mints/street/adapter/DialogMapContentAdapter.kt
View file @ 325a3528
...@@ -20,7 +20,7 @@ import me.goldze.mvvmhabit.utils.RxUtils ...@@ -20,7 +20,7 @@ import me.goldze.mvvmhabit.utils.RxUtils
* Created by 冯瑞雨 on 2021/8/9. * Created by 冯瑞雨 on 2021/8/9.
*/ */
class DialogMapContentAdapter( class DialogMapContentAdapter(
val context: Context, var list: List<MapStyleList>?, val context: Context?, var list: List<MapStyleList>?,
private val onItemMapStyleChange: OnItemMapStyleChange? = null private val onItemMapStyleChange: OnItemMapStyleChange? = null
) : ) :
AbstractVLayoutBaseAdapter<DialogMapContentItemBinding, List<MapStyleList>>(context, list, 2) { AbstractVLayoutBaseAdapter<DialogMapContentItemBinding, List<MapStyleList>>(context, list, 2) {
......
app/src/main/java/com/mints/street/adapter/DialogMapHeadAdapter.kt
View file @ 325a3528
...@@ -6,12 +6,11 @@ import com.fry.base.adapter.AbstractVLayoutBaseAdapter ...@@ -6,12 +6,11 @@ import com.fry.base.adapter.AbstractVLayoutBaseAdapter
import com.fry.base.adapter.BindingViewHolder import com.fry.base.adapter.BindingViewHolder
import com.mints.street.R import com.mints.street.R
import com.mints.street.databinding.DialogMapHearItemBinding import com.mints.street.databinding.DialogMapHearItemBinding
import com.mints.street.databinding.DialogMapHearItemBindingImpl
/** /**
* Created by 冯瑞雨 on 2021/8/9. * Created by 冯瑞雨 on 2021/8/9.
*/ */
class DialogMapHeadAdapter(val context: Context, var name: String?) : class DialogMapHeadAdapter(val context: Context?, var name: String?) :
AbstractVLayoutBaseAdapter<DialogMapHearItemBinding, String?>(context, name, 1) { AbstractVLayoutBaseAdapter<DialogMapHearItemBinding, String?>(context, name, 1) {
override fun onBindViewHolder( override fun onBindViewHolder(
......
app/src/main/java/com/mints/street/adapter/DialogMapTailAdapter.kt
View file @ 325a3528
...@@ -9,12 +9,11 @@ import com.github.iielse.switchbutton.SwitchView ...@@ -9,12 +9,11 @@ import com.github.iielse.switchbutton.SwitchView
import com.mints.street.R import com.mints.street.R
import com.mints.street.bean.MapStyleSortBean import com.mints.street.bean.MapStyleSortBean
import com.mints.street.databinding.DialogMapTailItemBinding import com.mints.street.databinding.DialogMapTailItemBinding
import com.mints.street.databinding.ItemGridMapAdapterBinding
/** /**
* Created by 冯瑞雨 on 2021/8/9. * Created by 冯瑞雨 on 2021/8/9.
*/ */
class DialogMapTailAdapter(val context: Context, private var mapStyleBean: MapStyleSortBean?, class DialogMapTailAdapter(val context: Context?, private var mapStyleBean: MapStyleSortBean?,
val onDataChange:OnDataChange?=null) : val onDataChange:OnDataChange?=null) :
AbstractVLayoutBaseAdapter<DialogMapTailItemBinding, List<String>>(context, null, 3) { AbstractVLayoutBaseAdapter<DialogMapTailItemBinding, List<String>>(context, null, 3) {
......
app/src/main/java/com/mints/street/adapter/GridMapAdapter.kt
View file @ 325a3528
...@@ -17,7 +17,7 @@ import me.goldze.mvvmhabit.utils.RxUtils ...@@ -17,7 +17,7 @@ import me.goldze.mvvmhabit.utils.RxUtils
/** /**
* Created by 冯瑞雨 on 2021/7/9. * Created by 冯瑞雨 on 2021/7/9.
*/ */
class GridMapAdapter(val context: Context, var list: List<VrmapBean.Internal>?) : class GridMapAdapter(val context: Context?, var list: List<VrmapBean.Internal>?) :
AbstractVLayoutBaseAdapter<ItemGridMapAdapterBinding, List<VrmapBean.Internal>>(context, list, 2) { AbstractVLayoutBaseAdapter<ItemGridMapAdapterBinding, List<VrmapBean.Internal>>(context, list, 2) {
override fun onBindViewHolder( override fun onBindViewHolder(
...@@ -52,7 +52,7 @@ class GridMapAdapter(val context: Context, var list: List<VrmapBean.Internal>?) ...@@ -52,7 +52,7 @@ class GridMapAdapter(val context: Context, var list: List<VrmapBean.Internal>?)
override fun getItemCount() = list!!.size override fun getItemCount() = list?.size?:0
override fun onCreateLayoutHelper(): LayoutHelper { override fun onCreateLayoutHelper(): LayoutHelper {
val hp: GridLayoutHelper = GridLayoutHelper(2) val hp: GridLayoutHelper = GridLayoutHelper(2)
......
app/src/main/java/com/mints/street/adapter/ItemHotViewAdapter.kt
View file @ 325a3528
...@@ -36,7 +36,7 @@ class ItemHotViewAdapter(val context: Context, val dialog: BottomSheetDialog?, v ...@@ -36,7 +36,7 @@ class ItemHotViewAdapter(val context: Context, val dialog: BottomSheetDialog?, v
//设置名称 //设置名称
holder.binding.viewname.text = name holder.binding.viewname.text = name
//设置距离 //设置距离
var distance: Double = getDistance(LatLng(lat!!.toDouble(), lng!!.toDouble()), LatLng(mCurrentLat, mCurrentLon)) var distance: Double = getDistance(LatLng(lat?.toDouble()?:0.0, lng?.toDouble()?:0.0), LatLng(mCurrentLat, mCurrentLon))
holder.binding.tvDistance.text = "距离${DecimalFormat("0.00").format(distance / 1000).toString()}km" holder.binding.tvDistance.text = "距离${DecimalFormat("0.00").format(distance / 1000).toString()}km"
//设置景点简介 //设置景点简介
holder.binding.tvDescribe.text = desc holder.binding.tvDescribe.text = desc
......
app/src/main/java/com/mints/street/api/MainApi.kt
View file @ 325a3528
...@@ -5,7 +5,6 @@ import com.mints.street.netwrok.common.HttpManager ...@@ -5,7 +5,6 @@ import com.mints.street.netwrok.common.HttpManager
import io.reactivex.Observable import io.reactivex.Observable
import retrofit2.Response import retrofit2.Response
import retrofit2.http.Body import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.POST import retrofit2.http.POST
/** /**
...@@ -142,7 +141,7 @@ interface MainApi { ...@@ -142,7 +141,7 @@ interface MainApi {
* 精选体验详情 * 精选体验详情
*/ */
@POST("na/getChooseExperienceData") @POST("na/getChooseExperienceData")
fun getChooseExperienceData(@Body vo:@JvmSuppressWildcards Map<String,Any>):Observable<Response<BaseResponse<DetailedBean>>> fun getChooseExperienceData(@Body vo:@JvmSuppressWildcards Map<String,String?>):Observable<Response<BaseResponse<DetailedBean>>>
/** /**
......
app/src/main/java/com/mints/street/common/Constant.kt
View file @ 325a3528
package com.mints.street.common package com.mints.street.common
import com.mints.street.AppApplication
import com.mints.street.BuildConfig import com.mints.street.BuildConfig
import com.mints.street.R
import me.goldze.mvvmhabit.base.AppManager
object Constant { object Constant {
/** /**
* app名称 * app名称
*/ */
const val MINTS_APP_NAME = "3D高清街景" val MINTS_APP_NAME:String? = AppApplication.mContext?.getString(R.string.app_name)
/** /**
* 应用包名 * 应用包名
*/ */
const val MINTS_PKG_NAME = "com.mints.street" val MINTS_PKG_NAME = AppApplication.mContext?.getString(R.string.package_name)
/** /**
* 第一次打开权限页面 * 第一次打开权限页面
...@@ -20,8 +23,11 @@ object Constant { ...@@ -20,8 +23,11 @@ object Constant {
const val FIRST_OPEN_PERMISSIONS = "first_open_permissions" const val FIRST_OPEN_PERMISSIONS = "first_open_permissions"
// 协议地址 // 协议地址
var REGISTER_URL = BuildConfig.MainIp + "map/register.html"//服务协议 var REGISTER_URL = "${BuildConfig.MainIp}${AppApplication.mContext
var PRIVACY_URL = BuildConfig.MainIp + "map/privacy.html"//隐私协议 ?.getString(R.string.register_url)}"//服务协议
var PRIVACY_URL = "${BuildConfig.MainIp}${AppApplication.mContext
?.getString(R.string.privacy_url)}"//隐私协议
/** /**
* 第一次授权 * 第一次授权
......
app/src/main/java/com/mints/street/main/googlemap/GoogleMapFragment.kt
View file @ 325a3528
...@@ -114,7 +114,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel ...@@ -114,7 +114,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
viewModel.getMapStyle() viewModel.getMapStyle()
} else { } else {
if (this@GoogleMapFragment.fragmentManager != null) { if (this@GoogleMapFragment.fragmentManager != null) {
dialogMapStyle?.show(this@GoogleMapFragment.fragmentManager!!, "dialogMapStyle") dialogMapStyle?.show(this.fragmentManager!!, "dialogMapStyle")
} }
} }
} //点击热门景点 } //点击热门景点
...@@ -440,7 +440,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel ...@@ -440,7 +440,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
//获取地图展示样式 //获取地图展示样式
viewModel.mapStyleSortBean.observe(this, Observer { viewModel.mapStyleSortBean.observe(this, Observer {
it?.apply { it?.apply {
dialogMapStyle = DialogMapStyle(context!!, it, dialogMapStyle = DialogMapStyle(context, it,
object : DialogMapStyle.OnMapStyleDataChange { object : DialogMapStyle.OnMapStyleDataChange {
override fun onMapStyleItemChange(type: String) { override fun onMapStyleItemChange(type: String) {
changeMapType(type) changeMapType(type)
......
app/src/main/java/com/mints/street/main/home/HomeButtonItemVM.kt
View file @ 325a3528
package com.mints.street.main.home package com.mints.street.main.home
import com.mints.street.webview.MintsWebViewActivity
import me.goldze.mvvmhabit.base.ItemViewModel import me.goldze.mvvmhabit.base.ItemViewModel
import me.goldze.mvvmhabit.binding.command.BindingAction import me.goldze.mvvmhabit.binding.command.BindingAction
import me.goldze.mvvmhabit.binding.command.BindingCommand import me.goldze.mvvmhabit.binding.command.BindingCommand
...@@ -8,8 +7,8 @@ import me.goldze.mvvmhabit.binding.command.BindingCommand ...@@ -8,8 +7,8 @@ import me.goldze.mvvmhabit.binding.command.BindingCommand
/** /**
* Created by 冯瑞雨 on 2021/7/9. * Created by 冯瑞雨 on 2021/7/9.
*/ */
class HomeButtonItemVM(viewModel: HomeViewModel,val name:String?,val image1:String, class HomeButtonItemVM(viewModel: HomeViewModel,val name:String?,val image1:String?,
val image2:String,val image3:String, val image2:String?,val image3:String?,
var latitude:String?,var longitude:String?,val isLook:Boolean?=false) : ItemViewModel<HomeViewModel?>(viewModel) { var latitude:String?,var longitude:String?,val isLook:Boolean?=false) : ItemViewModel<HomeViewModel?>(viewModel) {
val onItemClick = BindingCommand<Any?>(BindingAction { val onItemClick = BindingCommand<Any?>(BindingAction {
......
app/src/main/java/com/mints/street/main/home/HomeFragment.kt
View file @ 325a3528
...@@ -160,7 +160,7 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding, HomeViewModel>(), Senso ...@@ -160,7 +160,7 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding, HomeViewModel>(), Senso
}) })
viewModel.mapbeanData.observe(this, Observer<MapBean> { viewModel.mapbeanData.observe(this, Observer<MapBean> {
DialogUtils.showbennfitsDialog(context!!, viewModel, it.innerPlaces?.places) DialogUtils.showbennfitsDialog(context!!, viewModel, it.innerPlaces?.places)
}) })
} }
...@@ -462,7 +462,7 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding, HomeViewModel>(), Senso ...@@ -462,7 +462,7 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding, HomeViewModel>(), Senso
val builder = MapStatus.Builder() val builder = MapStatus.Builder()
builder.target(latLng).zoom(18.5f).overlook(-21f).rotate(0f) builder.target(latLng).zoom(18.5f).overlook(-21f).rotate(0f)
// 更新地图状态 // 更新地图状态
mBaiduMap!!.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()), 300) mBaiduMap?.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()), 300)
//mMarker.setPosition(latLng) //mMarker.setPosition(latLng)
} }
} }
\ No newline at end of file
app/src/main/java/com/mints/street/main/home/HomeViewModel.kt
View file @ 325a3528
...@@ -131,10 +131,10 @@ class HomeViewModel(application: Application) : BaseViewModel(application) { ...@@ -131,10 +131,10 @@ class HomeViewModel(application: Application) : BaseViewModel(application) {
} }
val bean = mapBean?.homePlaces?.places val bean = mapBean?.homePlaces?.places
bean?.iterator()?.forEach { item -> bean?.iterator()?.forEach { item ->
if (item.images == null || item.images?.size!! < 3) { if (item.images == null || item.images?.size?:0 < 3) {
return return
} }
addressList.add( addressList?.add(
HomeButtonItemVM( HomeButtonItemVM(
this, this,
item.name, item.name,
......
app/src/main/java/com/mints/street/main/my/AboutusActivity.kt
View file @ 325a3528
...@@ -40,7 +40,7 @@ class AboutusActivity : BaseActivity<ActivityAboutusBinding, AboutusViewModel>() ...@@ -40,7 +40,7 @@ class AboutusActivity : BaseActivity<ActivityAboutusBinding, AboutusViewModel>()
tv_title.setTextColor(Color.BLACK) tv_title.setTextColor(Color.BLACK)
iv_left_icon.setImageResource(R.mipmap.ic_arrow_back) iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
iv_left_icon.visibility = View.VISIBLE iv_left_icon.visibility = View.VISIBLE
tvAboutasVersion.text = "3D高清街景 v" + DeviceInfo.instance.versionName tvAboutasVersion.text = "${R.string.app_name } v${DeviceInfo.instance.versionName}"
tvAboutasService.setOnClickListener(this) tvAboutasService.setOnClickListener(this)
tvAboutasPolicy.setOnClickListener(this) tvAboutasPolicy.setOnClickListener(this)
......
app/src/main/java/com/mints/street/main/my/BindMobileActivity.kt
View file @ 325a3528
...@@ -53,7 +53,7 @@ class BindMobileActivity : BaseActivity<ActivityBindmobileBinding, BindMobileVie ...@@ -53,7 +53,7 @@ class BindMobileActivity : BaseActivity<ActivityBindmobileBinding, BindMobileVie
// mobile = UserManager.getInstance().mobile // mobile = UserManager.getInstance().mobile
if (!TextUtils.isEmpty(mobile)) { if (!TextUtils.isEmpty(mobile)) {
etLoginMobile.setText(mobile) etLoginMobile.setText(mobile)
etLoginMobile.setSelection(mobile!!.length + 2) etLoginMobile.setSelection(mobile?.length?:0 + 2)
} }
} }
......
app/src/main/java/com/mints/street/main/my/OpenvipActivity.kt
View file @ 325a3528
...@@ -294,16 +294,18 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>() ...@@ -294,16 +294,18 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
//设置选中标记 //设置选中标记
private fun setpayweyflag(textflag: CharSequence?) { private fun setpayweyflag(textflag: CharSequence?) {
if (textflag!!.equals("微信支付")) { if (textflag != null) {
currentPayType = "WEIXIN" if (textflag.equals("微信支付")) {
} else { currentPayType = "WEIXIN"
currentPayType = "ALIPAY" } else {
currentPayType = "ALIPAY"
}
} }
} }
private fun payVip() { private fun payVip() {
if (vipList != null && vipList!!.size > 0 && gridPaymentAdapter != null) { if (vipList != null && vipList?.size?:0 > 0 && gridPaymentAdapter != null) {
if (TextUtils.equals("WEIXIN", currentPayType)) { if (TextUtils.equals("WEIXIN", currentPayType)) {
viewModel.getVipPayParams("WEIXIN", gridPaymentAdapter?.getPid()) viewModel.getVipPayParams("WEIXIN", gridPaymentAdapter?.getPid())
} else { } else {
......
app/src/main/java/com/mints/street/main/vr/DetailedActivity.kt
View file @ 325a3528
package com.mints.street.main.vr package com.mints.street.main.vr
import android.content.Intent import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.widget.TextView
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import com.alibaba.android.vlayout.DelegateAdapter import com.alibaba.android.vlayout.DelegateAdapter
import com.alibaba.android.vlayout.VirtualLayoutManager import com.alibaba.android.vlayout.VirtualLayoutManager
...@@ -38,7 +36,7 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel ...@@ -38,7 +36,7 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel
private fun initView() { private fun initView() {
//初始化布局管理器 //初始化布局管理器
// if (this == null) return // if (this == null) return
vLayout = VirtualLayoutManager(this!!); vLayout = VirtualLayoutManager(this);
mAdapter = DelegateAdapter(vLayout, false) mAdapter = DelegateAdapter(vLayout, false)
binding.listview.layoutManager = vLayout binding.listview.layoutManager = vLayout
...@@ -54,7 +52,7 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel ...@@ -54,7 +52,7 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
myintent =getIntent(); myintent =getIntent();
viewModel.getChooseExperienceData(myintent?.getStringExtra("area")!!) viewModel.getChooseExperienceData(myintent?.getStringExtra("area"))
} }
override fun initViewObservable() { override fun initViewObservable() {
...@@ -67,7 +65,7 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel ...@@ -67,7 +65,7 @@ class DetailedActivity : BaseActivity<ActivityDetailedBinding, DetailedViewModel
gridVrMapAdapter?.list = it.list gridVrMapAdapter?.list = it.list
mAdapter?.notifyDataSetChanged() mAdapter?.notifyDataSetChanged()
binding.tvIntroduce.text=it.desc binding.tvIntroduce.text=it.desc
binding.tvName.text=myintent?.getStringExtra("area")!! binding.tvName.text=myintent?.getStringExtra("area")
}) })
} }
} }
\ No newline at end of file
app/src/main/java/com/mints/street/main/vr/DetailedViewModel.kt
View file @ 325a3528
...@@ -17,8 +17,8 @@ class DetailedViewModel(application: Application) : BaseViewModel(application) { ...@@ -17,8 +17,8 @@ class DetailedViewModel(application: Application) : BaseViewModel(application) {
val detailbean: MutableLiveData<DetailedBean> = MutableLiveData() val detailbean: MutableLiveData<DetailedBean> = MutableLiveData()
fun getChooseExperienceData(name:String){ fun getChooseExperienceData(name:String?){
val vo = HashMap<String, Any>() val vo = HashMap<String, String?>()
vo["area"] = name vo["area"] = name
ApiModel.getChooseExperienceData(lifecycleProvider,vo).safeSubscribe( ApiModel.getChooseExperienceData(lifecycleProvider,vo).safeSubscribe(
object : HttpSubscribeImpl<BaseResponse<DetailedBean>>( object : HttpSubscribeImpl<BaseResponse<DetailedBean>>(
......
app/src/main/java/com/mints/street/main/vr/FreeZoneFragment.kt
View file @ 325a3528
...@@ -9,13 +9,9 @@ import com.alibaba.android.vlayout.VirtualLayoutManager ...@@ -9,13 +9,9 @@ import com.alibaba.android.vlayout.VirtualLayoutManager
import com.fry.base.base.BaseFragment import com.fry.base.base.BaseFragment
import com.mints.street.BR import com.mints.street.BR
import com.mints.street.R import com.mints.street.R
import com.mints.street.adapter.EnterDestinationAdapter
import com.mints.street.adapter.GridMapAdapter import com.mints.street.adapter.GridMapAdapter
import com.mints.street.bean.VrmapBean import com.mints.street.bean.VrmapBean
import com.mints.street.databinding.FragmentFreeZoneBinding import com.mints.street.databinding.FragmentFreeZoneBinding
import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.listener.OnRefreshListener
import me.goldze.mvvmhabit.utils.KLog
/** /**
* Created by 冯瑞雨 on 2021/7/9. * Created by 冯瑞雨 on 2021/7/9.
...@@ -65,7 +61,7 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel ...@@ -65,7 +61,7 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel
// mAdapter?.addAdapter(enterDestinationAdapter) // mAdapter?.addAdapter(enterDestinationAdapter)
// } // }
if (gridMapAdapter == null){ if (gridMapAdapter == null){
gridMapAdapter = GridMapAdapter(context!!, it.internal) gridMapAdapter = GridMapAdapter(context, it.internal)
mAdapter?.addAdapter(gridMapAdapter) mAdapter?.addAdapter(gridMapAdapter)
} }
gridMapAdapter?.list = it.internal gridMapAdapter?.list = it.internal
......
app/src/main/java/com/mints/street/model/ApiModel.kt
View file @ 325a3528
...@@ -109,7 +109,7 @@ object ApiModel { ...@@ -109,7 +109,7 @@ object ApiModel {
/** /**
* 精选体验详情 * 精选体验详情
*/ */
fun getChooseExperienceData(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, Any>):Observable<Response<BaseResponse<DetailedBean>>>{ fun getChooseExperienceData(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, String?>):Observable<Response<BaseResponse<DetailedBean>>>{
return HttpManager.getInstance().execute(lifecycleProvider,MainApi.newInstance().getChooseExperienceData(map)) return HttpManager.getInstance().execute(lifecycleProvider,MainApi.newInstance().getChooseExperienceData(map))
} }
/** /**
......
app/src/main/java/com/mints/street/widget/dialog/DialogMapStyle.kt
View file @ 325a3528
...@@ -6,7 +6,6 @@ import android.graphics.drawable.ColorDrawable ...@@ -6,7 +6,6 @@ import android.graphics.drawable.ColorDrawable
import android.os.Bundle import android.os.Bundle
import android.util.DisplayMetrics import android.util.DisplayMetrics
import android.view.* import android.view.*
import androidx.lifecycle.MutableLiveData
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.alibaba.android.vlayout.DelegateAdapter import com.alibaba.android.vlayout.DelegateAdapter
import com.alibaba.android.vlayout.VirtualLayoutManager import com.alibaba.android.vlayout.VirtualLayoutManager
...@@ -23,8 +22,8 @@ import com.mints.street.bean.MapStyleSortBean ...@@ -23,8 +22,8 @@ import com.mints.street.bean.MapStyleSortBean
* 弹出框 * 弹出框
*/ */
class DialogMapStyle( class DialogMapStyle(
var mContext: Context, var mContext: Context?,
var mapStyleBean: MapStyleSortBean?,val onMapStyleDataChange :OnMapStyleDataChange?=null var mapStyleBean: MapStyleSortBean?, val onMapStyleDataChange:OnMapStyleDataChange?=null
) : BaseDialogFragment() { ) : BaseDialogFragment() {
private var recycler: RecyclerView? = null private var recycler: RecyclerView? = null
private var vLayout: VirtualLayoutManager? = null private var vLayout: VirtualLayoutManager? = null
......
app/src/main/java/com/mints/street/widget/dialog/DialogUtils.kt
View file @ 325a3528
...@@ -6,7 +6,6 @@ import android.content.DialogInterface ...@@ -6,7 +6,6 @@ import android.content.DialogInterface
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.provider.Settings import android.provider.Settings
import com.mints.street.adapter.GridBenfitViewModel
import com.mints.street.bean.Places import com.mints.street.bean.Places
import com.mints.street.main.home.HomeViewModel import com.mints.street.main.home.HomeViewModel
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
......
app/src/main/java/com/mints/street/widget/dialog/HotViewDialog.kt
View file @ 325a3528
...@@ -14,12 +14,11 @@ import com.google.android.material.bottomsheet.BottomSheetDialog ...@@ -14,12 +14,11 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
import com.mints.street.R import com.mints.street.R
import com.mints.street.adapter.ItemHotViewAdapter import com.mints.street.adapter.ItemHotViewAdapter
import com.mints.street.bean.HotViewBean import com.mints.street.bean.HotViewBean
import com.mints.street.main.home.HomeFragment
import com.mints.street.main.home.HomeViewModel import com.mints.street.main.home.HomeViewModel
import com.mints.street.widget.GridItemDecoration import com.mints.street.widget.GridItemDecoration
class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurrentLat:Double, class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurrentLat: Double,
mCurrentLon:Double,fragment: Fragment, val onHotItemClick: OnHotItemClick?=null) { mCurrentLon: Double, fragment: Fragment, val onHotItemClick: OnHotItemClick? = null) {
private var mBottomSheetDialog: BottomSheetDialog? = null private var mBottomSheetDialog: BottomSheetDialog? = null
private var context: FragmentActivity private var context: FragmentActivity
...@@ -37,8 +36,8 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren ...@@ -37,8 +36,8 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren
this.context = context this.context = context
this.viewModel = viewModel this.viewModel = viewModel
this.fragment = fragment this.fragment = fragment
this.mCurrentLat=mCurrentLat this.mCurrentLat = mCurrentLat
this.mCurrentLon=mCurrentLon this.mCurrentLon = mCurrentLon
} }
// //
...@@ -48,8 +47,11 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren ...@@ -48,8 +47,11 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren
if (mBottomSheetDialog != null) return this if (mBottomSheetDialog != null) return this
mBottomSheetDialog = BottomSheetDialog(context) mBottomSheetDialog = BottomSheetDialog(context)
val view1: View = LayoutInflater.from(context).inflate(R.layout.layout_hotview, null) val view1: View = LayoutInflater.from(context).inflate(R.layout.layout_hotview, null)
mBottomSheetDialog!!.setContentView(view1) if (mBottomSheetDialog != null) {
mBottomSheetDialog!!.window!!.findViewById<View>(R.id.design_bottom_sheet).setBackgroundColor(Color.TRANSPARENT) mBottomSheetDialog?.setContentView(view1)
mBottomSheetDialog?.window?.findViewById<View>(R.id.design_bottom_sheet)?.setBackgroundColor(Color.TRANSPARENT)
}
val iv_close: ImageView = view1.findViewById(R.id.iv_close) val iv_close: ImageView = view1.findViewById(R.id.iv_close)
val recycler_view: RecyclerView = view1.findViewById(R.id.recycler_view) val recycler_view: RecyclerView = view1.findViewById(R.id.recycler_view)
//添加下划线 //添加下划线
...@@ -65,13 +67,13 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren ...@@ -65,13 +67,13 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren
viewModel?.hotviewData?.observe(fragment!!, androidx.lifecycle.Observer { viewModel?.hotviewData?.observe(fragment!!, androidx.lifecycle.Observer {
if (itemHotViewAdapter == null) { if (itemHotViewAdapter == null) {
itemHotViewAdapter = ItemHotViewAdapter(context, mBottomSheetDialog, itemHotViewAdapter = ItemHotViewAdapter(context, mBottomSheetDialog,
it.list, viewModel!!,mCurrentLat!!,mCurrentLon!!,onHotItemClick) it.list, viewModel!!, mCurrentLat!!, mCurrentLon!!, onHotItemClick)
mAdapter?.addAdapter(itemHotViewAdapter) mAdapter?.addAdapter(itemHotViewAdapter)
} }
mAdapter?.notifyDataSetChanged() mAdapter?.notifyDataSetChanged()
}) })
iv_close.setOnClickListener { iv_close.setOnClickListener {
mBottomSheetDialog!!.dismiss() if (mBottomSheetDialog!=null) mBottomSheetDialog?.dismiss()
} }
return this return this
...@@ -81,14 +83,15 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren ...@@ -81,14 +83,15 @@ class HotViewDialog(context: FragmentActivity, viewModel: HomeViewModel, mCurren
* 展示 * 展示
*/ */
fun show() { fun show() {
mBottomSheetDialog!!.show() mBottomSheetDialog?.show()
} }
fun onDestroy() { fun onDestroy() {
mBottomSheetDialog = null mBottomSheetDialog = null
} }
interface OnHotItemClick { interface OnHotItemClick {
fun onItemClick(position: Int,itemBean: HotViewBean.Dataslist?) fun onItemClick(position: Int, itemBean: HotViewBean.Dataslist?)
} }
} }
app/src/main/java/com/mints/street/widget/dialog/ShowBenfitDialog.kt
View file @ 325a3528
...@@ -10,13 +10,12 @@ import androidx.recyclerview.widget.RecyclerView ...@@ -10,13 +10,12 @@ import androidx.recyclerview.widget.RecyclerView
import com.alibaba.android.vlayout.DelegateAdapter import com.alibaba.android.vlayout.DelegateAdapter
import com.alibaba.android.vlayout.VirtualLayoutManager import com.alibaba.android.vlayout.VirtualLayoutManager
import com.mints.street.R import com.mints.street.R
import com.mints.street.adapter.GridBenfitViewModel import com.mints.street.adapter.GridBenfitAdapter
import com.mints.street.bean.Places import com.mints.street.bean.Places
import com.mints.street.main.home.HomeViewModel import com.mints.street.main.home.HomeViewModel
import me.goldze.mvvmhabit.utils.RxUtils import me.goldze.mvvmhabit.utils.RxUtils
import com.mints.street.adapter.GridBenfitAdapter as GridBenfitAdapter
class ShowBenfitDialog(context: Context, val viewMode: HomeViewModel, places: List<Places>?) : class ShowBenfitDialog(context: Context, val viewMode: HomeViewModel?, places: List<Places>?) :
Dialog(context, R.style.dialog) { Dialog(context, R.style.dialog) {
private val lp: WindowManager.LayoutParams private val lp: WindowManager.LayoutParams
......
app/src/main/java/com/mints/street/widget/dialog/UpgradeVipDialog.kt
View file @ 325a3528
...@@ -8,12 +8,8 @@ import android.view.KeyEvent ...@@ -8,12 +8,8 @@ import android.view.KeyEvent
import android.view.WindowManager import android.view.WindowManager
import android.widget.Button import android.widget.Button
import android.widget.ImageView import android.widget.ImageView
import androidx.fragment.app.FragmentActivity
import com.alibaba.android.vlayout.DelegateAdapter
import com.alibaba.android.vlayout.VirtualLayoutManager
import com.blankj.utilcode.util.ActivityUtils.startActivity import com.blankj.utilcode.util.ActivityUtils.startActivity
import com.mints.street.R import com.mints.street.R
import com.mints.street.adapter.GridBenfitAdapter
import com.mints.street.main.my.OpenvipActivity import com.mints.street.main.my.OpenvipActivity
import me.goldze.mvvmhabit.utils.RxUtils import me.goldze.mvvmhabit.utils.RxUtils
......
app/src/main/java/com/mints/street/widget/dialog/ViewRecommedDialog.kt
View file @ 325a3528
...@@ -5,73 +5,66 @@ import android.content.Intent ...@@ -5,73 +5,66 @@ import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.fragment.app.FragmentActivity
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.RecyclerView
import com.alibaba.android.vlayout.DelegateAdapter
import com.alibaba.android.vlayout.VirtualLayoutManager
import com.baidu.mapapi.model.LatLng import com.baidu.mapapi.model.LatLng
import com.baidu.mapapi.utils.DistanceUtil import com.baidu.mapapi.utils.DistanceUtil
import com.fry.base.utils.ImageLoader import com.fry.base.utils.ImageLoader
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
import com.mints.street.R import com.mints.street.R
import com.mints.street.adapter.ItemHotViewAdapter
import com.mints.street.bean.GPS import com.mints.street.bean.GPS
import com.mints.street.bean.ViewRecommedBean import com.mints.street.bean.ViewRecommedBean
import com.mints.street.main.home.HomeFragment
import com.mints.street.main.home.HomeViewModel import com.mints.street.main.home.HomeViewModel
import com.mints.street.main.my.OpenvipActivity import com.mints.street.main.my.OpenvipActivity
import com.mints.street.manager.UserManager import com.mints.street.manager.UserManager
import com.mints.street.webview.MintsWebViewActivity
import com.mints.street.widget.GridItemDecoration
import com.mints.street.widget.XCRoundRectImageView import com.mints.street.widget.XCRoundRectImageView
import me.goldze.mvvmhabit.base.AppManager import me.goldze.mvvmhabit.base.AppManager
import me.goldze.mvvmhabit.utils.RxUtils import me.goldze.mvvmhabit.utils.RxUtils
import java.text.DecimalFormat import java.text.DecimalFormat
class ViewRecommedDialog (context: Context?, bean: ViewRecommedBean?,gps:GPS?,homeViewModel: HomeViewModel) { class ViewRecommedDialog(context: Context?, bean: ViewRecommedBean?, gps: GPS?, homeViewModel: HomeViewModel) {
private var mBottomSheetDialog: BottomSheetDialog?=null private var mBottomSheetDialog: BottomSheetDialog? = null
private var context: Context?=null private var context: Context? = null
private var bean: ViewRecommedBean?=null private var bean: ViewRecommedBean? = null
private var homeViewModel: HomeViewModel?=null private var homeViewModel: HomeViewModel? = null
private var gps: GPS?=null private var gps: GPS? = null
init { init {
this.context=context this.context = context
this.bean=bean this.bean = bean
this.gps=gps this.gps = gps
this.homeViewModel=homeViewModel this.homeViewModel = homeViewModel
} }
// //
fun init(): ViewRecommedDialog { fun init(): ViewRecommedDialog {
//创建弹窗 //创建弹窗
if (mBottomSheetDialog!=null) return this if (mBottomSheetDialog != null) return this
mBottomSheetDialog= BottomSheetDialog(context!!) mBottomSheetDialog = BottomSheetDialog(context!!)
val view1: View = LayoutInflater.from(context).inflate(R.layout.layout_viewrecommed,null) val view1: View = LayoutInflater.from(context).inflate(R.layout.layout_viewrecommed, null)
mBottomSheetDialog!!.setContentView(view1) if (mBottomSheetDialog != null) {
mBottomSheetDialog!!.window!!.findViewById<View>(R.id.design_bottom_sheet).setBackgroundColor(Color.TRANSPARENT) mBottomSheetDialog?.setContentView(view1)
val viewname: TextView =view1.findViewById(R.id.viewname) mBottomSheetDialog?.window?.findViewById<View>(R.id.design_bottom_sheet)?.setBackgroundColor(Color.TRANSPARENT)
val tvDistance: TextView =view1.findViewById(R.id.tv_distance) }
val image1: XCRoundRectImageView =view1.findViewById(R.id.image1) val viewname: TextView = view1.findViewById(R.id.viewname)
val tvDescribe: TextView =view1.findViewById(R.id.tv_describe) val tvDistance: TextView = view1.findViewById(R.id.tv_distance)
val textView5: TextView =view1.findViewById(R.id.textView5) val image1: XCRoundRectImageView = view1.findViewById(R.id.image1)
val tvDescribe: TextView = view1.findViewById(R.id.tv_describe)
val textView5: TextView = view1.findViewById(R.id.textView5)
viewname.text = bean?.name viewname.text = bean?.name
val a = DistanceUtil.getDistance(LatLng(bean?.blat?.toDouble()?:0.0, val a = DistanceUtil.getDistance(LatLng(bean?.blat?.toDouble() ?: 0.0,
bean?.blng?.toDouble()?:0.0) ,LatLng( bean?.blng?.toDouble() ?: 0.0), LatLng(
gps?.lat?:0.0,gps?.lng?:0.0)) gps?.lat ?: 0.0, gps?.lng ?: 0.0))
tvDistance.text = "距离${DecimalFormat("0.00").format(a/1000).toString()}km" tvDistance.text = "距离${DecimalFormat("0.00").format(a / 1000).toString()}km"
ImageLoader.ImageBuilder.with(context) ImageLoader.ImageBuilder.with(context)
.setUrl(bean?.img).setTargetView(image1).start() .setUrl(bean?.img).setTargetView(image1).start()
tvDescribe.text = bean?.desc tvDescribe.text = bean?.desc
RxUtils.onMultiClick(textView5){ RxUtils.onMultiClick(textView5) {
if(UserManager.INSTANCE.getVipFlag()){ if (UserManager.INSTANCE.getVipFlag()) {
homeViewModel?.authorized( bean?.bvid,bean?.name) homeViewModel?.authorized(bean?.bvid, bean?.name)
}else{ } else {
AppManager.getAppManager().currentActivity?.apply { AppManager.getAppManager().currentActivity?.apply {
this.startActivity(Intent(this, OpenvipActivity::class.java)) this.startActivity(Intent(this, OpenvipActivity::class.java))
} }
...@@ -84,7 +77,7 @@ class ViewRecommedDialog (context: Context?, bean: ViewRecommedBean?,gps:GPS?,ho ...@@ -84,7 +77,7 @@ class ViewRecommedDialog (context: Context?, bean: ViewRecommedBean?,gps:GPS?,ho
* 展示 * 展示
*/ */
fun show() { fun show() {
mBottomSheetDialog!!.show() mBottomSheetDialog?.show()
} }
fun onDestroy() { fun onDestroy() {
......
app/src/main/java/com/mints/street/widget/dialog/WxLoginDialog.kt
View file @ 325a3528
...@@ -53,9 +53,10 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener { ...@@ -53,9 +53,10 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener {
mBottomSheetDialog = BottomSheetDialog(context) mBottomSheetDialog = BottomSheetDialog(context)
val view1: View = LayoutInflater.from(context).inflate(R.layout.layout_popupwindow, null) val view1: View = LayoutInflater.from(context).inflate(R.layout.layout_popupwindow, null)
mBottomSheetDialog!!.setContentView(view1) if (mBottomSheetDialog!=null) {
mBottomSheetDialog!!.window!!.findViewById<View>(design_bottom_sheet).setBackgroundColor(Color.TRANSPARENT) mBottomSheetDialog?.setContentView(view1)
mBottomSheetDialog?.window?.findViewById<View>(design_bottom_sheet)?.setBackgroundColor(Color.TRANSPARENT)
}
val iv_weixin: ImageView = view1.findViewById(R.id.iv_weixin) val iv_weixin: ImageView = view1.findViewById(R.id.iv_weixin)
val ly_phone: LinearLayoutCompat = view1.findViewById(R.id.ly_phone) val ly_phone: LinearLayoutCompat = view1.findViewById(R.id.ly_phone)
val cb_checked: CheckBox = view1.findViewById(R.id.cb_checked) val cb_checked: CheckBox = view1.findViewById(R.id.cb_checked)
...@@ -69,7 +70,7 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener { ...@@ -69,7 +70,7 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener {
MintsWebViewActivity.startWebView(name = "隐私协议", url = Constant.PRIVACY_URL) MintsWebViewActivity.startWebView(name = "隐私协议", url = Constant.PRIVACY_URL)
} }
iv_weixin.setOnClickListener { iv_weixin.setOnClickListener {
if (cb_checked!!.isChecked) { if (cb_checked.isChecked) {
val wechat = ShareSDK.getPlatform(Wechat.NAME) val wechat = ShareSDK.getPlatform(Wechat.NAME)
if (!wechat.isClientValid) { if (!wechat.isClientValid) {
ToastUtils.showShort("请先安装微信") ToastUtils.showShort("请先安装微信")
...@@ -83,19 +84,23 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener { ...@@ -83,19 +84,23 @@ class WxLoginDialog(context: FragmentActivity) : OnLoginListener {
loginApi.setPlatform(Wechat.NAME) loginApi.setPlatform(Wechat.NAME)
loginApi.login(context) loginApi.login(context)
} else { } else {
DialogUtils.showPermissionDialog(context,"设备") DialogUtils.showPermissionDialog(context, "设备")
} }
}) })
mBottomSheetDialog!!.dismiss() if (mBottomSheetDialog != null) {
mBottomSheetDialog?.dismiss()
}
} else { } else {
ToastUtils.showLong("请先同意用户协议与隐私政策") ToastUtils.showLong("请先同意用户协议与隐私政策")
} }
} }
RxUtils.onMultiClick(ly_phone) { RxUtils.onMultiClick(ly_phone) {
if (cb_checked!!.isChecked) { if (cb_checked.isChecked) {
context.startActivity(Intent(context, LoginActivity::class.java)) context.startActivity(Intent(context, LoginActivity::class.java))
mBottomSheetDialog!!.dismiss() if (mBottomSheetDialog != null) {
mBottomSheetDialog?.dismiss()
}
} else { } else {
ToastUtils.showLong("请先同意用户协议与隐私政策") ToastUtils.showLong("请先同意用户协议与隐私政策")
} }
......
app/src/main/res/layout/activity_permissions.xml
View file @ 325a3528
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:text="3D高清街景" android:text="@string/app_name"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="25dp" /> android:textSize="25dp" />
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="您的个人信息将受到严格的保密，3D高清街景不会将您的个人信息泄露给他人。您也可以在系统设置中关闭授权，但可能影响部分功能使用。" android:text="@string/activity_premissions_content"
android:layout_margin="10dp" android:layout_margin="10dp"
android:textColor="#CD000000" /> android:textColor="#CD000000" />
......
app/src/main/res/layout/dialog_backvip.xml
View file @ 325a3528
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="5dp" android:elevation="5dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:text="3D高清街景会员吗？" android:text="@string/dialog_is_backvip"
android:textColor="#8E5832" android:textColor="#8E5832"
android:textSize="26sp" android:textSize="26sp"
android:textStyle="bold" android:textStyle="bold"
......
app/src/main/res/layout/dialog_power.xml
View file @ 325a3528
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:text="我们依据最新的法律,向您说明3D高清街景软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。" android:text="@string/dialog_back_vip_explanation"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="14sp" /> android:textSize="14sp" />
......
app/src/main/res/values/strings.xml
View file @ 325a3528
<resources> <resources>
<string name="app_name">3D高清街景</string> <string name="app_name">3D高清街景</string>
<string name="app_sign">61117d7a</string>
<string name="package_name">com.mints.street</string>
<string name="register_url">map/register.html</string>
<string name="privacy_url">map/privacy.html</string>
<string name="activity_premissions_content">您的个人信息将受到严格的保密，3D高清街景不会将您的个
人信息泄露给他人。您也可以在系统设置中关闭授权，但可能影响部分功能使用。</string>
<string name="dialog_is_backvip">3D高清街景会员吗？</string>
<string name="dialog_back_vip_explanation">我们依据最新的法律,向您说明3D高清街景软件的隐私政策,特向您推送本提示。
请您阅读并充分理解相关条款。</string>
</resources> </resources>
\ No newline at end of file
gradle.properties
View file @ 325a3528
...@@ -24,6 +24,17 @@ RELEASE_KEY_ALIAS=mints_street ...@@ -24,6 +24,17 @@ RELEASE_KEY_ALIAS=mints_street
RELEASE_STORE_PASSWORD=mints.street RELEASE_STORE_PASSWORD=mints.street
RELEASE_STORE_FILE=mints_street.jks RELEASE_STORE_FILE=mints_street.jks
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 #ShareSDK
RELEASE_SHARESDK_KEY=m33e5da5ced828 RELEASE_SHARESDK_KEY=m33e5da5ced828
RELEASE_SHARESDK_SECRET=08ce5b656e724e793787bd9f6d465ae8 RELEASE_SHARESDK_SECRET=08ce5b656e724e793787bd9f6d465ae8
......
library_base/src/main/AndroidManifest.xml
View file @ 325a3528
...@@ -26,15 +26,15 @@ ...@@ -26,15 +26,15 @@
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<!--Android7App私有文件授权--> <!--Android7App私有文件授权-->
<provider <!-- <provider-->
android:name="com.fry.base.provider.BaseFileProvider" <!-- android:name="com.fry.base.provider.BaseFileProvider"-->
android:authorities="com.base.android.android7.fileprovider" <!-- android:authorities="com.base.android.android7.fileprovider"-->
android:exported="false" <!-- android:exported="false"-->
android:grantUriPermissions="true"> <!-- android:grantUriPermissions="true">-->
<meta-data <!-- <meta-data-->
android:name="android.support.FILE_PROVIDER_PATHS" <!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
android:resource="@xml/file_provider_paths" /> <!-- android:resource="@xml/file_provider_paths" />-->
</provider> <!-- </provider>-->
</application> </application>
</manifest> </manifest>
library_base/src/main/java/com/fry/base/recycler_view/adapter.kt
View file @ 325a3528
...@@ -95,14 +95,16 @@ abstract class VHModel { ...@@ -95,14 +95,16 @@ abstract class VHModel {
class VH<Model : VHModel>(view: View) : class VH<Model : VHModel>(view: View) :
RecyclerView.ViewHolder(view) { RecyclerView.ViewHolder(view) {
private val binding = DataBindingUtil.bind<ViewDataBinding>(view)!! private val binding = DataBindingUtil.bind<ViewDataBinding>(view)
private var model: Model? = null private var model: Model? = null
private var isBinding: Boolean = false private var isBinding: Boolean = false
fun onBind(newModel: Model) { fun onBind(newModel: Model) {
val oldModel = model val oldModel = model
oldModel?.onUnBind() oldModel?.onUnBind()
newModel.onBind(binding) if (binding != null) {
newModel.onBind(binding)
}
model = newModel model = newModel
isBinding = true isBinding = true
} }
......
library_base/src/main/java/com/fry/base/ui/widget/HorizontalScrollView.kt
View file @ 325a3528
...@@ -19,7 +19,7 @@ class HorizontalScrollView (context: Context, attributeSet: AttributeSet): Horiz ...@@ -19,7 +19,7 @@ class HorizontalScrollView (context: Context, attributeSet: AttributeSet): Horiz
override fun onScrollChanged(l: Int, t: Int, oldl: Int, oldt: Int) { override fun onScrollChanged(l: Int, t: Int, oldl: Int, oldt: Int) {
super.onScrollChanged(l, t, oldl, oldt) super.onScrollChanged(l, t, oldl, oldt)
if (mListener != null) { if (mListener != null) {
mListener!!(this, l, t, oldl, oldt) mListener?.invoke(this, l, t, oldl, oldt)
} }
} }
} }
\ No newline at end of file
library_base/src/main/res/values/strings.xml
View file @ 325a3528
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<string name="bottom_name_home">首页</string> <string name="bottom_name_home">首页</string>
<string name="bottom_name_my">个人中心</string> <string name="bottom_name_my">个人中心</string>
<string name="app_sign">61117d7a</string>
<string name="str_immediately_login">立即登录</string> <string name="str_immediately_login">立即登录</string>
......
mvvmhabit/src/main/AndroidManifest.xml
View file @ 325a3528
...@@ -8,18 +8,16 @@ ...@@ -8,18 +8,16 @@
<application> <application>
<activity <activity
android:name=".base.ContainerActivity" android:name=".base.ContainerActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"></activity>
></activity>
<activity <activity
android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
android:name=".crash.DefaultErrorActivity" android:name=".crash.DefaultErrorActivity"
android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
android:process=":error_activity" android:process=":error_activity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
/>
<provider <provider
android:name=".crash.CaocInitProvider" android:name=".crash.CaocInitProvider"
android:authorities="${applicationId}.customactivityoncrashinitprovider" android:authorities="${applicationId}.5g.customactivityoncrashinitprovider"
android:exported="false" android:exported="false"
android:initOrder="101" /> android:initOrder="101" />
</application> </application>
......
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