Skip to content

Commit 6fe5cc9

Browse files
committed
去除内置webview代码,增加官方webview仓库
增加path裁剪header背景图
1 parent 8797f80 commit 6fe5cc9

18 files changed

Lines changed: 230 additions & 660 deletions

‎RECORD.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11

22

3+
4+
5+
6+
7+
8+
39
https://github.com/flutter/plugins/tree/master/packages/webview_flutter
410
未发布的
511

‎android/app/src/main/kotlin/com/shuyu/gsygithub/gsygithubappflutter/MainActivity.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import android.os.Bundle
44

55
import io.flutter.app.FlutterActivity
66
import io.flutter.plugins.GeneratedPluginRegistrant
7-
import com.shuyu.gsygithub.gsygithubappflutter.webivew.WebviewFlutterPlugin
87

98
class MainActivity(): FlutterActivity() {
109
override fun onCreate(savedInstanceState: Bundle?) {
1110
super.onCreate(savedInstanceState)
1211
GeneratedPluginRegistrant.registerWith(this)
1312
UpdateAlbumPlugin.register(this, flutterView)
14-
WebviewFlutterPlugin.registerWith(flutterView.pluginRegistry.registrarFor("com.shuyu.gsygithub.gsygithubappflutter"))
1513
}
1614
}

‎android/app/src/main/kotlin/com/shuyu/gsygithub/gsygithubappflutter/webivew/FlutterWebView.kt‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎android/app/src/main/kotlin/com/shuyu/gsygithub/gsygithubappflutter/webivew/WebViewFactory.kt‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎android/app/src/main/kotlin/com/shuyu/gsygithub/gsygithubappflutter/webivew/WebviewFlutterPlugin.kt‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎ios/Podfile.lock‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ PODS:
3636
- FMDB (~> 2.7.2)
3737
- url_launcher (0.0.1):
3838
- Flutter
39+
- webview_flutter (0.0.1):
40+
- Flutter
3941

4042
DEPENDENCIES:
4143
- android_intent (from `.symlinks/plugins/android_intent/ios`)
@@ -53,6 +55,7 @@ DEPENDENCIES:
5355
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
5456
- sqflite (from `.symlinks/plugins/sqflite/ios`)
5557
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
58+
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
5659

5760
SPEC REPOS:
5861
https://github.com/cocoapods/specs.git:
@@ -91,27 +94,30 @@ EXTERNAL SOURCES:
9194
:path: ".symlinks/plugins/sqflite/ios"
9295
url_launcher:
9396
:path: ".symlinks/plugins/url_launcher/ios"
97+
webview_flutter:
98+
:path: ".symlinks/plugins/webview_flutter/ios"
9499

95100
SPEC CHECKSUMS:
96-
android_intent: 73316069cd1f6aac919df1c6e640cad190fd5e8b
97-
connectivity: c72716e202a1225ec4810740d5cb56b8ae3bf4cc
98-
device_info: 3ebad48f726348f69abd802f3334a8d1ed795fbd
99-
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
100-
flutter_lottie: c1fd7e92e771209f8b623119646c15201c5e8c87
101-
flutter_statusbar: aa4982b847304a72c5ac8439a9f37861b662c6bb
102-
flutter_webview_plugin: ed9e8a6a96baf0c867e90e1bce2673913eeac694
103-
fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
101+
android_intent: 96848466ee23479bdb64dc5fa04e8fe1f59200aa
102+
connectivity: d5992e3758d68b1c4b12d6e012fe0813f1aa1645
103+
device_info: 76ce0b32e13034d1883be4a382433648f9dcee63
104+
Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
105+
flutter_lottie: b8300e2b6ca2e420508be3a7449e722a8a095d9a
106+
flutter_statusbar: a563eb9416256f17660646aceb2314b113127da9
107+
flutter_webview_plugin: 116575b48572029304775b768e9f15ebfc316274
108+
fluttertoast: 0a20dcbbb8ecfd1a61b6285651ff2d5989d033fb
104109
FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
105110
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
106-
package_info: 78cabb3c322943c55d39676f4a5bfc748c01d055
107-
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
108-
permission_handler: 047f11d44db785922214783da5f7a3cc8874c843
111+
package_info: d7c98b64f60add4c2908b9d94d82a45d3c8827ad
112+
path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
113+
permission_handler: 03dcf3ade9d5f398b8854b366cb9de718d3daa76
109114
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
110-
share: 7d22fe8baedfe93aefd864bf0b73f29711fbb0a3
111-
shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523
112-
sqflite: ff1d9da63c06588cc8d1faf7256d741f16989d5a
113-
url_launcher: 0067ddb8f10d36786672aa0722a21717dba3a298
115+
share: 222b5dcc8031238af9d7de91149df65bad1aef75
116+
shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53
117+
sqflite: d1612813fa7db7c667bed9f1d1b508deffc56999
118+
url_launcher: 92b89c1029a0373879933c21642958c874539095
119+
webview_flutter: 9bd234c07e99632356cba112df56fd1d47d6b6e3
114120

115121
PODFILE CHECKSUM: 7765ea4305eaab0b3dfd384c7de11902aa3195fd
116122

117-
COCOAPODS: 1.6.1
123+
COCOAPODS: 1.5.3

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 63 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1313
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1414
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
15-
4B54C1AA21B133F0004BEA07 /* FlutterWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B54C1A921B133F0004BEA07 /* FlutterWebView.m */; };
16-
4B54C1AD21B13434004BEA07 /* WebViewFlutterPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B54C1AC21B13434004BEA07 /* WebViewFlutterPlugin.m */; };
1715
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1816
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1917
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
@@ -115,6 +113,34 @@
115113
remoteGlobalIDString = 4B40ADA9AD61ADB08CA9739165A77AE5;
116114
remoteInfo = url_launcher;
117115
};
116+
4BDA3ACA22744C9D0035B197 /* PBXContainerItemProxy */ = {
117+
isa = PBXContainerItemProxy;
118+
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
119+
proxyType = 2;
120+
remoteGlobalIDString = 7F4A134A788874481521861A1A2475B4;
121+
remoteInfo = android_intent;
122+
};
123+
4BDA3ACC22744C9D0035B197 /* PBXContainerItemProxy */ = {
124+
isa = PBXContainerItemProxy;
125+
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
126+
proxyType = 2;
127+
remoteGlobalIDString = BBF38E206C5E3F3031B3BFCC78590C98;
128+
remoteInfo = flutter_lottie;
129+
};
130+
4BDA3ACE22744C9D0035B197 /* PBXContainerItemProxy */ = {
131+
isa = PBXContainerItemProxy;
132+
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
133+
proxyType = 2;
134+
remoteGlobalIDString = 15BEE6F3351D521C7880D028F6D09C21;
135+
remoteInfo = "lottie-ios";
136+
};
137+
4BDA3AD022744C9D0035B197 /* PBXContainerItemProxy */ = {
138+
isa = PBXContainerItemProxy;
139+
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
140+
proxyType = 2;
141+
remoteGlobalIDString = 7571524E8933F347BDF8BA25D6AF7699;
142+
remoteInfo = webview_flutter;
143+
};
118144
4BDB48EC21A2AEFF00E882C1 /* PBXContainerItemProxy */ = {
119145
isa = PBXContainerItemProxy;
120146
containerPortal = 4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */;
@@ -151,10 +177,6 @@
151177
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
152178
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
153179
4B51210C211F395A00E0C9B3 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = Pods/Pods.xcodeproj; sourceTree = "<group>"; };
154-
4B54C19721B133A4004BEA07 /* FlutterWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FlutterWebView.h; sourceTree = "<group>"; };
155-
4B54C1A921B133F0004BEA07 /* FlutterWebView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlutterWebView.m; sourceTree = "<group>"; };
156-
4B54C1AB21B13414004BEA07 /* WebViewFlutterPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebViewFlutterPlugin.h; sourceTree = "<group>"; };
157-
4B54C1AC21B13434004BEA07 /* WebViewFlutterPlugin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebViewFlutterPlugin.m; sourceTree = "<group>"; };
158180
4F13ED567330568565999636 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
159181
593F42BD9F603A49DC922B8C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
160182
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -188,12 +210,15 @@
188210
4B51210D211F395A00E0C9B3 /* Products */ = {
189211
isa = PBXGroup;
190212
children = (
213+
4BDA3ACB22744C9D0035B197 /* android_intent.framework */,
191214
4B51211E211F395B00E0C9B3 /* connectivity.framework */,
192215
4B512120211F395B00E0C9B3 /* device_info.framework */,
216+
4BDA3ACD22744C9D0035B197 /* flutter_lottie.framework */,
193217
4B512122211F395B00E0C9B3 /* flutter_statusbar.framework */,
194218
4B512124211F395B00E0C9B3 /* flutter_webview_plugin.framework */,
195219
4B512126211F395B00E0C9B3 /* fluttertoast.framework */,
196220
4B512128211F395B00E0C9B3 /* FMDB.framework */,
221+
4BDA3ACF22744C9D0035B197 /* Lottie.framework */,
197222
4B51212C211F395B00E0C9B3 /* package_info.framework */,
198223
4BDB48ED21A2AEFF00E882C1 /* path_provider.framework */,
199224
4BDB48EF21A2AEFF00E882C1 /* permission_handler.framework */,
@@ -203,6 +228,7 @@
203228
4B512134211F395B00E0C9B3 /* shared_preferences.framework */,
204229
4B512136211F395B00E0C9B3 /* sqflite.framework */,
205230
4B512138211F395B00E0C9B3 /* url_launcher.framework */,
231+
4BDA3AD122744C9D0035B197 /* webview_flutter.framework */,
206232
);
207233
name = Products;
208234
sourceTree = "<group>";
@@ -261,10 +287,6 @@
261287
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
262288
74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
263289
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
264-
4B54C19721B133A4004BEA07 /* FlutterWebView.h */,
265-
4B54C1A921B133F0004BEA07 /* FlutterWebView.m */,
266-
4B54C1AB21B13414004BEA07 /* WebViewFlutterPlugin.h */,
267-
4B54C1AC21B13434004BEA07 /* WebViewFlutterPlugin.m */,
268290
);
269291
path = Runner;
270292
sourceTree = "<group>";
@@ -331,6 +353,7 @@
331353
developmentRegion = English;
332354
hasScannedForEncodings = 0;
333355
knownRegions = (
356+
English,
334357
en,
335358
Base,
336359
);
@@ -442,6 +465,34 @@
442465
remoteRef = 4B512137211F395B00E0C9B3 /* PBXContainerItemProxy */;
443466
sourceTree = BUILT_PRODUCTS_DIR;
444467
};
468+
4BDA3ACB22744C9D0035B197 /* android_intent.framework */ = {
469+
isa = PBXReferenceProxy;
470+
fileType = wrapper.framework;
471+
path = android_intent.framework;
472+
remoteRef = 4BDA3ACA22744C9D0035B197 /* PBXContainerItemProxy */;
473+
sourceTree = BUILT_PRODUCTS_DIR;
474+
};
475+
4BDA3ACD22744C9D0035B197 /* flutter_lottie.framework */ = {
476+
isa = PBXReferenceProxy;
477+
fileType = wrapper.framework;
478+
path = flutter_lottie.framework;
479+
remoteRef = 4BDA3ACC22744C9D0035B197 /* PBXContainerItemProxy */;
480+
sourceTree = BUILT_PRODUCTS_DIR;
481+
};
482+
4BDA3ACF22744C9D0035B197 /* Lottie.framework */ = {
483+
isa = PBXReferenceProxy;
484+
fileType = wrapper.framework;
485+
path = Lottie.framework;
486+
remoteRef = 4BDA3ACE22744C9D0035B197 /* PBXContainerItemProxy */;
487+
sourceTree = BUILT_PRODUCTS_DIR;
488+
};
489+
4BDA3AD122744C9D0035B197 /* webview_flutter.framework */ = {
490+
isa = PBXReferenceProxy;
491+
fileType = wrapper.framework;
492+
path = webview_flutter.framework;
493+
remoteRef = 4BDA3AD022744C9D0035B197 /* PBXContainerItemProxy */;
494+
sourceTree = BUILT_PRODUCTS_DIR;
495+
};
445496
4BDB48ED21A2AEFF00E882C1 /* path_provider.framework */ = {
446497
isa = PBXReferenceProxy;
447498
fileType = wrapper.framework;
@@ -500,6 +551,7 @@
500551
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
501552
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
502553
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
554+
"${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
503555
);
504556
name = "[CP] Embed Pods Frameworks";
505557
outputPaths = (
@@ -521,6 +573,7 @@
521573
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
522574
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
523575
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
576+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
524577
);
525578
runOnlyForDeploymentPostprocessing = 0;
526579
shellPath = /bin/sh;
@@ -580,10 +633,8 @@
580633
isa = PBXSourcesBuildPhase;
581634
buildActionMask = 2147483647;
582635
files = (
583-
4B54C1AA21B133F0004BEA07 /* FlutterWebView.m in Sources */,
584636
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
585637
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
586-
4B54C1AD21B13434004BEA07 /* WebViewFlutterPlugin.m in Sources */,
587638
);
588639
runOnlyForDeploymentPostprocessing = 0;
589640
};

‎ios/Runner/AppDelegate.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import Flutter
88
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?
99
) -> Bool {
1010
GeneratedPluginRegistrant.register(with: self)
11-
FLTWebviewFlutterPlugin.register(with: self.registrar(forPlugin: "FLTWebviewFlutterPlugin"))
12-
1311
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
1412
}
1513
}

0 commit comments

Comments
 (0)