Merge pull request #50 from digitalgust/dev

Update pay function for app, and fix apple chinese input

desktop/glfw_gui/c/jni_minial.c

@@ -325,7 +325,7 @@ void setupCallback(Runtime *runtime, JClass *clazz) {
     c8 *type_s;
     c8 *clsname_s;
     if (!refers._callback_minial_on_recv_frames) {
-        clsname_s = "org/mini/media/MADevice";
+        clsname_s = "org/mini/media/MaDevice";
         name_s = "onReceiveFrames";
         type_s = "(JIJ)V";
         Utf8String *clsname = env->utf8_create_part_c(clsname_s, 0, strlen(clsname_s));
@@ -337,7 +337,7 @@ void setupCallback(Runtime *runtime, JClass *clazz) {
         env->utf8_destory(type);
     }
     if (!refers._callback_minial_on_send_frames) {
-        clsname_s = "org/mini/media/MADevice";
+        clsname_s = "org/mini/media/MaDevice";
         name_s = "onSendFrames";
         type_s = "(JIJ)I";
         Utf8String *clsname = env->utf8_create_part_c(clsname_s, 0, strlen(clsname_s));
@@ -349,7 +349,7 @@ void setupCallback(Runtime *runtime, JClass *clazz) {
         env->utf8_destory(type);
     }
     if (!refers._callback_minial_on_stop) {
-        clsname_s = "org/mini/media/MADevice";
+        clsname_s = "org/mini/media/MaDevice";
         name_s = "onStop";
         type_s = "(J)V";
         Utf8String *clsname = env->utf8_create_part_c(clsname_s, 0, strlen(clsname_s));

desktop/glfw_gui/java/pom.xml

@@ -8,7 +8,7 @@
     <groupId>io.github.digitalgust</groupId>
     <artifactId>glfw_gui</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>1.1.7</version>
+    <version>1.1.10</version>
     <description>miniJVM desktop platform gui library</description>
     <url>https://github.com/digitalgust/miniJVM</url>
 
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>io.github.digitalgust</groupId>
             <artifactId>minijvm_rt</artifactId>
-            <version>1.1.7</version>
+            <version>1.1.9</version>
         </dependency>
     </dependencies>
 

desktop/glfw_gui/java/src/main/java/org/mini/glfm/Glfm.java

@@ -297,6 +297,25 @@ public static boolean glfmExtensionSupported(String extension) {
     }
 
     public static int glfmOpenOtherApp(byte[] cStyleURL, byte[] cStyleMore, int detectAppInstalled) {
+        try {
+            String url = new String(cStyleURL, "utf-8");
+            String more = new String(cStyleMore, "utf-8");
+            String osName = System.getProperty("os.name", "");// 获取操作系统的名字
+            if (osName.startsWith("Mac OS")) {
+                // Mac OS
+                if (more.length() > 0) {
+                    Runtime.getRuntime().exec("open " + url + " " + more);
+                } else {
+                    Runtime.getRuntime().exec("open " + url);
+                }
+            } else if (osName.startsWith("Windows")) {
+                // Windows
+                Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return 1;
     }
 
@@ -305,4 +324,8 @@ public static String glfmRemoteMethodCall(String inJsonStr) {
         return null;
     }
 
+
+    public static void glfmBuyAppleProductById(long display, String productId, String base64HandleScript) {
+
+    }
 }

extlib/xgui/pom.xml

@@ -9,7 +9,7 @@
     <groupId>io.github.digitalgust</groupId>
     <artifactId>xgui</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>1.1.14</version>
+    <version>1.1.15</version>
     <description>miniJVM mobile platform gui library</description>
     <url>https://github.com/digitalgust/miniJVM</url>
 
@@ -118,7 +118,6 @@
                         <extensions>true</extensions>
                         <configuration>
                             <publishingServerId>central</publishingServerId>
-                            <tokenAuth>true</tokenAuth>
                             <waitMaxTime>7200</waitMaxTime>
                             <centralBaseUrl>https://central.sonatype.com</centralBaseUrl>
                         </configuration>
@@ -167,18 +166,20 @@
 
         <!--        <dependency>-->
         <!--            <groupId>io.github.digitalgust</groupId>-->
-        <!--            <artifactId>minijvm_rt</artifactId>-->
+        <!--            <artifactId>minijvm_rt_loc</artifactId>-->
         <!--            <version>1.0</version>-->
+        <!--            <scope>system</scope>-->
+        <!--            <systemPath>${basedir}/../../mobile/assets/resfiles/minijvm_rt.jar</systemPath>-->
         <!--        </dependency>-->
         <dependency>
             <groupId>io.github.digitalgust</groupId>
             <artifactId>glfw_gui</artifactId>
-            <version>1.1.7</version>
+            <version>1.1.10</version>
         </dependency>
         <dependency>
             <groupId>io.github.digitalgust</groupId>
             <artifactId>glfm_gui</artifactId>
-            <version>1.1.7</version>
+            <version>1.1.10</version>
         </dependency>
     </dependencies>
 
@@ -195,7 +196,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <!--  copy to binary lib dir -->
                                 <mkdir dir="../../mobile/assets/resfiles"/>
                                 <copy todir="../../mobile/assets/resfiles/" overwrite="true">
@@ -210,7 +211,7 @@
                                         <include name="${project.artifactId}.jar"/>
                                     </fileset>
                                 </copy>
-                            </tasks>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>