1、完成扩展配置页的界面显示；2、下拉列表内容增加英文显示；3、删除一些多余的代码

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

@@ -187,19 +187,16 @@ public class Config extends AppCompatActivity
 
     //View Hopping Setting 定义
     private CheckBox cbHoppingEn;
-    private CheckBox cbRangeExt;
     private EditText edtFreqStart,edtFreqEnd;
     private EditText edtDetectStayTimes,edtDetectConfirmTimes;
     private CheckBox cbDisForceRef,cbDelayHopping;
-    private EditText edtFastHopLimit,edtHopThreshold,edtNoiseMinTh,edtSensorGroup;
+    private EditText edtHopThreshold,edtNoiseMinTh,edtSensorGroup;
     private EditText edtSeg1Normalize,edtSeg1Factor;
-    private EditText edtMainClockAjdust;
     private EditText edtSeg2Normalize,edtSeg2Factor;
     private EditText edtSeg3Normalize,edtSeg3Factor;
     private EditText edtSeg4Normalize,edtSeg4Factor;
     private EditText edtSeg5Normalize,edtSeg5Factor;
     private EditText edtSeg6Normalize;
-    private EditText edtHopFreqAddr;
     private EditText edtHopDetectTimes;
 
     //View Cfg Ram 定义
@@ -923,27 +920,25 @@ public class Config extends AppCompatActivity
         btnAllDriverChannels = viewtxrx.findViewById(R.id.alldriverchannels);
         btnAllDriverChannels.setOnClickListener(this);
     }
-    */
+
     private void initPlamRestrainSpin(){
         edtLargeTouch = viewselfsetting.findViewById(R.id.largetouch);
     }
 
+
     private void initHoppingSettingSpin(){
         cbHoppingEn = viewexconfig.findViewById(R.id.hoppingen);
-        cbRangeExt = viewexconfig.findViewById(R.id.rangeext);
         edtFreqStart = viewexconfig.findViewById(R.id.freqstart);
         edtFreqEnd = viewexconfig.findViewById(R.id.freqend);
         edtDetectStayTimes = viewexconfig.findViewById(R.id.detectstaytimes);
         edtDetectConfirmTimes = viewexconfig.findViewById(R.id.detectconfirmtimes);
         cbDisForceRef = viewexconfig.findViewById(R.id.disforceref);
         cbDelayHopping = viewexconfig.findViewById(R.id.delayhopping);
-        edtFastHopLimit = viewexconfig.findViewById(R.id.fasthoplimit);
         edtHopThreshold = viewexconfig.findViewById(R.id.hopthreshold);
         edtNoiseMinTh = viewexconfig.findViewById(R.id.noiseminth);
         edtSensorGroup = viewexconfig.findViewById(R.id.sensorgroup);
         edtSeg1Normalize = viewexconfig.findViewById(R.id.seg1normalize);
         edtSeg1Factor = viewexconfig.findViewById(R.id.seg1factor);
-        edtMainClockAjdust = viewexconfig.findViewById(R.id.mainclockajdust);
         edtSeg2Normalize = viewexconfig.findViewById(R.id.seg2normalize);
         edtSeg2Factor = viewexconfig.findViewById(R.id.seg2factor);
         edtSeg3Normalize = viewexconfig.findViewById(R.id.seg3normalize);
@@ -953,10 +948,9 @@ public class Config extends AppCompatActivity
         edtSeg5Normalize = viewexconfig.findViewById(R.id.seg5normalize);
         edtSeg5Factor = viewexconfig.findViewById(R.id.seg5factor);
         edtSeg6Normalize = viewexconfig.findViewById(R.id.seg6normalize);
-        edtHopFreqAddr = viewexconfig.findViewById(R.id.hopfreqaddr);
         edtHopDetectTimes = viewexconfig.findViewById(R.id.hopdetecttimes);
     }
-
+    */
     //Cfg Ram 定义
     private void initCfgShow() {
         mCfg8050 = viewcfgram.findViewById(R.id.cfg8050);
@@ -2633,10 +2627,6 @@ public class Config extends AppCompatActivity
         if ((mBytes[54] & 0x80) == 0x80){
             cbHoppingEn.setChecked(true);
         }
-        cbRangeExt.setChecked(false);
-        if ((mBytes[54] & 0x40) == 0x40){
-            cbRangeExt.setChecked(true);
-        }
         cbDisForceRef.setChecked(false);
         if ((mBytes[54] & 0x20) == 0x20){
             cbDisForceRef.setChecked(true);
@@ -2645,13 +2635,11 @@ public class Config extends AppCompatActivity
         if ((mBytes[54] & 0x10) == 0x10){
             cbDelayHopping.setChecked(true);
         }
-        edtFastHopLimit.setText(Integer.toString((mBytes[55] & 0xF0) >> 4));
         edtHopThreshold.setText(Integer.toString(mBytes[55] & 0x0F));
         edtNoiseMinTh.setText(Integer.toString(mBytes[57] & 0xFF));
         edtSensorGroup.setText(Integer.toString(mBytes[59] & 0xFF));
         edtSeg1Normalize.setText(Integer.toString(mBytes[60] & 0xFF));
         edtSeg1Factor.setText(Integer.toString(mBytes[61] & 0xFF));
-        edtMainClockAjdust.setText(Integer.toString(mBytes[62] & 0xFF));
         edtSeg2Normalize.setText(Integer.toString(mBytes[63] & 0xFF));
         edtSeg2Factor.setText(Integer.toString(mBytes[64] & 0xFF));
         edtSeg3Normalize.setText(Integer.toString(mBytes[66] & 0xFF));
@@ -2661,7 +2649,6 @@ public class Config extends AppCompatActivity
         edtSeg5Normalize.setText(Integer.toString(mBytes[72] & 0xFF));
         edtSeg5Factor.setText(Integer.toString(mBytes[73] & 0xFF));
         edtSeg6Normalize.setText(Integer.toString(mBytes[75] & 0xFF));
-        //edtHopFreqAddr.setText("C6E6");
         edtHopDetectTimes.setText(Integer.toString((mBytes[105] & 0xE0) >> 5));
     }
 
@@ -3154,21 +3141,15 @@ public class Config extends AppCompatActivity
         if (cbDisForceRef.isChecked()){
             mBytes[54] += 32;
         }
-        if (cbRangeExt.isChecked()){
-            mBytes[54] += 64;
-        }
         if (cbHoppingEn.isChecked()){
             mBytes[54] += 128;
         }
-        mBytes[55] = (byte)(Integer.parseInt(edtHopThreshold.getText().toString(),10) +
-                Integer.parseInt(edtFastHopLimit.getText().toString(),10) * 16);
         //mBytes[56]
         mBytes[57] = (byte)Integer.parseInt(edtNoiseMinTh.getText().toString(),10);
         mBytes[58] = (byte)Integer.parseInt(edtLcdPlusMinusValue.getText().toString(),10);
         mBytes[59] = (byte)Integer.parseInt(edtSensorGroup.getText().toString(),10);
         mBytes[60] = (byte)Integer.parseInt(edtSeg1Normalize.getText().toString(),10);
         mBytes[61] = (byte)Integer.parseInt(edtSeg1Factor.getText().toString(),10);
-        mBytes[62] = (byte)Integer.parseInt(edtMainClockAjdust.getText().toString(),10);
         mBytes[63] = (byte)Integer.parseInt(edtSeg2Normalize.getText().toString(),10);
         mBytes[64] = (byte)Integer.parseInt(edtSeg2Factor.getText().toString(),10);
         //mBytes[65]

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -100,7 +100,7 @@
             android:layout_column="0"
             android:layout_gravity="right"
             android:layout_marginRight="5dp"
-            android:text="INT触发方式"
+            android:text="INT Trigger Mode"
             android:textColor="#000000"
             android:textSize="22dp"/>
 
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="fill"
-            android:entries="@array/INT触发方式"
+            android:entries="@array/int_trigger_mode"
             android:background="@color/frame_search"/>
 
         <CheckBox

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="report_en">
+        <item>OFF</item>
+        <item>Low Level Output</item>
+        <item>High Level Output</item>
+    </string-array>
+
+    <string-array name="stretch_rank">
+        <item>0.4P</item>
+        <item>0.4P</item>
+        <item>Res</item>
+        <item>User Defined</item>
+    </string-array>
+
+    <string-array name="int_trigger_mode">
+        <item>Rising Edge</item>
+        <item>Falling Edge</item>
+        <item>Low Level</item>
+        <item>High Level</item>
+    </string-array>
+
+    <string-array name="refresh_rate">
+        <item>200Hz</item>
+        <item>167Hz</item>
+        <item>143Hz</item>
+        <item>125Hz</item>
+        <item>111Hz</item>
+        <item>100Hz</item>
+        <item>91Hz</item>
+        <item>83Hz</item>
+        <item>77Hz</item>
+        <item>71Hz</item>
+        <item>67Hz</item>
+        <item>63Hz</item>
+        <item>59Hz</item>
+        <item>56Hz</item>
+        <item>53Hz</item>
+        <item>50Hz</item>
+    </string-array>
+</resources>

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

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="report_en">
+        <item>关闭该功能</item>
+        <item>低电平输出坐标</item>
+        <item>高电平输出坐标</item>
+    </string-array>
+
     <string-array name="stretch_rank">
         <item>0.4P</item>
         <item>0.4P</item>
@@ -7,7 +13,7 @@
         <item>自定义系数</item>
     </string-array>
 
-    <string-array name="INT触发方式">
+    <string-array name="int_trigger_mode">
         <item>上升沿触发</item>
         <item>下降沿触发</item>
         <item>低电平查询</item>
@@ -32,86 +38,4 @@
         <item>53Hz</item>
         <item>50Hz</item>
     </string-array>
-
-    <string-array name="drv_output_r">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
-    <string-array name="dac_gain">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-    </string-array>
-
-    <string-array name="pga_gain">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-    </string-array>
-
-    <string-array name="rx_vcmi">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
-    <string-array name="pga_r">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
-    <string-array name="pga_c">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-    <string-array name="voltage">
-        <item>6V</item>
-        <item>7V</item>
-        <item>8V</item>
-        <item>9V</item>
-        <item>10V</item>
-        <item>11V</item>
-        <item>12V</item>
-        <item>13V</item>
-    </string-array>
-
-    <string-array name="boost_time">
-        <item>50ns</item>
-        <item>65ns</item>
-        <item>80ns</item>
-        <item>100ns</item>
-        <item>150ns</item>
-        <item>200ns</item>
-        <item>300ns</item>
-    </string-array>
-
-    <string-array name="alter_count">
-        <item>正常打码</item>
-        <item>两帧交替</item>
-        <item>四帧交替</item>
-    </string-array>
-
-    <string-array name="finger_restrain_pen">
-        <item>不抑制</item>
-        <item>外扩1通道数</item>
-        <item>外扩2通道数</item>
-        <item>外扩3通道数</item>
-    </string-array>
 </resources>