venue/venue_android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 修改Json传递失败问题

Browse Source
This commit is contained in:
limqhz
2020-08-02 17:10:22 +08:00
parent 2f073d67a1
commit 5b1393c73d
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -48,7 +48,7 @@ android {
*/ */
// buildConfigField("String", "SERVER_IP", "\"120.27.209.4\"") // buildConfigField("String", "SERVER_IP", "\"120.27.209.4\"")
// buildConfigField("String", "SERVER_PORT", "\"56792\"") // buildConfigField("String", "SERVER_PORT", "\"56792\"")
buildConfigField("String", "SERVER_IP", "\"192.168.0.108\"") buildConfigField("String", "SERVER_IP", "\"192.168.0.105\"")
buildConfigField("String", "SERVER_PORT", "\"56792\"") buildConfigField("String", "SERVER_PORT", "\"56792\"")
/** /**
* 门禁连接地址 * 门禁连接地址

4
app/src/main/java/com/ydd/sportfaceid/netty/message/MessageDTO.java
View File

@@ -1,10 +1,14 @@
package com.ydd.sportfaceid.netty.message; package com.ydd.sportfaceid.netty.message;
import com.google.gson.annotations.Expose;
import java.io.Serializable; import java.io.Serializable;
public class MessageDTO implements Serializable { public class MessageDTO implements Serializable {
@Expose
private MessageType messageType; private MessageType messageType;
@Expose
private String message; private String message;
public MessageDTO(MessageType messageType, String message) { public MessageDTO(MessageType messageType, String message) {

34
app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java
View File

@@ -79,9 +79,6 @@ public class SDSettingActivity extends SDBaseActivity {
e.printStackTrace(); e.printStackTrace();
} }
resultList = JsonMapper.fromJson(result,new TypeToken<List<VenueItem>>(){}.getType()); resultList = JsonMapper.fromJson(result,new TypeToken<List<VenueItem>>(){}.getType());
List<VenueItem> objectList = new Gson().fromJson(result, new TypeToken<List<VenueItem>>(){}.getType());
System.out.println(resultList.get(0).getVenueId());
System.out.println(objectList.get(0).getVenueId());
Message message = new Message(); Message message = new Message();
message.what = 1; message.what = 1;
handler.sendMessage(message); handler.sendMessage(message);
@@ -115,7 +112,6 @@ public class SDSettingActivity extends SDBaseActivity {
return; return;
} }
Integer venueId = spinnerValue;
RadioButton radioButton = findCheckedRadioButton(); RadioButton radioButton = findCheckedRadioButton();
if (radioButton == null) { if (radioButton == null) {
@@ -126,7 +122,7 @@ public class SDSettingActivity extends SDBaseActivity {
String deviceTypeStr = (String) radioButton.getTag(); String deviceTypeStr = (String) radioButton.getTag();
String deviceType = deviceTypeStr; String deviceType = deviceTypeStr;
SDAppConfig.getInstance().configSet(venueId, deviceType); SDAppConfig.getInstance().configSet(spinnerValue, deviceType);
showToast("设置成功！"); showToast("设置成功！");
onGoToMainAction(); onGoToMainAction();
} catch (Exception e) { } catch (Exception e) {
@@ -164,15 +160,25 @@ public class SDSettingActivity extends SDBaseActivity {
} }
}); });
// TODO: wyb, 2020-07-29, 这里可以设置为当前场馆的index. Integer venueId = SDAppConfig.getInstance().getVenueId();
// int position = 0; String deviceType = SDAppConfig.getInstance().getDeviceType();
// for (VenueItem venueItem : resultList){ if (venueId!=null){
// if (spinnerValue.equals(venueItem.getVenueId())){ int position = 0;
// break; for (VenueItem venueItem : resultList){
// } if (venueId.equals(venueItem.getVenueId())){
// position ++ ; break;
// } }
// venueCellView.setSelection(position, false); position ++ ;
}
venueCellView.setSelection(position, false);
}
if (deviceType!=null && !"".equals(deviceType)){
if (deviceType.equals("OUT")){
venueActionView.check(R.id.device_type_out);
}else{
venueActionView.check(R.id.device_type_enter);
}
}
} }
} }

5
app/src/main/res/layout/activity_sdsetting.xml
View File

@@ -42,8 +42,7 @@
android:layout_margin="10dp" android:layout_margin="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:spinnerMode="dropdown" android:spinnerMode="dropdown"/>
tools:entries="@array/setting_spinner_test_list" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -61,6 +60,7 @@
<RadioButton <RadioButton
android:textColor="@color/black" android:textColor="@color/black"
android:id="@+id/device_type_enter"
android:tag="ENTER" android:tag="ENTER"
android:textStyle="bold" android:textStyle="bold"
android:textSize="20sp" android:textSize="20sp"
@@ -71,6 +71,7 @@
<RadioButton <RadioButton
android:textColor="@color/black" android:textColor="@color/black"
android:id="@+id/device_type_out"
android:tag="OUT" android:tag="OUT"
android:textStyle="bold" android:textStyle="bold"
android:textSize="20sp" android:textSize="20sp"