V2.2.0发布版

对于配置文件cfg导入
本地文件导入时，文件命名无限制，但不能有:冒号；
U盘文件导入时，文件命名必须为：GTxxxx_wingcool_config.cfg

app/build.gradle

@@ -7,14 +7,14 @@ android {
         minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
-        versionName "2.1.1"
+        versionName "2.2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     android.applicationVariants.all {
         variant ->
             variant.outputs.all{
                 //´Ë´¦Ö¸¶¨Éú³ÉµÄapkÎļþÃû
-                outputFileName = "WingCoolAPK_V2.1.1_20211224.apk"
+                outputFileName = "WingCoolAPK_V2.2.0_20211228.apk"
             }
     }
     lintOptions {

app/src/main/java/com/example/administrator/wingcool_gt9_apk/Config.java

@@ -1695,21 +1695,21 @@ public class Config extends AppCompatActivity
             StringBuffer buffer = new StringBuffer();
             String configString = "";
             Uri uri = data.getData();
-
-            if (requestCode == 1) {
+            String fileString = "";
+            if (requestCode == 1) {  //U 盘 文 件
 
                 byte[] filebuffer;
                 int len;
                 try {
 
-                    String fileString = "";
+                    //String fileString = "";
                     File storage = new File("/storage");
                     File[] files = storage.listFiles();
                     for (final File file : files) {
                         if (file.canRead()) {
                             if (!file.getName().equals(Environment.getExternalStorageDirectory().getName())) {
                                 //满足该条件的文件夹就是u盘在手机上的目录
-                                fileString = (file.getPath()+"/GT9110H_wingcool_config.cfg");
+                                fileString = (file.getPath()+"/GTxxxx_wingcool_config.cfg");
                                 fileString = fileString.replaceAll(":", "/");  //将:改为/，以防某些系统文件目录读出是:
                                 edit_search.setText(fileString);
                             }
@@ -1732,35 +1732,37 @@ public class Config extends AppCompatActivity
                     configString = buffer.toString();
 
                 } catch (IOException ex) {
-
-                    //edit_search.setText(getResources().getString(R.string.invalidfile));
                     edit_search.setText(uri.getPath() + "——" + getResources().getString(R.string.invalidfile));
                     return;
                 }
-            }
-            else if (requestCode == 2) {
+            }  //end of if (requestCode == 1)
+            else if (requestCode == 2) {  //本 地 文 件
 
                 try {
                     File dir = Environment.getExternalStorageDirectory();
                     //Uri uri = data.getData();
                     File dataFile;
-                    if (byProductType == GT9) {  //GT9
-                        edit_search.setText(dir.getPath() + "/GT9110H_wingcool_config.cfg");
-
-                        //File dir = Environment.getExternalStorageDirectory();
-                        dataFile = new File(dir.getPath(), "GT9110H_wingcool_config.cfg");
-                    } else if (byProductType == GT7) {  //GT7
-                        edit_search.setText(dir.getPath() + "/GT738x_wingcool_config.cfg");
 
-                        //File dir = Environment.getExternalStorageDirectory();
-                        dataFile = new File(dir.getPath(), "GT738x_wingcool_config.cfg");
-                    } else {  //other
-                        edit_search.setText(dir.getPath() + "/GTxxxx_wingcool_config.cfg");
+                    fileString = dir.getPath() + "/";
 
-                        //File dir = Environment.getExternalStorageDirectory();
-                        dataFile = new File(dir.getPath(), "GTxxxx_wingcool_config.cfg");
+                    if (uri.getLastPathSegment().indexOf(":") > 0){
+                        String[] stringFileNameArr = uri.getLastPathSegment().split(":");
+                        fileString += stringFileNameArr[1];
+                    }else{
+                        fileString += uri.getLastPathSegment();
                     }
 
+                    //fileString = dir.getPath() + "/" + uri.getLastPathSegment();
+                    //edit_search.setText(dir.getPath() + "/GTxxxx_wingcool_config.cfg");
+
+
+                    //fileString = fileString.replaceAll(":", "/");  //将:改为/，以防某些系统文件目录读出是:
+                    edit_search.setText(fileString);
+
+                    //File dir = Environment.getExternalStorageDirectory();
+                    //dataFile = new File(dir.getPath(), "GTxxxx_wingcool_config.cfg");
+                    dataFile = new File(fileString);
+
                     FileInputStream fis = new FileInputStream(dataFile);
                     //byte[] bytes = new byte[fis.available()];
                     //fis.read(bytes);
@@ -1780,12 +1782,10 @@ public class Config extends AppCompatActivity
                     configString = buffer.toString();
 
                 } catch (IOException c) {
-
                     edit_search.setText(uri.getPath() + "——" + getResources().getString(R.string.invalidfile));
-
                     return;
                 }
-            }
+            }  //end of else if (requestCode == 2)
 
     /*
                 Uri uri = data.getData();
@@ -1856,7 +1856,7 @@ public class Config extends AppCompatActivity
             }
 
             ReadCfgRam(stringCfgArr);
-        }
+        }  //end of if (resultCode == Activity.RESULT_OK)
     }
 
     private void initListener() {

app/src/main/res/layout-hdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-land-hdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-land-mdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-land-xhdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-land-xxhdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-land-xxxhdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-land/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-mdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-xhdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-xxhdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout-xxxhdpi/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/layout/activity_config.xml

@@ -46,7 +46,7 @@
                     android:layout_weight="18"
                     android:background="@drawable/bg_frame_search"
                     android:hint="@string/chooseconfig"
-                    android:maxLength="100"
+                    android:maxLength="200"
                     android:padding="5dp"
                     android:singleLine="true" />
 

app/src/main/res/values-en/strings.xml

@@ -105,7 +105,7 @@
     <string name="companyaddr">Address:Room 2008, Chuangxingda Business Building, No.36 Liuxian 3rd Road, Baoan District, Shenzhen</string>
     <string name="telephonenum">Telephone:186 8896 1937</string>
     <string name="emailaddr">Email:max@wingcool.cn</string>
-    <string name="version">APK Version:v2.1.1_20211224-Debug Version</string>
+    <string name="version">APK Version:v2.2.0_20211228-Release Version</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>

app/src/main/res/values/strings.xml

@@ -105,7 +105,7 @@
     <string name="companyaddr">地址：深圳市宝安区留仙三路 36 号创兴达商务大厦 2008 室</string>
     <string name="telephonenum">电话：186 8896 1937</string>
     <string name="emailaddr">邮箱：max@wingcool.cn</string>
-    <string name="version">APK版本：v2.1.1_20211224-Debug版本</string>
+    <string name="version">APK版本：v2.2.0_20211228-发布版本</string>
 
     <!-- other -->
     <string name="app_name">WingCoolAPK</string>