编译错误修改。

登录成功先清除sp缓存,防止数据错乱
处理人脸识别错误
This commit is contained in:
jinyuer
2021-12-08 15:27:07 +08:00
parent 8e5788d6df
commit 5234933749
14 changed files with 161 additions and 76 deletions

2
.idea/compiler.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="1.8" />
</component> </component>
</project> </project>

2
.idea/misc.xml generated
View File

@@ -20,7 +20,7 @@
<option name="priority" value="Medium" /> <option name="priority" value="Medium" />
<option name="excludeFilter" value="" /> <option name="excludeFilter" value="" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

1
.idea/modules.xml generated
View File

@@ -5,7 +5,6 @@
<module fileurl="file://$PROJECT_DIR$/.idea/modules/HouseProperty.iml" filepath="$PROJECT_DIR$/.idea/modules/HouseProperty.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/HouseProperty.iml" filepath="$PROJECT_DIR$/.idea/modules/HouseProperty.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/picture_library/HouseProperty.picture_library.iml" filepath="$PROJECT_DIR$/.idea/modules/picture_library/HouseProperty.picture_library.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

View File

@@ -25,11 +25,12 @@ android {
enabled = true enabled = true
} }
compileSdkVersion 31 compileSdkVersion 30
buildToolsVersion '29.0.2' buildToolsVersion '29.0.2'
aaptOptions.cruncherEnabled = false aaptOptions.cruncherEnabled = false
aaptOptions.useNewCruncher = false aaptOptions.useNewCruncher = false
defaultConfig { defaultConfig {
// multiDexEnabled true // multiDexEnabled true
javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } } javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
// multiDexEnabled true // multiDexEnabled true
@@ -51,6 +52,7 @@ android {
JPUSH_APPKEY : "4b6e03f9cc9466efbc0b2528", //JPush 上注册的包名对应的 Appkey. JPUSH_APPKEY : "4b6e03f9cc9466efbc0b2528", //JPush 上注册的包名对应的 Appkey.
JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可. JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
] ]
} }
buildTypes { buildTypes {
release { release {
@@ -75,14 +77,13 @@ android {
jniLibs.srcDirs = ['libs'] jniLibs.srcDirs = ['libs']
} }
} }
dependencies { dependencies {
implementation 'com.android.support:multidex:1.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
testImplementation 'junit:junit:4.12'
implementation 'com.zhy:percent-support-extends:1.0.1' implementation 'com.zhy:percent-support-extends:1.0.1'
implementation 'com.arialyy.aria:Aria:3.1.1' implementation 'com.arialyy.aria:Aria:3.1.1'
implementation 'com.jcodecraeer:xrecyclerview:1.3.2' implementation 'com.jcodecraeer:xrecyclerview:1.3.2'
@@ -110,6 +111,7 @@ android {
implementation 'com.nineoldandroids:library:2.4.0' implementation 'com.nineoldandroids:library:2.4.0'
implementation 'fm.jiecao:jiecaovideoplayer:4.6.3' implementation 'fm.jiecao:jiecaovideoplayer:4.6.3'
implementation 'androidx.multidex:multidex:2.0.1'
//noinspection GradleCompatible //noinspection GradleCompatible
implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar' implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
@@ -159,9 +161,13 @@ android {
api 'io.reactivex.rxjava2:rxjava:2.1.5' api 'io.reactivex.rxjava2:rxjava:2.1.5'
implementation 'me.jessyan:autosize:1.1.2' implementation 'me.jessyan:autosize:1.1.2'
implementation 'androidx.camera:camera-view:1.0.0-alpha30' // implementation 'androidx.camera:camera-view:1.0.0-alpha30'
// implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'//视频图片选择器 // implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'//视频图片选择器
implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc10' implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
} }
} }

View File

@@ -67,7 +67,7 @@
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<application <application
android:requestLegacyExternalStorage="true"
android:name="com.sl.house_property.MyApplication" android:name="com.sl.house_property.MyApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
@@ -129,6 +129,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.sl.house_property.AliPayTestActivity" <activity android:name="com.sl.house_property.AliPayTestActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
> >
<!--<intent-filter>--> <!--<intent-filter>-->
@@ -139,47 +140,57 @@
<activity <activity
android:name="com.sl.house_property.MakeErrorActivity" android:name="com.sl.house_property.MakeErrorActivity"
android:theme="@style/myErrorDialogTheme" android:theme="@style/myErrorDialogTheme"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.sl.house_property.WebActivitytwo" android:name="com.sl.house_property.WebActivitytwo"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:theme="@style/TAppTheme" android:theme="@style/TAppTheme"
/> />
<activity <activity
android:name="com.sl.house_property.MainTabActivity" android:name="com.sl.house_property.MainTabActivity"
android:launchMode="standard" android:launchMode="standard"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/TAppTheme" /> android:theme="@style/TAppTheme" />
<activity <activity
android:name="com.sl.house_property.LogoActivity" android:name="com.sl.house_property.LogoActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
<activity <activity
android:name="utils.SelectPicDanimicActivity" android:name="utils.SelectPicDanimicActivity"
android:theme="@style/myDialogThememakephoto" android:theme="@style/myDialogThememakephoto"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:windowBackground="@color/transparent" /> android:windowBackground="@color/transparent" />
<activity <activity
android:name="com.sl.house_property.NewsDetailActivity" android:name="com.sl.house_property.NewsDetailActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:theme="@style/MyThemeactonbar" /> android:theme="@style/MyThemeactonbar" />
<activity <activity
android:name="com.sl.house_property.RegisterAgreementActivity" android:name="com.sl.house_property.RegisterAgreementActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:theme="@style/MyThemeactonbar" /> android:theme="@style/MyThemeactonbar" />
<activity <activity
android:name="com.sl.house_property.ScrollingActivity" android:name="com.sl.house_property.ScrollingActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:label="@string/title_activity_scrolling" android:label="@string/title_activity_scrolling"
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name="com.sl.house_property.user.MyUserMessage" android:name="com.sl.house_property.user.MyUserMessage"
android:theme="@style/MyThemeactonbar" android:theme="@style/MyThemeactonbar"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name="com.sl.house_property.user.MyWalletActivity" android:name="com.sl.house_property.user.MyWalletActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity android:name="com.sl.house_property.user.MyMarketShopActivity" /> <activity android:name="com.sl.house_property.user.MyMarketShopActivity" />
@@ -187,221 +198,286 @@
<activity <activity
android:name="com.sl.house_property.user.MyBillHistory" android:name="com.sl.house_property.user.MyBillHistory"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.sl.house_property.f3.MyFeeBillHistory" android:name="com.sl.house_property.f3.MyFeeBillHistory"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sl.house_property.user.MyServiceHistory" <activity android:name="com.sl.house_property.user.MyServiceHistory"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.user.MyGuaranteeHistory" <activity android:name="com.sl.house_property.user.MyGuaranteeHistory"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name="com.sl.house_property.user.MyAuthorizedFamilyHistory" <activity android:name="com.sl.house_property.user.MyAuthorizedFamilyHistory"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.user.MyAuthorizedFamilyHistoryt" /> <activity android:name="com.sl.house_property.user.MyAuthorizedFamilyHistoryt"
android:exported="false"/>
<activity android:name="com.sl.house_property.user.MyPropertyActivity" <activity android:name="com.sl.house_property.user.MyPropertyActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.user.MyKeyManagement" <activity android:name="com.sl.house_property.user.MyKeyManagement"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.user.MyChargeActivity" <activity android:name="com.sl.house_property.user.MyChargeActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.user.MyPayActivity" <activity android:name="com.sl.house_property.user.MyPayActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity <activity
android:name="com.sl.house_property.user.MyshopEditAcitivity" android:name="com.sl.house_property.user.MyshopEditAcitivity"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.sl.house_property.user.MyshopModifyAcitivity" android:name="com.sl.house_property.user.MyshopModifyAcitivity"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.user.MyBillDetailActivity" <activity android:name="com.sl.house_property.user.MyBillDetailActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity <activity
android:name="com.sl.house_property.f3.HousekeepingActivity" android:name="com.sl.house_property.f3.HousekeepingActivity"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity <activity
android:name="com.sl.house_property.CommodityActivity" android:name="com.sl.house_property.CommodityActivity"
android:exported="false"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.QRcodeActivity" <activity android:name="com.sl.house_property.QRcodeActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.EntranceguardActivity" <activity android:name="com.sl.house_property.EntranceguardActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.CarGarageActivity" <activity android:name="com.sl.house_property.CarGarageActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.EntranceguardControl1Activity" <activity android:name="com.sl.house_property.EntranceguardControl1Activity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.EntranceguardControl2Activity" <activity android:name="com.sl.house_property.EntranceguardControl2Activity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.NewsActivity" <activity android:name="com.sl.house_property.NewsActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.NewlistActivity" <activity android:name="com.sl.house_property.NewlistActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.f2.FeeActivity" <activity android:name="com.sl.house_property.f2.FeeActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.sl.house_property.f2.ElectricChargeActivity" android:name="com.sl.house_property.f2.ElectricChargeActivity"
android:exported="false"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.f2.PropertyFeeActivity" <activity android:name="com.sl.house_property.f2.PropertyFeeActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.f2.ParkingFeeActivity" <activity android:name="com.sl.house_property.f2.ParkingFeeActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.f2.GasFeeActivity" <activity android:name="com.sl.house_property.f2.GasFeeActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity <activity
android:name="com.sl.house_property.f1.AddcararageIttemActivity" android:name="com.sl.house_property.f1.AddcararageIttemActivity"
android:exported="false"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.sl.house_property.f1.AddAcarActivity" android:name="com.sl.house_property.f1.AddAcarActivity"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.f1.CarragelistActivity" <activity android:name="com.sl.house_property.f1.CarragelistActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.f1.UserdlistActivity" <activity android:name="com.sl.house_property.f1.UserdlistActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity <activity
android:name="com.sl.house_property.user.MyServiceDetailActivity" android:name="com.sl.house_property.user.MyServiceDetailActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:label="@string/title_activity_my_service_detail" /> android:label="@string/title_activity_my_service_detail" />
<activity <activity
android:name="com.sl.house_property.user.AddAnewGranteeActivity" android:name="com.sl.house_property.user.AddAnewGranteeActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sl.house_property.user.AddAnewFamilyNumberPermissionActivity" <activity android:name="com.sl.house_property.user.AddAnewFamilyNumberPermissionActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.SettingActivity" <activity android:name="com.sl.house_property.SettingActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.AboutusActivity" <activity android:name="com.sl.house_property.AboutusActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.sl.house_property.AdeviseActivity" android:name="com.sl.house_property.AdeviseActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sl.house_property.LoginActivity" <activity android:name="com.sl.house_property.LoginActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name="com.sl.house_property.RegisterActivity" <activity android:name="com.sl.house_property.RegisterActivity"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.sl.house_property.ForgetPwdActivity" android:name="com.sl.house_property.ForgetPwdActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name="com.sl.house_property.ModifyPswdActivity" android:name="com.sl.house_property.ModifyPswdActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity android:name="com.sl.house_property.f1.MyCaragradetailActivity" <activity android:name="com.sl.house_property.f1.MyCaragradetailActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.user.MyGranteeDetailActivity" <activity android:name="com.sl.house_property.user.MyGranteeDetailActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name="com.sl.house_property.f1.MyCarUsedHistoryDetailActivity" <activity android:name="com.sl.house_property.f1.MyCarUsedHistoryDetailActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity <activity
android:name="imageselector.ImageSelectorActivity" android:name="imageselector.ImageSelectorActivity"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity <activity
android:name="imageselector.PreviewActivity" android:name="imageselector.PreviewActivity"
android:exported="false"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity <activity
android:name="imageselector.ClipImageActivity" android:name="imageselector.ClipImageActivity"
android:exported="false"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity <activity
android:name="imageselector.FullScreenPreviewActivity" android:name="imageselector.FullScreenPreviewActivity"
android:exported="false"
android:theme="@style/PictureTheme.Main" android:theme="@style/PictureTheme.Main"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="imageselector.FullScreenOnlinePreviewActivity" android:name="imageselector.FullScreenOnlinePreviewActivity"
android:theme="@style/PictureTheme.Main" android:theme="@style/PictureTheme.Main"
android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity <activity
android:name="com.alipay.sdk.app.H5PayActivity" android:name="com.alipay.sdk.app.H5PayActivity"
android:configChanges="orientation|keyboardHidden|navigation"
android:exported="false" android:exported="false"
android:configChanges="orientation|keyboardHidden|navigation"
android:screenOrientation="behind"></activity> android:screenOrientation="behind"></activity>
<activity <activity
android:name="com.alipay.sdk.auth.AuthActivity" android:name="com.alipay.sdk.auth.AuthActivity"
android:configChanges="orientation|keyboardHidden|navigation" android:configChanges="orientation|keyboardHidden|navigation"
android:exported="false" android:exported="false"
android:screenOrientation="behind"></activity> android:screenOrientation="behind"></activity>
<activity android:name=".discovery.ImageViewerAndDeleteActivity" <activity android:name=".discovery.ImageViewerAndDeleteActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name=".discovery.AddDiscoveryActivity" <activity android:name=".discovery.AddDiscoveryActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:exported="false"
/> />
<activity android:name=".cart.AddressListActivity" <activity android:name=".cart.AddressListActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".cart.AddAddressActivity" <activity android:name=".cart.AddAddressActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".order.OrderActivity" <activity android:name=".order.OrderActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".order.OrderDetailActivity" <activity android:name=".order.OrderDetailActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".order.SettleActivity" <activity android:name=".order.SettleActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".order.PayActivity" <activity android:name=".order.PayActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".discovery.HistoryRecordActivity" <activity android:name=".discovery.HistoryRecordActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".discovery.HistoryRecordActivitytwo" <activity android:name=".discovery.HistoryRecordActivitytwo"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".discovery.ShareCodeActivity" <activity android:name=".discovery.ShareCodeActivity"
android:exported="false"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity <activity
android:name=".discovery.PropertyActivity" android:name=".discovery.PropertyActivity"
android:exported="false"
android:theme="@style/TAppTheme" android:screenOrientation="portrait"/> android:theme="@style/TAppTheme" android:screenOrientation="portrait"/>
<activity android:name=".CodeActivity" android:screenOrientation="portrait"/> <activity android:name=".CodeActivity" android:screenOrientation="portrait"
android:exported="false"
/>
<activity <activity
android:name=".wxapi.WXPayEntryActivity" android:name=".wxapi.WXPayEntryActivity"
@@ -412,7 +488,7 @@
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/wxPayTheme" android:theme="@style/wxPayTheme"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
<activity android:name=".discovery.LikeActivity" /> <activity android:name=".discovery.LikeActivity" android:exported="false"/>
<!-- 如果您项目中的所有页面都只需要以高或宽中的一个作为基准进行适配的话, 那就只需要填写高或宽中的一个设计图尺寸即可 --> <!-- 如果您项目中的所有页面都只需要以高或宽中的一个作为基准进行适配的话, 那就只需要填写高或宽中的一个设计图尺寸即可 -->
<meta-data <meta-data
android:name="design_width_in_dp" android:name="design_width_in_dp"

View File

@@ -8,6 +8,6 @@ public class DoConfig {
*/ */
public static String FANGCHAN_DATA = "0";//0代表没有数据 1代表有数据 public static String FANGCHAN_DATA = "0";//0代表没有数据 1代表有数据
public static String MY_HOUST_ADDRESS = ""; public static String MY_HOUST_ADDRESS = "house";
// public static String MY_HOUST_WYID = ""; // public static String MY_HOUST_WYID = "";
} }

View File

@@ -212,6 +212,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
} }
if (resultcode.status == 0) { if (resultcode.status == 0) {
if (requstecode == 0) { if (requstecode == 0) {
SPUtils.cleanAllSP(LoginActivity.this);
Gson gs = new Gson(); Gson gs = new Gson();
ArrayList<LinkedTreeMap> adta = (ArrayList<LinkedTreeMap>) resultcode.data; ArrayList<LinkedTreeMap> adta = (ArrayList<LinkedTreeMap>) resultcode.data;
String s = gs.toJson(adta); String s = gs.toJson(adta);

View File

@@ -4,9 +4,10 @@ import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.os.StrictMode; import android.os.StrictMode;
import androidx.multidex.MultiDex;
import android.util.Log; import android.util.Log;
import androidx.multidex.MultiDex;
import com.lzy.ninegrid.NineGridView; import com.lzy.ninegrid.NineGridView;
import com.lzy.okgo.OkGo; import com.lzy.okgo.OkGo;
import com.lzy.okgo.cache.CacheEntity; import com.lzy.okgo.cache.CacheEntity;

View File

@@ -147,8 +147,11 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
} }
}); });
mDataBinding.v.setOnClickListener(v -> { mDataBinding.v.setOnClickListener(new View.OnClickListener() {
checkAlbumPermission(191, 1); @Override
public void onClick(View v) {
checkAlbumPermission(191, 1);
}
}); });
} }

View File

@@ -82,14 +82,17 @@ public class ImageViewerAndDeleteActivity extends BaseActivity<ActivityImagePrev
MediaController mMediaController = new MediaController(this); MediaController mMediaController = new MediaController(this);
mDataBinding. pLVideoView.setMediaController(mMediaController); mDataBinding. pLVideoView.setMediaController(mMediaController);
mDataBinding. pLVideoView.start(); mDataBinding. pLVideoView.start();
mDataBinding.tvDelete.setOnClickListener(v -> { mDataBinding.tvDelete.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mList.remove(index); mList.remove(index);
Intent intent = new Intent(); Intent intent = new Intent();
intent.putStringArrayListExtra("images", mList); intent.putStringArrayListExtra("images", mList);
setResult(111, intent); ImageViewerAndDeleteActivity.this.setResult(111, intent);
finish(); ImageViewerAndDeleteActivity.this.finish();
}
}); });
} }

View File

@@ -106,49 +106,51 @@ public class GlideEngine implements ImageEngine {
} }
}); });
} }
//
// /**
// * 加载网络图片适配长图方案
// * # 注意:此方法只有加载网络图片才会回调 /**
// * * 加载网络图片适配长图方案
// * @param context * # 注意:此方法只有加载网络图片才会回调
// * @param url *
// * @param imageView * @param context
// * @param longImageView * @param url
// * @ 已废弃 * @param imageView
// */ * @param longImageView
// @Override * @ 已废弃
// public void loadImage(@NonNull Context context, @NonNull String url, */
// @NonNull final ImageView imageView, @Override
// final SubsamplingScaleImageView longImageView) { public void loadImage(@NonNull Context context, @NonNull String url,
// Glide.with(context) @NonNull final ImageView imageView,
// .asBitmap() final SubsamplingScaleImageView longImageView) {
// .load(url) Glide.with(context)
// .into(new ImageViewTarget<Bitmap>(imageView) { .asBitmap()
// @Override .load(url)
// protected void setResource(@Nullable Bitmap resource) { .into(new ImageViewTarget<Bitmap>(imageView) {
// if (resource != null) { @Override
// boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(), protected void setResource(@Nullable Bitmap resource) {
// resource.getHeight()); if (resource != null) {
// longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE); boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(),
// imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE); resource.getHeight());
// if (eqLongImage) { longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE);
// // 加载长图 imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE);
// longImageView.setQuickScaleEnabled(true); if (eqLongImage) {
// longImageView.setZoomEnabled(true); // 加载长图
// longImageView.setDoubleTapZoomDuration(100); longImageView.setQuickScaleEnabled(true);
// longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP); longImageView.setZoomEnabled(true);
// longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER); longImageView.setDoubleTapZoomDuration(100);
// longImageView.setImage(ImageSource.cachedBitmap(resource), longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
// new ImageViewState(0, new PointF(0, 0), 0)); longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
// } else { longImageView.setImage(ImageSource.cachedBitmap(resource),
// // 普通图片 new ImageViewState(0, new PointF(0, 0), 0));
// imageView.setImageBitmap(resource); } else {
// } // 普通图片
// } imageView.setImageBitmap(resource);
// } }
// }); }
// } }
});
}
/** /**
* 加载相册目录 * 加载相册目录

View File

@@ -1,4 +1,4 @@
#Wed Jul 21 22:05:06 CST 2021 #Wed Dec 08 14:35:23 CST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists

View File

@@ -1,7 +1,7 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 27 compileSdkVersion 30
buildToolsVersion "27.0.3" buildToolsVersion '30.0.2'
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
@@ -14,6 +14,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
} }
dependencies { dependencies {