Browse Source

寄件开柜ui改造

zhushouping 1 year ago
parent
commit
1ff2c16ea5

+ 36 - 5
app/src/main/java/com/emato/ich/fragment/ExceptionFragment.java

@@ -1,5 +1,6 @@
 package com.emato.ich.fragment;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 
@@ -8,6 +9,7 @@ import com.emato.ich.utils.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -39,6 +41,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -176,9 +179,12 @@ public class ExceptionFragment extends Fragment {
 
         // 异常按钮提示
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        AlertDialog alertDialog = builder.setTitle("e站通")
-                .setMessage("点击按钮会执行相应操作! 本次投递只能使用一次! ")
-                .setPositiveButton("是", (dialog, which) -> {
+        //AlertDialog alertDialog = builder.setTitle("e站通")
+        AlertDialog alertDialog = builder.setTitle("温馨提示")
+                //.setMessage("点击按钮会执行相应操作! 本次投递只能使用一次! ")
+                .setMessage("点击按钮会执行相应操作! \n本次投递只能使用一次! \n确定执行吗?")
+                //.setPositiveButton("是", (dialog, which) -> {
+                .setPositiveButton("确认", (dialog, which) -> {
                     ObjectMapper objectMapper = JacksonUtils.objectmapper;
                     String response = bundle.getString("preparedOrderResponse");
                     String sectionType = bundle.getString("section_type");
@@ -282,7 +288,8 @@ public class ExceptionFragment extends Fragment {
                         LoggingUtils.sendErrorLog("业务异常: 异常页面解析订单数据失败! ", e);
                     }
                 })
-                .setNegativeButton("否", (dialog, which) -> {
+                //.setNegativeButton("否", (dialog, which) -> {
+                .setNegativeButton("取消", (dialog, which) -> {
                     LocalStorage.getInstance().getSession().setException(true);
                     binding.issueCancel.setEnabled(true);
                     binding.issueDoorNotOpen.setEnabled(true);
@@ -292,7 +299,31 @@ public class ExceptionFragment extends Fragment {
                     dialog.dismiss();
                 }).create();
         alertDialog.show();
-
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setBackgroundColor(Color.BLUE);
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextSize(20);
+        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextSize(20);
+        try {
+            //获取mAlert对象
+            Field mAlert = AlertDialog.class.getDeclaredField("mAlert");
+            mAlert.setAccessible(true);
+            Object mAlertController = mAlert.get(builder);
+            //获取mTitleView并设置大小颜色
+            Field mTitle = mAlertController.getClass().getDeclaredField("mTitleView");
+            mTitle.setAccessible(true);
+            TextView mTitleView = (TextView) mTitle.get(mAlertController);
+            mTitleView.setTextSize(25);
+            mTitleView.setTextColor(Color.BLUE);
+            //获取mMessageView并设置大小颜色
+            Field mMessage = mAlertController.getClass().getDeclaredField("mMessageView");
+            mMessage.setAccessible(true);
+            TextView mMessageView = (TextView) mMessage.get(mAlertController);
+            mMessageView.setTextSize(18);
+            mMessageView.setTextColor(Color.BLACK);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
     }
 
     private void disableButton(){

BIN
app/src/main/res/drawable/already_send_new.png


BIN
app/src/main/res/drawable/exception_handler_new.png


BIN
app/src/main/res/drawable/how_to_send.png


BIN
app/src/main/res/drawable/none_send_new.png


+ 6 - 0
app/src/main/res/drawable/textview_border_back_home.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="#E5F8FF" />
+    <stroke android:width="0.5dp" android:color="#00A0D7"/>
+    <corners android:radius="6dp" />
+</shape>

+ 6 - 0
app/src/main/res/drawable/textview_border_new.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="#ffffff" />
+    <stroke android:width="2dp" android:color="#00A0D7"/>
+    <corners android:radius="6dp" />
+</shape>

+ 115 - 1
app/src/main/res/layout/fragment_exception.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:focusable="true"
     android:focusableInTouchMode="true">
-    <TextView
+    <!--<TextView
         android:id="@+id/timeout"
         android:layout_width="50dp"
         android:layout_height="50dp"
@@ -70,6 +70,120 @@
         android:layout_x="204dp"
         android:layout_y="396dp"
         android:background="@drawable/issue_door_not_open"
+        android:theme="@style/Theme.ButtonStyle.BLACK" />-->
+
+
+    <TextView
+        android:id="@+id/return_btn"
+        android:layout_width="81.5dp"
+        android:layout_height="30dp"
+        android:layout_x="14dp"
+        android:layout_y="44dp"
+        android:background="@drawable/back_btn" />
+
+    <TextView
+        android:id="@+id/timeout"
+        android:layout_width="80dp"
+        android:layout_height="40dp"
+        android:layout_x="315dp"
+        android:layout_y="40dp"
+        android:gravity="center"
+        android:textSize="22dp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/exception_handle_title"
+        android:layout_width="81dp"
+        android:layout_height="40dp"
+        android:layout_x="166dp"
+        android:layout_y="40dp"
+        android:gravity="center"
+        android:text="@string/exception_deal"
+        android:textColor="#FF222222"
+        android:textSize="18sp" />
+
+    <TextView
+        android:id="@+id/issue_size"
+        android:layout_width="370dp"
+        android:layout_height="50dp"
+        android:layout_x="20dp"
+        android:layout_y="110dp"
+        android:text="@string/issue_size_new"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:textColor="#ff00a0d7"
+        android:textSize="20sp"
+        android:background="@drawable/textview_border_new" />
+
+    <TextView
+        android:id="@+id/issue_open_again"
+        android:layout_width="370dp"
+        android:layout_height="50dp"
+        android:layout_x="20dp"
+        android:layout_y="180dp"
+        android:text="@string/issue_open_again_new"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:textColor="#ff00a0d7"
+        android:textSize="20sp"
+        android:background="@drawable/textview_border_new" />
+
+    <TextView
+        android:id="@+id/issue_take_cancel"
+        android:layout_width="370dp"
+        android:layout_height="50dp"
+        android:layout_x="20dp"
+        android:layout_y="250dp"
+        android:text="@string/issue_take_cancel_new"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:textColor="#ff00a0d7"
+        android:textSize="20sp"
+        android:background="@drawable/textview_border_new"
         android:theme="@style/Theme.ButtonStyle.BLACK" />
 
+    <TextView
+        android:id="@+id/issue_door_not_open"
+        android:layout_width="370dp"
+        android:layout_height="50dp"
+        android:layout_x="20dp"
+        android:layout_y="320dp"
+        android:text="@string/issue_door_not_open_new"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:textColor="#ff00a0d7"
+        android:textSize="20sp"
+        android:background="@drawable/textview_border_new"
+        android:theme="@style/Theme.ButtonStyle.BLACK" />
+
+
+    <TextView
+        android:id="@+id/issue_cancel"
+        android:layout_width="370dp"
+        android:layout_height="50dp"
+        android:layout_x="20dp"
+        android:layout_y="390dp"
+        android:text="@string/issue_cancel_new"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:textColor="#ff00a0d7"
+        android:textSize="20sp"
+        android:background="@drawable/textview_border_new" />
+
+    <TextView
+        android:id="@+id/issue_other"
+        android:layout_width="370dp"
+        android:layout_height="50dp"
+        android:layout_x="20dp"
+        android:layout_y="460dp"
+        android:text="@string/issue_other_new"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:textColor="#ff00a0d7"
+        android:textSize="20sp"
+        android:background="@drawable/textview_border_new" />
+
+
+
+
 </AbsoluteLayout>

+ 172 - 2
app/src/main/res/layout/fragment_send_info_confirm.xml

@@ -1,15 +1,185 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <TextView
+        android:id="@+id/main_btn"
+        android:layout_width="81.5dp"
+        android:layout_height="30dp"
+        android:layout_x="14dp"
+        android:layout_y="44dp"
+        android:background="@drawable/main_btn" />
+
+    <TextView
+        android:id="@+id/timeout"
+        android:layout_width="80dp"
+        android:layout_height="40dp"
+        android:layout_x="315dp"
+        android:layout_y="40dp"
+        android:gravity="center"
+        android:textSize="22dp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/send_info_confirm_title"
+        android:layout_width="81dp"
+        android:layout_height="40dp"
+        android:layout_x="167dp"
+        android:layout_y="40dp"
+        android:gravity="center"
+        android:text="@string/express_send"
+        android:textColor="#FF222222"
+        android:textSize="18sp" />
+
+    <TextView
+        android:id="@+id/open_cabinet_hint1"
+        android:layout_width="200dp"
+        android:layout_height="30dp"
+        android:layout_x="100dp"
+        android:layout_y="96dp"
+        android:gravity="center"
+        android:text="@string/open_cabinet_hint_ok"
+        android:textColor="#FF222222"
+        android:textSize="15dp" />
+    <TextView
+        android:id="@+id/open_cabinet_hint2"
+        android:layout_width="200dp"
+        android:layout_height="30dp"
+        android:layout_x="100dp"
+        android:layout_y="120dp"
+        android:gravity="center"
+        android:text="@string/open_cabinet_hint"
+        android:textColor="#FF222222"
+        android:textSize="15dp" />
+
+    <TextView
+        android:id="@+id/send_door_open"
+        android:layout_width="85dp"
+        android:layout_height="88dp"
+        android:layout_x="100dp"
+        android:layout_y="160dp" />
+
+    <TextView
+        android:id="@+id/open_cabinet_no"
+        android:layout_width="200dp"
+        android:layout_height="70dp"
+        android:layout_x="100dp"
+        android:layout_y="256dp"
+        android:gravity="center"
+        android:text="@string/open_cabinet_no"
+        android:textColor="#00a0d7"
+        android:textStyle="bold"
+        android:textSize="60dp" />
+
+    <TextView
+        android:id="@+id/take_no_hint"
+        android:layout_width="100dp"
+        android:layout_height="30dp"
+        android:layout_x="100dp"
+        android:layout_y="340dp"
+        android:textAlignment="textStart"
+        android:gravity="center"
+        android:text="@string/take_no_hint"
+        android:textColor="#00a0d7"
+        android:textStyle="bold"
+        android:textSize="15dp"
+        tools:ignore="RtlCompat" />
+    <TextView
+        android:id="@+id/take_no"
+        android:layout_width="100dp"
+        android:layout_height="30dp"
+        android:layout_x="200dp"
+        android:layout_y="340dp"
+        android:textAlignment="textEnd"
+        android:gravity="center"
+        android:textColor="#00a0d7"
+        android:textStyle="bold"
+        android:textSize="15dp"
+        android:text="@string/take_no"
+        tools:ignore="RtlCompat" />
+
+    <TextView
+        android:id="@+id/take_number_hint"
+        android:layout_width="75dp"
+        android:layout_height="30dp"
+        android:layout_x="100dp"
+        android:layout_y="370dp"
+        android:textAlignment="textStart"
+        android:gravity="center"
+        android:text="@string/take_number_hint"
+        android:textColor="#00a0d7"
+        android:textStyle="bold"
+        android:textSize="15dp"
+        tools:ignore="RtlCompat" />
+    <TextView
+        android:id="@+id/take_number"
+        android:layout_width="125dp"
+        android:layout_height="30dp"
+        android:layout_x="175dp"
+        android:layout_y="370dp"
+        android:textAlignment="textEnd"
+        android:gravity="center"
+        android:text="@string/take_number"
+        android:textColor="#00a0d7"
+        android:textStyle="bold"
+        android:textSize="15dp"
+        tools:ignore="RtlCompat" />
+
+    <TextView
+        android:id="@+id/already_send"
+        android:layout_width="202dp"
+        android:layout_height="47dp"
+        android:layout_x="100dp"
+        android:layout_y="450dp"
+        android:background="@drawable/already_send_new"/>
+
+    <TextView
+        android:id="@+id/none_send"
+        android:layout_width="202dp"
+        android:layout_height="47dp"
+        android:layout_x="100dp"
+        android:layout_y="514dp"
+        android:background="@drawable/none_send_new"/>
+
+    <TextView
+        android:id="@+id/back_home"
+        android:layout_width="200dp"
+        android:layout_height="40dp"
+        android:layout_x="100dp"
+        android:layout_y="624dp"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:text="@string/return_main_btn"
+        android:textColor="#00a0d7"
+        android:textStyle="bold"
+        android:textSize="18dp"
+        android:background="@drawable/textview_border_back_home" />
+
+    <TextView
+        android:id="@+id/exception_btn"
+        android:layout_width="47dp"
+        android:layout_height="127dp"
+        android:layout_x="359dp"
+        android:layout_y="578dp"
+        android:radius="6dp"
+        android:background="@drawable/exception_handler_new" />
+    <ImageView
+        android:id="@+id/how_to_send"
+        android:layout_width="388dp"
+        android:layout_height="80dp"
+        android:layout_x="14dp"
+        android:layout_y="724dp"
+        android:background="@drawable/how_to_send" />
+
+    <!--<TextView
         android:id="@+id/return_main_btn"
         android:layout_width="90dp"
         android:layout_height="35dp"
         android:layout_x="14dp"
         android:layout_y="540dp"
-        android:background="@drawable/return_main" />
+        android:background="@drawable/return_main"
 
     <TextView
         android:id="@+id/timeout"
@@ -116,6 +286,6 @@
         android:layout_height="40dp"
         android:layout_x="-12dp"
         android:layout_y="286dp"
-        android:background="@drawable/exception_handler" />
+        android:background="@drawable/exception_handler" />-->
 
 </AbsoluteLayout>

+ 9 - 1
app/src/main/res/values/strings.xml

@@ -70,6 +70,7 @@
     <string name="input_payment_number">请出示支付宝或微信付款码,扫码支付</string>
     <string name="input_take_code">请输入取件码</string>
     <string name="android_take">取件码取件</string>
+    <string name="exception_deal">异常处理</string>
     <string name="wx_scan_take">微信扫码取件</string>
     <string name="prompt_word_top">为预防接触风险!</string>
     <string name="prompt_word_bottom">请使用微信扫码取件</string>
@@ -84,15 +85,21 @@
     <string name="choose_btn">选择</string>
     <string name="choose_cabinet">选择柜子类型</string>
     <string name="issue_size">尺寸不合适\n换个柜子</string>
+    <string name="issue_size_new">尺寸不合适换个柜子</string>
     <string name="issue_door_not_open">门没开\n换个柜门</string>
+    <string name="issue_door_not_open_new">门没开换个柜门</string>
     <string name="issue_open_again">再开一次\n调整快件</string>
+    <string name="issue_open_again_new">再开一次调整快件</string>
     <string name="issue_cancel">未投件\n取消投件</string>
+    <string name="issue_cancel_new">未投件取消投件</string>
     <string name="issue_take_cancel">拿出快件\n取消投递</string>
+    <string name="issue_take_cancel_new">拿出快件取消投递</string>
     <string name="issue_other">其它问题\n请联系我们</string>
+    <string name="issue_other_new">其它问题请联系\n162 7423 7018</string>
     <string name="issue_page">常见问题</string>
     <string name="open_cabinet_hint_ok">柜门已打开</string>
     <string name="open_cabinet_hint_error">柜门打开失败</string>
-    <string name="open_cabinet_no">006</string>
+    <string name="open_cabinet_no">0 0 6</string>
     <string name="open_cabinet_hint">物品放入后,请确认关好柜门</string>
     <string name="take_no_hint">投件单号:</string>
     <string name="take_no">投件单号</string>
@@ -124,6 +131,7 @@
     <string name="open_info">全开柜门</string>
     <string name="register_info">注册信息</string>
     <string name="express_delivery">我要寄快递</string>
+    <string name="express_send">寄快递</string>
     <string name="pick_up_the_item">取件码取件</string>
     <string name="delivery">我是派送员</string>
     <string name="courier_delivery">快递员派件</string>

+ 2 - 3
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue May 18 12:00:29 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

+ 172 - 110
gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# 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
+#
+#      https://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.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"