wangh
/
5106utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: wangh:master
Branches Tags
wangh:master
wangh:fengshen
...
pull from: wangh:fengshen
Branches Tags
wangh:master
wangh:fengshen

1 Commits
master ... fengshen

Author SHA1 Message Date
wanghao 2f48e3f31d 增加 风神接口 2 months ago
9 changed files with 350 additions and 145 deletions
Show Stats

49
.idea/androidTestResultsUserPreferences.xml
Unescape Escape View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AndroidTestResultsUserPreferences">
<option name="androidTestResultsTableState">
<map>
<entry key="-941396539">
<value>
<AndroidTestResultsTableState>
<option name="preferredColumnWidths">
<map>
<entry key="Duration" value="90" />
<entry key="Tests" value="360" />
<entry key="alps k62v1_3h" value="120" />
</map>
</option>
</AndroidTestResultsTableState>
</value>
</entry>
<entry key="-531529726">
<value>
<AndroidTestResultsTableState>
<option name="preferredColumnWidths">
<map>
<entry key="Duration" value="90" />
<entry key="Pixel_2_API_33" value="120" />
<entry key="Tests" value="360" />
<entry key="alps k62v1_3h" value="120" />
</map>
</option>
</AndroidTestResultsTableState>
</value>
</entry>
<entry key="1094103868">
<value>
<AndroidTestResultsTableState>
<option name="preferredColumnWidths">
<map>
<entry key="Duration" value="90" />
<entry key="Tests" value="360" />
<entry key="alps k62v1_3h" value="120" />
</map>
</option>
</AndroidTestResultsTableState>
</value>
</entry>
</map>
</option>
</component>
</project>

4
app/build.gradle
Unescape Escape View File

@ -31,8 +31,8 @@ android {
dataBinding true dataBinding true
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_15
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_15
} }
} }

140
app/src/androidTest/java/com/example/writeepc/ShuangqianActivity2Test.java
Unescape Escape View File

@ -0,0 +1,140 @@
package com.example.writeepc;
import android.util.Log;
import com.example.writeepc.been.MESInfo;
import junit.framework.TestCase;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ShuangqianActivity2Test extends TestCase {
public void test() {
String result = """
<?xml version="1.0" encoding="utf-8"?>
<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<soap:Body>
<GetRFIDBindingInfoResponse xmlns="http://tempuri.org/">
<GetRFIDBindingInfoResult>
<xs:schema id="NewDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xs:element name="NewDataSet" msdata:IsDataSet="true" msdata:MainDataTable="Table" msdata:UseCurrentLocale="true">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Table">
<xs:complexType>
<xs:sequence>
<xs:element name="品牌" type="xs:string" minOccurs="0"/>
<xs:element name="规格" type="xs:string" minOccurs="0"/>
<xs:element name="花纹类型" type="xs:string" minOccurs="0"/>
<xs:element name="胎号" type="xs:string" minOccurs="0"/>
<xs:element name="DOT" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:schema>
<diffgr:diffgram xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:diffgr="urn:schemas-microsoft-com:xml-diffgram-v1">
<NewDataSet xmlns="">
<Table diffgr:id="Table1" msdata:rowOrder="0">
<品牌>123</品牌>
<规格>1234</规格>
<花纹类型>1235</花纹类型>
<胎号>1236</胎号>
<DOT>1236</DOT>
</Table>
</NewDataSet>
</diffgr:diffgram>
</GetRFIDBindingInfoResult>
</GetRFIDBindingInfoResponse>
</soap:Body>
</soap:Envelope>
""";
String regex = "<Table .*\">";
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(result);
if (!matcher.find()) {
System.out.println("未找到匹配的内容");
return;
}
String matched = matcher.group();// 匹配内容
int beginIndex = matcher.start() + matched.length();
int endIndex = result.indexOf("</Table>");
Log.e("TAG", "test1:" + beginIndex);
Log.e("TAG", "test2:" + endIndex);
if (beginIndex >= endIndex) {
System.out.println("未找到匹配的内容");
return;
}
result = result.substring(beginIndex, endIndex);
System.out.println("截取内容：" + result);
// <品牌>风神</品牌><规格>10.00R20</规格><花纹类型>AGC08</花纹类型)<胎号>ZB250901399</胎号><DOT>3625</DOT>
String[] str=new String[]{"品牌","规格","花纹类型","胎号","DOT"};
for (String s : str) {
String tag = "<" + s + ">";
System.out.println("-"+result.substring(result.indexOf(tag) + tag.length(), result.indexOf("</"+s+">"))+"-");
}
/* InputStream inputStream = new StringBufferInputStream(result);
XmlPullParser parser = Xml.newPullParser();
parser.setInput(inputStream, "utf-8"); // 设置输入流和编码
int eventType = parser.getEventType();
boolean isInTable = false; // 是否进入<Table>节点
while (eventType != XmlPullParser.END_DOCUMENT) {
String tagName = parser.getName();
System.out.println("tab name :"+tagName);
switch (eventType) {
case XmlPullParser.START_TAG:
// 找到<Table>节点，初始化数据对象
if ("Table".equals(tagName)) {
isInTable = true;
} else if (isInTable) {
switch (tagName) {
case "品牌":
String trim = parser.nextText().trim();
System.out.println(trim);
break;
case "规格":
String trim2 = parser.nextText().trim();
System.out.println(trim2);
break;
case "花纹类型":
String trim3 = parser.nextText().trim();
System.out.println(trim3);
break;
case "胎号":
String trim4 = parser.nextText().trim();
System.out.println(trim4);
break;
case "DOT":
String trim5 = parser.nextText().trim();
System.out.println(trim5);
break;
}
}
break;
case XmlPullParser.END_TAG:
// 退出<Table>节点
if ("Table".equals(tagName)) {
isInTable = false;
}
break;
}
eventType = parser.next(); // 解析下一个事件
}*/
}
}

2
app/src/main/java/com/example/writeepc/SettingsActivity.java
Unescape Escape View File

@ -32,7 +32,7 @@ public class SettingsActivity extends AppCompatActivity {
List<String> powerList = Arrays.asList(getResources().getStringArray(R.array.power)); List<String> powerList = Arrays.asList(getResources().getStringArray(R.array.power));
powerBinding.setSelection(powerList.indexOf(bindingPower)); powerBinding.setSelection(powerList.indexOf(bindingPower));
powerTrace.setSelection(powerList.indexOf(tracePower)); powerTrace.setSelection(powerList.indexOf(tracePower));
settingIp.setText(SharedPreferencesUtils.getstring("ip", null)); settingIp.setText(SharedPreferencesUtils.getstring("ip", "http://10.72.36.3:8090/FSRFID.asmx"));
} }
public void saveInfo(View view) { public void saveInfo(View view) {

90
app/src/main/java/com/example/writeepc/ShuangqianActivity.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.example.writeepc;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@ -20,6 +21,8 @@ import com.lzy.okgo.model.Response;
import com.lzy.okgo.request.base.Request; import com.lzy.okgo.request.base.Request;
import com.uhf.api.cls.Reader; import com.uhf.api.cls.Reader;
import java.time.Year;
public class ShuangqianActivity extends BaseActivity implements MyScannerCall { public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
private ActivityShuangqianBinding binding; private ActivityShuangqianBinding binding;
@ -29,19 +32,15 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this, R.layout.activity_shuangqian); binding = DataBindingUtil.setContentView(this, R.layout.activity_shuangqian);
String ACTION_SCAN_INIT = "com.rfid.SCAN_INIT"; String ACTION_SCAN_INIT = "com.rfid.SCAN_INIT";
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(ACTION_SCAN_INIT); intent.setAction(ACTION_SCAN_INIT);
sendBroadcast(intent); sendBroadcast(intent);
initUHFRManager1(); initUHFRManager1();
initDialog(); initDialog();
int powerBinding = Integer.parseInt(SharedPreferencesUtils.getstring("powerBinding", "22")); int powerBinding = Integer.parseInt(SharedPreferencesUtils.getstring("powerBinding", "22"));
Reader.READER_ERR readerErr = uhfrManager.setPower(powerBinding, powerBinding); // Reader.READER_ERR readerErr = uhfrManager.setPower(powerBinding, powerBinding);
myReceiver = new MyScannerReceiver(this); myReceiver = new MyScannerReceiver(this);
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction("com.rfid.SCAN"); intentFilter.addAction("com.rfid.SCAN");
@ -50,6 +49,10 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
binding.setTitle(type ? "MES轮胎绑定" : "解绑"); binding.setTitle(type ? "MES轮胎绑定" : "解绑");
binding.setType(type); binding.setType(type);
// uriLastStr = type ? "barcodeAndRFIDBinding" : "unBinding"; // uriLastStr = type ? "barcodeAndRFIDBinding" : "unBinding";
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
binding.socketYear.setText(String.valueOf(Year.now().getValue()));
}
} }
// 读取 // 读取
@ -73,16 +76,16 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
public void submit(View view) { public void submit(View view) {
String epc = binding.socketEpc.getText().toString(); String epc = binding.socketEpc.getText().toString();
String code = binding.socketBarcode.getText().toString(); String code = binding.socketBarcode.getText().toString();
if (epc.isEmpty() || code.isEmpty()) return; String year = binding.socketYear.getText().toString();
haohuaSubmit(epc, code); if (epc.isEmpty() || code.isEmpty() || year.isEmpty()) return;
// callWebService(buildSoapRequest(epc, code));//双钱 // haohuaSubmit(epc, code);
callWebService(buildSoapRequest(epc, code, year));// 双钱
} }
// 解绑 // 解绑
public void unBindingSubmit(View view) { public void unBindingSubmit(View view) {
String epc = binding.socketEpc.getText().toString(); String epc = binding.socketEpc.getText().toString();
String code = binding.socketBarcode.getText().toString(); String code = binding.socketBarcode.getText().toString();
haohuaSubmit(epc, code); haohuaSubmit(epc, code);
} }
@ -116,7 +119,10 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
private void callWebService(String soapRequest) { private void callWebService(String soapRequest) {
// 发送 POST 请求 // 发送 POST 请求
OkGo.<String>post("http://10.135.55.206:99/WebService.asmx").headers("Content-Type", "text/xml; charset=utf-8").upString(soapRequest, mediaType).execute(new StringCallback() { OkGo.<String>post(SharedPreferencesUtils.getstring("ip", "http://10.72.36.3:8090/FSRFID.asmx"))
.headers("Content-Type", "text/xml; charset=utf-8")
.upString(soapRequest, mediaType)
.execute(new StringCallback() {
@Override @Override
public void onStart(Request<String, ? extends Request> request) { public void onStart(Request<String, ? extends Request> request) {
super.onStart(request); super.onStart(request);
@ -128,40 +134,20 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
// 处理响应结果 // 处理响应结果
String result = response.body(); String result = response.body();
try { try {
String str = "<faultstring>";
int faultstringIndex = result.indexOf(str);
if (faultstringIndex > -1) {
String faultstring =
result.substring(faultstringIndex + str.length(), result.indexOf("</faultstring>"));
tipsDialog.setTip(false, faultstring);
tipsDialog.show();
return;
}
int codeIndex = result.indexOf("<Code>");
if (codeIndex > -1) {
String resultCode =
result.substring(codeIndex + 6, result.indexOf("</Code>"));
String resultMsg =
result.substring(result.indexOf("<Msg>") + 5, result.indexOf("</Msg>"));
if (resultCode.equals("200")) {
tipsDialog.setTip(true, resultMsg);
tipsDialog.show();
binding.socketBarcode.setText(null);
binding.socketEpc.setText(null);
} else {
tipsDialog.setTip(false, resultMsg);
tipsDialog.show();
}
// clearView(null); String str = "<SubmitRFIDBindingInfoResult>";
} String subStringResult =
result.substring(result.indexOf(str) + str.length(), result.indexOf("</SubmitRFIDBindingInfoResult>")).trim();
boolean equals = subStringResult.equals("OK");
tipsDialog.setTip(equals, subStringResult);
tipsDialog.show();
} catch (Exception e) { } catch (Exception e) {
tipsDialog.setTip(false, "接口返回信息异常"); tipsDialog.setTip(false, "接口返回信息异常");
tipsDialog.show(); tipsDialog.show();
} }
} }
@Override @Override
public void onFinish() { public void onFinish() {
super.onFinish(); super.onFinish();
@ -171,20 +157,26 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
} }
// 创建提交信息 // 创建提交信息
private String buildSoapRequest(String epcid, String barcode) { private String buildSoapRequest(String epcid, String barcode, String year) {
String soapRequest = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + return String.format("""
"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + <soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:tem="http://tempuri.org/">
"<soap:Body>" + <soap:Header>
"<RFID_BarcodBind xmlns=\"http://tempuri.org/\">" + <tem:MySoapHeader>
"<epcid>" + epcid + "</epcid>" + <tem:UserName>RFID-MES</tem:UserName>
"<barcode>" + barcode + "</barcode>" + <tem:PassWord>Yh#14ulh!6hk9ue4ml</tem:PassWord>
"</RFID_BarcodBind>" + </tem:MySoapHeader>
"</soap:Body>" + </soap:Header>
"</soap:Envelope>"; <soap:Body>
return soapRequest; <tem:SubmitRFIDBindingInfo>
<tem:RFIDCode>%s</tem:RFIDCode>
<tem:GreenTyreNo>%s</tem:GreenTyreNo>
<tem:YearNo>%s</tem:YearNo>
</tem:SubmitRFIDBindingInfo>
</soap:Body>
</soap:Envelope>
""", epcid, barcode, year);
} }
@Override @Override
public void getScannerData(String data) { public void getScannerData(String data) {
binding.socketBarcode.setText(data); binding.socketBarcode.setText(data);

95
app/src/main/java/com/example/writeepc/ShuangqianActivity2.java
Unescape Escape View File

@ -37,6 +37,8 @@ import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ShuangqianActivity2 extends BaseActivity { public class ShuangqianActivity2 extends BaseActivity {
private ActivityShuangqian2Binding binding; private ActivityShuangqian2Binding binding;
@ -46,6 +48,7 @@ public class ShuangqianActivity2 extends BaseActivity {
private Handler handler = new Handler(); private Handler handler = new Handler();
private Runnable runnable; private Runnable runnable;
private MyKeyReceiver keyReceiver; private MyKeyReceiver keyReceiver;
private List<MESInfo> mesInfos;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -59,7 +62,10 @@ public class ShuangqianActivity2 extends BaseActivity {
Log.e("TAG", "追溯设置功率" + powerTrace1 + ":" + readerErr.name()); Log.e("TAG", "追溯设置功率" + powerTrace1 + ":" + readerErr.name());
initDialog(); initDialog();
adapter = new MyMesInfoAdapter(this); adapter = new MyMesInfoAdapter(this);
mesInfos = new ArrayList<>();
adapter.setList(mesInfos);
binding.setAdapter(adapter); binding.setAdapter(adapter);
traceSanButton = binding.traceSanButton; traceSanButton = binding.traceSanButton;
runnable = new Runnable() { runnable = new Runnable() {
@Override @Override
@ -95,7 +101,7 @@ public class ShuangqianActivity2 extends BaseActivity {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
if (s.length()==24){ if (s.length() == 24) {
haohuaMesSelect(s.toString()); haohuaMesSelect(s.toString());
} }
@ -131,7 +137,7 @@ public class ShuangqianActivity2 extends BaseActivity {
if (readState) { if (readState) {
dataReadRFID(null); dataReadRFID(null);
// callWebService(buildSelectRequest(result)); callWebService(buildSelectRequest(result));
// haohuaMesSelect(result); // haohuaMesSelect(result);
@ -185,7 +191,7 @@ public class ShuangqianActivity2 extends BaseActivity {
private void callWebService(String soapRequest) { private void callWebService(String soapRequest) {
// 发送 POST 请求 // 发送 POST 请求
OkGo.<String>post("http://10.135.55.206:99/WebService.asmx") OkGo.<String>post(SharedPreferencesUtils.getstring("ip", "http://10.72.36.3:8090/FSRFID.asmx"))
.headers("Content-Type", "text/xml; charset=utf-8") .headers("Content-Type", "text/xml; charset=utf-8")
.upString(soapRequest, mediaType) .upString(soapRequest, mediaType)
.execute(new StringCallback() { .execute(new StringCallback() {
@ -198,39 +204,42 @@ public class ShuangqianActivity2 extends BaseActivity {
@Override @Override
public void onSuccess(Response<String> response) { public void onSuccess(Response<String> response) {
// 处理响应结果 // 处理响应结果
String result = response.body();
try { try {
String str = "<faultstring>"; mesInfos.clear();
int faultstringIndex = result.indexOf(str); String result = response.body();
if (faultstringIndex > -1) { String regex = "<Table .*\">";
String faultstring = Pattern pattern = Pattern.compile(regex);
result.substring(faultstringIndex + str.length(), result.indexOf("</faultstring>")); Matcher matcher = pattern.matcher(result);
tipsDialog.setTip(false, faultstring); if (!matcher.find()) {
tipsDialog.setTip(false, "未找到匹配的内容");
tipsDialog.show(); tipsDialog.show();
return; return;
} }
int codeIndex = result.indexOf("<Code>"); String matched = matcher.group();// 匹配内容
if (codeIndex > -1) { int beginIndex = matcher.start() + matched.length();
String resultCode = int endIndex = result.indexOf("</Table>");
result.substring(codeIndex + 6, result.indexOf("</Code>")); Log.e("TAG", "test1:" + beginIndex);
if (resultCode.equals("200")) { Log.e("TAG", "test2:" + endIndex);
String resultMsg = if (beginIndex >= endIndex) {
result.substring(result.indexOf("<Entity>") + 8, result.indexOf("</Entity>")); tipsDialog.setTip(false, "未找到匹配的内容");
tipsDialog.show();
jiexi(resultMsg);
return; return;
} }
String resultMsg = String[] str = new String[]{"品牌", "规格", "花纹类型", "胎号", "DOT"};
result.substring(result.indexOf("<Msg>") + 5, result.indexOf("</Msg>")); for (String s : str) {
tipsDialog.setTip(false, resultMsg); String tag = "<" + s + ">";
tipsDialog.show(); MESInfo mesInfo = new MESInfo();
mesInfo.setTitle(s);
mesInfo.setInfo(result.substring(result.indexOf(tag) + tag.length(), result.indexOf("</" + s + ">")));
mesInfos.add(mesInfo);
} }
} catch (Exception e) { } catch (Exception e) {
tipsDialog.setTip(false, "接口返回信息异常"); tipsDialog.setTip(false, "接口返回信息异常");
tipsDialog.show(); tipsDialog.show();
} }
}
adapter.notifyDataSetChanged();
}
@Override @Override
public void onFinish() { public void onFinish() {
@ -242,16 +251,22 @@ public class ShuangqianActivity2 extends BaseActivity {
// 创建验证信息 // 创建验证信息
private String buildSelectRequest(String epcid) { private String buildSelectRequest(String epcid) {
StringBuilder soapRequest = new StringBuilder(); String soapRequest = String.format("""
soapRequest.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>"); <soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:tem="http://tempuri.org/">
soapRequest.append("<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"); <soap:Header>
soapRequest.append("<soap:Body>"); <tem:MySoapHeader>
soapRequest.append("<TyreTracingBack xmlns=\"http://tempuri.org/\">"); <tem:UserName>RFID-MES</tem:UserName>
soapRequest.append("<epcid>").append(epcid).append("</epcid>"); <tem:PassWord>Yh#14ulh!6hk9ue4ml</tem:PassWord>
soapRequest.append("</TyreTracingBack>"); </tem:MySoapHeader>
soapRequest.append("</soap:Body>"); </soap:Header>
soapRequest.append("</soap:Envelope>"); <soap:Body>
return soapRequest.toString(); <tem:GetRFIDBindingInfo>
<tem:RFIDCode>%s</tem:RFIDCode>
</tem:GetRFIDBindingInfo>
</soap:Body>
</soap:Envelope>
""", epcid);
return soapRequest;
} }
private void jiexi(String msg) { private void jiexi(String msg) {
@ -330,6 +345,12 @@ public class ShuangqianActivity2 extends BaseActivity {
} }
} }
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(keyReceiver);
}
private class MyKeyReceiver extends BroadcastReceiver { private class MyKeyReceiver extends BroadcastReceiver {
@Override @Override
@ -340,10 +361,4 @@ public class ShuangqianActivity2 extends BaseActivity {
} }
} }
} }
@Override
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(keyReceiver);
}
} }

13
app/src/main/res/layout/activity_home.xml
Unescape Escape View File

@ -67,7 +67,8 @@
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:gravity="center" android:gravity="center"
android:text="解绑" android:text="解绑"
android:textSize="20sp" /> android:textSize="20sp"
android:visibility="gone" />
<RadioButton <RadioButton
android:id="@+id/home_4" android:id="@+id/home_4"
@ -81,6 +82,15 @@
android:text="设置" android:text="设置"
android:textSize="20sp" /> android:textSize="20sp" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:button="@null"
android:drawablePadding="10dp"
android:gravity="center"
android:textSize="20sp" />
</RadioGroup> </RadioGroup>
<RadioGroup <RadioGroup
@ -103,7 +113,6 @@
android:textSize="20sp" /> android:textSize="20sp" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>

38
app/src/main/res/layout/activity_shuangqian.xml
Unescape Escape View File

@ -58,27 +58,27 @@
</LinearLayout> </LinearLayout>
<!-- <LinearLayout--> <LinearLayout
<!-- android:layout_width="match_parent"--> android:layout_width="match_parent"
<!-- android:layout_height="55dp"--> android:layout_height="55dp"
<!-- android:layout_marginTop="20dp"--> android:layout_marginTop="20dp"
<!-- android:orientation="horizontal">--> android:orientation="horizontal">
<!-- <TextView--> <TextView
<!-- style="@style/info_text"--> style="@style/info_text"
<!-- android:layout_width="110dp"--> android:layout_width="110dp"
<!-- android:layout_height="match_parent"--> android:layout_height="match_parent"
<!-- android:layout_gravity="center"--> android:layout_gravity="center"
<!-- android:text="胎胚年份:" />--> android:text="胎胚年份:" />
<!-- <EditText--> <EditText
<!-- android:id="@+id/socket_year"--> android:id="@+id/socket_year"
<!-- android:layout_width="match_parent"--> android:layout_width="match_parent"
<!-- android:layout_height="match_parent"--> android:layout_height="match_parent"
<!-- android:layout_gravity="center"--> android:layout_gravity="center"
<!-- android:gravity="center"--> android:gravity="center"
<!-- />--> />
<!-- </LinearLayout>--> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

18
app/src/main/res/layout/settings_activity.xml
Unescape Escape View File

@ -71,29 +71,29 @@
android:textAlignment="center" /> android:textAlignment="center" />
</LinearLayout> </LinearLayout>
<LinearLayout <!-- <LinearLayout-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="45dp" <!-- android:layout_height="45dp"-->
android:layout_marginTop="20dp" <!-- android:layout_marginTop="20dp"-->
android:orientation="horizontal" <!-- android:orientation="horizontal"-->
android:visibility="gone"> <!-- >-->
<TextView <TextView
style="@style/info_text" style="@style/info_text"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_gravity="center"
android:text="请求地址:" /> android:text="请求地址:" />
<EditText <EditText
android:id="@+id/setting_ip" android:id="@+id/setting_ip"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="55dp"
android:layout_gravity="center" android:layout_gravity="center"
android:entries="@array/power" android:entries="@array/power"
android:layout_marginLeft="10dp"
android:lines="1" android:lines="1"
android:textAlignment="center" /> android:textAlignment="center" />
</LinearLayout> <!-- </LinearLayout>-->
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"

Write Preview
Loading…
Cancel
Save