潘达康 / AggH5Game · 提交

转到一个项目

作者 潘达康
提交 46b95570cc3cc19ec29e0da50016e6329aa64d51 1 个父辈 7d5d811c

1、调整xml文件名，避免重名 

2、加入android:extractNativeLibs="true"
内嵌 并排对比
正在显示 11 个修改的文件 包含 29 行增加 和 9 行删除
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="deploymentTargetSelector">
  4 + <selectionStates>
  5 + <SelectionState runConfigName="app">
  6 + <option name="selectionMode" value="DROPDOWN" />
  7 + </SelectionState>
  8 + </selectionStates>
  9 + </component>
  10 +</project>
@@ -4,15 +4,15 @@ @@ -4,15 +4,15 @@
4 <component name="GradleSettings"> 4 <component name="GradleSettings">
5 <option name="linkedExternalProjectsSettings"> 5 <option name="linkedExternalProjectsSettings">
6 <GradleProjectSettings> 6 <GradleProjectSettings>
7 - <option name="testRunner" value="GRADLE" />  
8 - <option name="distributionType" value="DEFAULT_WRAPPED" />  
9 <option name="externalProjectPath" value="$PROJECT_DIR$" /> 7 <option name="externalProjectPath" value="$PROJECT_DIR$" />
  8 + <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
10 <option name="modules"> 9 <option name="modules">
11 <set> 10 <set>
12 <option value="$PROJECT_DIR$" /> 11 <option value="$PROJECT_DIR$" />
13 <option value="$PROJECT_DIR$/app" /> 12 <option value="$PROJECT_DIR$/app" />
14 </set> 13 </set>
15 </option> 14 </option>
  15 + <option name="resolveExternalAnnotations" value="false" />
16 </GradleProjectSettings> 16 </GradleProjectSettings>
17 </option> 17 </option>
18 </component> 18 </component>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="ProjectMigrations">
  4 + <option name="MigrateToGradleLocalJavaHome">
  5 + <set>
  6 + <option value="$PROJECT_DIR$" />
  7 + </set>
  8 + </option>
  9 + </component>
  10 +</project>
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 <project version="4"> 1 <project version="4">
3 <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK"> 2 <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
4 <output url="file://$PROJECT_DIR$/build/classes" /> 3 <output url="file://$PROJECT_DIR$/build/classes" />
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 android:name="com.agg.h5game.AggH5GameApplication" 8 android:name="com.agg.h5game.AggH5GameApplication"
9 android:allowBackup="true" 9 android:allowBackup="true"
10 android:icon="@drawable/icon" 10 android:icon="@drawable/icon"
  11 + android:extractNativeLibs="true"
11 android:label="@string/app_name" 12 android:label="@string/app_name"
12 android:supportsRtl="true" 13 android:supportsRtl="true"
13 android:theme="@android:style/Theme.NoTitleBar.Fullscreen" 14 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
@@ -57,7 +57,7 @@ public class AggH5MainActivity extends Activity { @@ -57,7 +57,7 @@ public class AggH5MainActivity extends Activity {
57 super.onCreate(savedInstanceState); 57 super.onCreate(savedInstanceState);
58 mContext = this; 58 mContext = this;
59 59
60 - setContentView(MResource.getIdByName(mContext, "layout", "activity_main")); 60 + setContentView(MResource.getIdByName(mContext, "layout", "activity_agg_main"));
61 initView(); 61 initView();
62 initSDK(); 62 initSDK();
63 63
@@ -72,7 +72,7 @@ public class AggH5MainActivity extends Activity { @@ -72,7 +72,7 @@ public class AggH5MainActivity extends Activity {
72 72
73 private void initView() { 73 private void initView() {
74 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); 74 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
75 - webView = findViewById(MResource.getIdByName(mContext, "id", "webview")); 75 + webView = findViewById(MResource.getIdByName(mContext, "id", "game_webview"));
76 webView.addJavascriptInterface(new AggH5AndroidToJs(), "AggH5Game"); 76 webView.addJavascriptInterface(new AggH5AndroidToJs(), "AggH5Game");
77 77
78 //页面缩放,适应手机屏幕 78 //页面缩放,适应手机屏幕
@@ -32,7 +32,7 @@ public class AggH5SplashActivity extends Activity { @@ -32,7 +32,7 @@ public class AggH5SplashActivity extends Activity {
32 } 32 }
33 33
34 super.onCreate(savedInstanceState); 34 super.onCreate(savedInstanceState);
35 - setContentView(MResource.getIdByName(this, "layout", "activity_splash")); 35 + setContentView(MResource.getIdByName(this, "layout", "activity_agg_splash"));
36 36
37 ImageView mIvSplash = findViewById(MResource.getIdByName(this, "id", "img_splash")); 37 ImageView mIvSplash = findViewById(MResource.getIdByName(this, "id", "img_splash"));
38 38
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 android:orientation="vertical"> 5 android:orientation="vertical">
6 6
7 <WebView 7 <WebView
8 - android:id="@+id/webview" 8 + android:id="@+id/game_webview"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" /> 10 android:layout_height="match_parent" />
11 </LinearLayout> 11 </LinearLayout>
@@ -5,7 +5,7 @@ buildscript { @@ -5,7 +5,7 @@ buildscript {
5 mavenCentral() 5 mavenCentral()
6 } 6 }
7 dependencies { 7 dependencies {
8 - classpath 'com.android.tools.build:gradle:3.4.1' 8 + classpath 'com.android.tools.build:gradle:4.2.2'
9 } 9 }
10 } 10 }
11 11
1 #Tue Sep 14 17:17:01 CST 2021 1 #Tue Sep 14 17:17:01 CST 2021
2 distributionBase=GRADLE_USER_HOME 2 distributionBase=GRADLE_USER_HOME
3 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip 3 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
4 distributionPath=wrapper/dists 4 distributionPath=wrapper/dists
5 zipStorePath=wrapper/dists 5 zipStorePath=wrapper/dists
6 zipStoreBase=GRADLE_USER_HOME 6 zipStoreBase=GRADLE_USER_HOME