优化android回调

CHANGELOG.md

 ## 0.3.3
 * 移除WeChatPayModel
 * 移除ios最小支持。
+* 优化*Android*微信回调。
+* *build.gradle*升级到了*3.2.1*。
 
 ## 0.3.2
 * *build.gradle*升级到了*3.2.0*

android/src/main/AndroidManifest.xml

-<manifest package="com.jarvan.fluwx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.jarvan.fluwx">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application>
+        <activity
+            android:name=".wxapi.WXEntryActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/DisablePreviewTheme" />
+        <activity
+            android:name=".wxapi.WXPayEntryActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/DisablePreviewTheme" />
+
+        <activity-alias
+            android:name="${applicationId}.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:targetActivity="com.jarvan.fluwx.wxapi.WXEntryActivity"
+            android:theme="@style/DisablePreviewTheme">
+
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="sdksample" />
+            </intent-filter>
+        </activity-alias>
+        <activity-alias
+            android:name="${applicationId}.wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:targetActivity="com.jarvan.fluwx.wxapi.WXPayEntryActivity"
+            android:theme="@style/DisablePreviewTheme">
+
 
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="sdksample" />
+            </intent-filter>
+        </activity-alias>
     </application>
 </manifest>

android/src/main/kotlin/com/jarvan/fluwx/wxapi/WXEntryActivity.kt

+/*
+ * Copyright (C) 2018 The OpenFlutter Organization
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jarvan.fluwx.wxapi
+
+
+
+open class WXEntryActivity :FluwxWXEntryActivity()
\ No newline at end of file

android/src/main/kotlin/com/jarvan/fluwx/wxapi/WXPayEntryActivity.kt

+/*
+ * Copyright (C) 2018 The OpenFlutter Organization
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jarvan.fluwx.wxapi
+
+
+
+open class WXPayEntryActivity :FluwxWXEntryActivity()
\ No newline at end of file

example/android/app/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.jarvan.fluwxexample">
 
     <!-- The INTERNET permission is required for development. Specifically,
@@ -15,7 +16,8 @@
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:label="fluwx_example"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -35,29 +37,36 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="net.sourceforge.simcpux.wxapi.WXEntryActivity"
-            android:theme="@style/DisablePreviewTheme"
-            android:exported="true"
-            android:launchMode="singleTop">
+        <!--<activity android:name=".wxapi.WXEntryActivity"-->
+            <!--android:theme="@style/DisablePreviewTheme"-->
+            <!--/>-->
+        <!--<activity android:name=".wxapi.WXPayEntryActivity"-->
+            <!--android:theme="@style/DisablePreviewTheme"/>-->
+        <!--<activity-alias-->
+            <!--android:name="${applicationId}.wxapi.WXEntryActivity"-->
+            <!--android:exported="true"-->
+            <!--tools:replace="android:targetActivity"-->
+            <!--android:targetActivity=".wxapi.WXEntryActivity"-->
+            <!--android:launchMode="singleTop">-->
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="sdksample" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="net.sourceforge.simcpux.wxapi.WXPayEntryActivity"
-            android:theme="@style/DisablePreviewTheme"
-            android:exported="true"
-            android:launchMode="singleTop">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.VIEW" />-->
+                <!--<category android:name="android.intent.category.DEFAULT" />-->
+                <!--<data android:scheme="sdksample" />-->
+            <!--</intent-filter>-->
+        <!--</activity-alias>-->
+        <!--<activity-alias-->
+            <!--tools:replace="android:targetActivity"-->
+            <!--android:name="${applicationId}.wxapi.WXPayEntryActivity"-->
+            <!--android:exported="true"-->
+            <!--android:targetActivity=".wxapi.WXPayEntryActivity"-->
+            <!--android:launchMode="singleTop">-->
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="sdksample" />
-            </intent-filter>
-        </activity>
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.VIEW" />-->
+                <!--<category android:name="android.intent.category.DEFAULT" />-->
+                <!--<data android:scheme="sdksample" />-->
+            <!--</intent-filter>-->
+        <!--</activity-alias>-->
     </application>
 </manifest>

example/android/app/src/main/kotlin/com/jarvan/fluwxexample/MainActivity.kt

 package com.jarvan.fluwxexample
 
 import android.os.Bundle
-import net.sourceforge.simcpux.wxapi.WXEntryActivity
-import net.sourceforge.simcpux.wxapi.WXPayEntryActivity
+
 
 import io.flutter.app.FlutterActivity
 import io.flutter.plugins.GeneratedPluginRegistrant

example/android/app/src/main/kotlin/net/sourceforge/simcpux/wxapi/WXEntryActivity.java → example/android/app/src/main/kotlin/com/jarvan/fluwxexample/wxapi/WXEntryActivity.java

-package net.sourceforge.simcpux.wxapi;
+package com.jarvan.fluwxexample.wxapi;
+
+import android.os.Bundle;
+import android.widget.Toast;
 
 import com.jarvan.fluwx.wxapi.FluwxWXEntryActivity;
 
+import org.jetbrains.annotations.Nullable;
 
-public class WXEntryActivity extends FluwxWXEntryActivity {
 
+public class WXEntryActivity extends FluwxWXEntryActivity {
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
 }
\ No newline at end of file

example/android/app/src/main/kotlin/net/sourceforge/simcpux/wxapi/WXPayEntryActivity.java → example/android/app/src/main/kotlin/com/jarvan/fluwxexample/wxapi/WXPayEntryActivity.java

-package net.sourceforge.simcpux.wxapi;
+package com.jarvan.fluwxexample.wxapi;
 
 import com.jarvan.fluwx.wxapi.FluwxWXEntryActivity;
 

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }