Commit 8ef14f1f by mergen

包名更改

parent 1d7a81f5
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State />
<State>
<id>Android</id>
</State>
<State>
<id>Class structureJava</id>
</State>
<State>
<id>Cloning issuesJava</id>
</State>
<State>
<id>Code style issuesJava</id>
</State>
<State>
<id>CorrectnessLintAndroid</id>
</State>
<State>
<id>Groovy</id>
</State>
<State>
<id>Inheritance issuesJava</id>
</State>
<State>
<id>InternationalizationJava</id>
</State>
<State>
<id>Java</id>
</State>
<State>
<id>LintAndroid</id>
</State>
<State>
<id>Numeric issuesJava</id>
</State>
<State>
<id>PerformanceJava</id>
</State>
<State>
<id>PerformanceLintAndroid</id>
</State>
<State>
<id>Potentially confusing code constructsGroovy</id>
</State>
<State>
<id>Probable bugsJava</id>
</State>
<State>
<id>SecurityJava</id>
</State>
<State>
<id>Serialization issuesJava</id>
</State>
<State>
<id>Threading issuesJava</id>
</State>
</expanded-state>
</profile-state>
</entry>
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Android API 29 Platform" project-jdk-type="Android SDK" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/cordova-plugin-orhon-tbsx5-webview.iml" filepath="$PROJECT_DIR$/.idea/cordova-plugin-orhon-tbsx5-webview.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
package com.liuxiaoy.cordova; package com.orhon.cordova;
import com.tencent.smtt.export.external.TbsCoreSettings; import com.tencent.smtt.export.external.TbsCoreSettings;
import com.tencent.smtt.sdk.QbSdk; import com.tencent.smtt.sdk.QbSdk;
...@@ -17,12 +17,14 @@ public class MainApplication extends android.app.Application { ...@@ -17,12 +17,14 @@ public class MainApplication extends android.app.Application {
QbSdk.initX5Environment(this, new QbSdk.PreInitCallback() { QbSdk.initX5Environment(this, new QbSdk.PreInitCallback() {
@Override @Override
public void onCoreInitFinished() { public void onCoreInitFinished() {
System.out.println(" tbs init ok"); //System.out.println(" tbs init ok");
Log.d("orhonCordova" , "tbs init ok");
} }
@Override @Override
public void onViewInitFinished(boolean b) { public void onViewInitFinished(boolean b) {
System.out.println(" tbs init view: " + b); //System.out.println(" tbs init view: " + b);
Log.d("orhonCordova" , "tbs init view:" + b);
} }
}); });
} }
......
...@@ -34,9 +34,9 @@ module.exports = function (context) { ...@@ -34,9 +34,9 @@ module.exports = function (context) {
} }
} }
var filename = 'MainApplication.java'; var filename = 'MainApplication.java';
var pluginAppFliePath = path.join(pluginDir, 'platforms/android/src/com/liuxiaoy/cordova/', filename); var pluginAppFliePath = path.join(pluginDir, 'platforms/android/src/com/orhon/cordova/', filename);
var AppFliePath = path.join(projectRoot, 'platforms/android/app/src/main/java/com/liuxiaoy/cordova/', filename); var AppFliePath = path.join(projectRoot, 'platforms/android/app/src/main/java/com/orhon/cordova/', filename);
var appClass = 'com.liuxiaoy.cordova.MainApplication'; var appClass = 'com.orhon.cordova.MainApplication';
if (originalApplicationName === appClass) { if (originalApplicationName === appClass) {
return; return;
} }
...@@ -45,7 +45,7 @@ module.exports = function (context) { ...@@ -45,7 +45,7 @@ module.exports = function (context) {
// 继承 // 继承
fs.readFile(pluginAppFliePath, { encoding: 'utf-8' }, function (err, data) { fs.readFile(pluginAppFliePath, { encoding: 'utf-8' }, function (err, data) {
if (err) { if (err) {
throw new Error('Unable to find com.liuxiaoy.cordova.MainApplication: ' + err); throw new Error('Unable to find com.orhon.cordova.MainApplication: ' + err);
} }
data = data.replace(/extends android.app.Application {/gm, `extends ${originalApplicationName} {`); data = data.replace(/extends android.app.Application {/gm, `extends ${originalApplicationName} {`);
fs.writeFileSync(AppFliePath, data); fs.writeFileSync(AppFliePath, data);
......
...@@ -34,8 +34,8 @@ module.exports = function (context) { ...@@ -34,8 +34,8 @@ module.exports = function (context) {
} }
} }
var filename = 'MainApplication.java'; var filename = 'MainApplication.java';
var AppFliePath = path.join(pluginDir, 'platforms/android/src/com/liuxiaoy/cordova/', filename); var AppFliePath = path.join(pluginDir, 'platforms/android/src/com/orhon/cordova/', filename);
var appClass = 'com.liuxiaoy.cordova.MainApplication'; var appClass = 'com.orhon.cordova.MainApplication';
if (originalApplicationName === appClass) { if (originalApplicationName === appClass) {
return; return;
} }
...@@ -44,7 +44,7 @@ module.exports = function (context) { ...@@ -44,7 +44,7 @@ module.exports = function (context) {
// 继承 // 继承
fs.readFile(AppFliePath, { encoding: 'utf-8' }, function (err, data) { fs.readFile(AppFliePath, { encoding: 'utf-8' }, function (err, data) {
if (err) { if (err) {
throw new Error('Unable to find com.liuxiaoy.cordova.MainApplication: ' + err); throw new Error('Unable to find com.orhon.cordova.MainApplication: ' + err);
} }
data = data.replace(/extends android.app.Application {/gm, `extends ${originalApplicationName} {`); data = data.replace(/extends android.app.Application {/gm, `extends ${originalApplicationName} {`);
fs.writeFileSync(AppFliePath, data); fs.writeFileSync(AppFliePath, data);
......
...@@ -37,14 +37,14 @@ module.exports = function (context) { ...@@ -37,14 +37,14 @@ module.exports = function (context) {
} }
} }
var filename = 'MainApplication.java'; var filename = 'MainApplication.java';
var AppFliePath = path.join(projectRoot, 'platforms/android/app/src/main/java/com/liuxiaoy/cordova/', filename); var AppFliePath = path.join(projectRoot, 'platforms/android/app/src/main/java/com/orhon/cordova/', filename);
var appClass = 'com.liuxiaoy.cordova.MainApplication'; var appClass = 'com.orhon.cordova.MainApplication';
if (!finalApplicationName || (finalApplicationName !== appClass)) { if (!finalApplicationName || (finalApplicationName !== appClass)) {
return; return;
} }
fs.readFile(AppFliePath, { encoding: 'utf-8' }, function (err, data) { fs.readFile(AppFliePath, { encoding: 'utf-8' }, function (err, data) {
if (err) { if (err) {
throw new Error('Unable to find com.liuxiaoy.cordova.MainApplication: ' + err); throw new Error('Unable to find com.orhon.cordova.MainApplication: ' + err);
} }
originalApplicationName = data.match(/extends [\w$.]+ {/g)[0].split(/ /)[1]; originalApplicationName = data.match(/extends [\w$.]+ {/g)[0].split(/ /)[1];
if (originalApplicationName === defaultApplicationName) { if (originalApplicationName === defaultApplicationName) {
......
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