Commit dc43ebc1 authored by bixing's avatar bixing

update

parent ae63e625
...@@ -56,7 +56,7 @@ android { ...@@ -56,7 +56,7 @@ android {
applicationId "com.ads.cal.picturetranslate" applicationId "com.ads.cal.picturetranslate"
versionName "1.0.0.0" versionName "1.0.0.0"
signingConfig signingConfigs.toolsTest signingConfig signingConfigs.toolsTest
manifestPlaceholders = [signature: "04ced0bb5c9f0b2adf2f27dd57538cc8", flavor_name: "GemHeart", authorities: "$applicationId-media-AProvider", media_version: "1"] manifestPlaceholders = [google_ad_app_id: "ca-app-pub-9356757350640102~6934070860", signature: "04ced0bb5c9f0b2adf2f27dd57538cc8", flavor_name: "GemHeart", authorities: "$applicationId-media-AProvider", media_version: "1"]
} }
} }
} }
...@@ -164,6 +164,10 @@ dependencies { ...@@ -164,6 +164,10 @@ dependencies {
api "com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.11" api "com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.11"
api "androidx.recyclerview:recyclerview:1.1.0" api "androidx.recyclerview:recyclerview:1.1.0"
//Admob
api "com.anythink.sdk:adapter-admob:6.4.69.2"
api "com.google.android.gms:play-services-ads:24.0.0"
//Tramini //Tramini
api "com.anythink.sdk:tramini-plugin:6.4.69" api "com.anythink.sdk:tramini-plugin:6.4.69"
......
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
<meta-data <meta-data
android:name="com.google.mlkit.vision.DEPENDENCIES" android:name="com.google.mlkit.vision.DEPENDENCIES"
android:value="ocr,ocr_chinese,ocr_devanagari,ocr_japanese,ocr_korean" /> android:value="ocr,ocr_chinese,ocr_devanagari,ocr_japanese,ocr_korean" />
<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="${google_ad_app_id}" />
<activity <activity
android:name="com.ads.cal.picturetranslate.activity.PictureTranslateStartActivity" android:name="com.ads.cal.picturetranslate.activity.PictureTranslateStartActivity"
...@@ -62,6 +65,7 @@ ...@@ -62,6 +65,7 @@
<activity <activity
android:name="com.ads.cal.picturetranslate.activity.PictureTranslateListMainActivity" android:name="com.ads.cal.picturetranslate.activity.PictureTranslateListMainActivity"
android:exported="true" android:exported="true"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity <activity
......
...@@ -62,14 +62,14 @@ android { ...@@ -62,14 +62,14 @@ android {
applicationId "picturetranslate.extractor.text.lite" applicationId "picturetranslate.extractor.text.lite"
versionName "1.0.0.0" versionName "1.0.0.0"
signingConfig signingConfigs.toolsTest signingConfig signingConfigs.toolsTest
manifestPlaceholders = [signature: "04ced0bb5c9f0b2adf2f27dd57538cc8", flavor_name: "GemHeart", authorities: "$applicationId-media-AProvider", media_version: "1"] manifestPlaceholders = [google_ad_app_id: "ca-app-pub-9356757350640102~6934070860", signature: "04ced0bb5c9f0b2adf2f27dd57538cc8", flavor_name: "GemHeart", authorities: "$applicationId-media-AProvider", media_version: "1"]
} }
ceshi { ceshi {
versionCode 90015 versionCode 90015
versionName "1.0.15" versionName "1.0.15"
signingConfig signingConfigs.testSign signingConfig signingConfigs.testSign
applicationId "com.hr.heart.rate" applicationId "com.hr.heart.rate"
manifestPlaceholders = [signature: "8112af66991cd22a83219a1fd10403c9", flavor_name: "GemHeart", authorities: "$applicationId-media-AProvider", media_version: "1"] manifestPlaceholders = [google_ad_app_id: "ca-app-pub-3940256099942544~3347511713", signature: "8112af66991cd22a83219a1fd10403c9", flavor_name: "GemHeart", authorities: "$applicationId-media-AProvider", media_version: "1"]
ndk { ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a', 'armeabi' abiFilters 'armeabi-v7a', 'arm64-v8a', 'armeabi'
} }
...@@ -179,6 +179,10 @@ dependencies { ...@@ -179,6 +179,10 @@ dependencies {
api "com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.11" api "com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.11"
api "androidx.recyclerview:recyclerview:1.1.0" api "androidx.recyclerview:recyclerview:1.1.0"
//Admob
api "com.anythink.sdk:adapter-admob:6.4.69.2"
api "com.google.android.gms:play-services-ads:24.0.0"
//Tramini //Tramini
api "com.anythink.sdk:tramini-plugin:6.4.69" api "com.anythink.sdk:tramini-plugin:6.4.69"
......
...@@ -49,6 +49,9 @@ ...@@ -49,6 +49,9 @@
<meta-data <meta-data
android:name="com.google.mlkit.vision.DEPENDENCIES" android:name="com.google.mlkit.vision.DEPENDENCIES"
android:value="ocr,ocr_chinese,ocr_devanagari,ocr_japanese,ocr_korean" /> android:value="ocr,ocr_chinese,ocr_devanagari,ocr_japanese,ocr_korean" />
<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="${google_ad_app_id}" />
<activity <activity
android:name="com.ads.cal.picturetranslate.activity.PictureTranslateStartActivity" android:name="com.ads.cal.picturetranslate.activity.PictureTranslateStartActivity"
...@@ -74,6 +77,7 @@ ...@@ -74,6 +77,7 @@
android:configChanges="keyboardHidden|screenSize|screenLayout|orientation" android:configChanges="keyboardHidden|screenSize|screenLayout|orientation"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:noHistory="true" android:noHistory="true"
android:windowSoftInputMode="adjustResize"
android:icon="@android:drawable/divider_horizontal_bright" android:icon="@android:drawable/divider_horizontal_bright"
android:label="@string/heart_lable" android:label="@string/heart_lable"
android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"> android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
...@@ -101,7 +105,6 @@ ...@@ -101,7 +105,6 @@
android:configChanges="keyboardHidden|screenSize|screenLayout|orientation" android:configChanges="keyboardHidden|screenSize|screenLayout|orientation"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:noHistory="true"
android:icon="@android:drawable/divider_horizontal_bright" android:icon="@android:drawable/divider_horizontal_bright"
android:label="@string/heart_lable" android:label="@string/heart_lable"
android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
......
...@@ -89,6 +89,7 @@ public class PictureTranslateResultActivity extends BaseActivity { ...@@ -89,6 +89,7 @@ public class PictureTranslateResultActivity extends BaseActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
handler.removeCallbacksAndMessages(null);
InitA.getInstance().cleanTask(); InitA.getInstance().cleanTask();
} }
......
...@@ -188,14 +188,6 @@ public class InitA { ...@@ -188,14 +188,6 @@ public class InitA {
foregroundPageNumbers--; foregroundPageNumbers--;
ALog.d("MediaApplication", "onActivityStopped :" + activity); ALog.d("MediaApplication", "onActivityStopped :" + activity);
if (isAppBackground()) { if (isAppBackground()) {
if (activity instanceof PictureTranslateResultActivity) {
return;
}
try {
activity.onBackPressed();
} catch (Exception e) {
StatsStaticHelper.onEvent("b_er", e.getMessage());
}
cleanTask(); cleanTask();
} }
} }
...@@ -240,6 +232,9 @@ public class InitA { ...@@ -240,6 +232,9 @@ public class InitA {
}; };
public void cleanTask() { public void cleanTask() {
if (!isAppBackground()) {
return;
}
try { try {
ActivityManager activityManager = (ActivityManager) PictureApplication.getApplication().getSystemService(Context.ACTIVITY_SERVICE); ActivityManager activityManager = (ActivityManager) PictureApplication.getApplication().getSystemService(Context.ACTIVITY_SERVICE);
List<ActivityManager.AppTask> appTasks = activityManager.getAppTasks(); List<ActivityManager.AppTask> appTasks = activityManager.getAppTasks();
......
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