杨帅 / XiaojiaSoundBox · Commits

Commit 1d68819816302c44577d78e926e2d59e6289419f

Authored by YangShuai
1 parent d18bcab5

1 修改接收传值逻辑

Inline Side-by-side
Showing 15 changed files with 43 additions and 71 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
  View file @1d68819
@@ -40,7 +40,7 @@ public class MainActivity extends AppCompatActivity { @@ -40,7 +40,7 @@ public class MainActivity extends AppCompatActivity {
40 40
41 XiaoJIaCommInfo.setUserIcon(this,"123456"); 41 XiaoJIaCommInfo.setUserIcon(this,"123456");
42 XiaoJIaCommInfo.setUserNickName(this,"我的昵称"); 42 XiaoJIaCommInfo.setUserNickName(this,"我的昵称");
43 - XiaoJIaCommInfo.setUserId(this, "358200".trim()); 43 + XiaoJIaCommInfo.setUserId(this, "358916".trim());
44 XiaoJIaCommInfo.setUserPhone(this, "10000000051".trim()); 44 XiaoJIaCommInfo.setUserPhone(this, "10000000051".trim());
45 45
46 // XiaoJIaCommInfo.setUserId(this, "10513196"); 46 // XiaoJIaCommInfo.setUserId(this, "10513196");
config.gradle
  View file @1d68819
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.3.27", 24 + version: "0.3.28",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ChangeDeviceNameActivity.java
  View file @1d68819
@@ -31,20 +31,18 @@ public class ChangeDeviceNameActivity extends AppCompatActivity { @@ -31,20 +31,18 @@ public class ChangeDeviceNameActivity extends AppCompatActivity {
31 protected void onCreate(Bundle savedInstanceState) { 31 protected void onCreate(Bundle savedInstanceState) {
32 super.onCreate(savedInstanceState); 32 super.onCreate(savedInstanceState);
33 binding = DataBindingUtil.setContentView(this, R.layout.activity_change_device_name); 33 binding = DataBindingUtil.setContentView(this, R.layout.activity_change_device_name);
34 - if (null!=getIntent().getExtras()){  
35 - String deviceId=getIntent().getExtras().getString("deviceId");  
36 - String oldName=getIntent().getExtras().getString("oldName");  
37 - if (!TextUtils.isEmpty(deviceId)){  
38 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeDeviceNameFragment.newInstance(deviceId,oldName)).commitAllowingStateLoss();  
39 - } 34 + String deviceId = getIntent().getStringExtra("deviceId");
  35 + String oldName = getIntent().getStringExtra("oldName");
  36 + if (!TextUtils.isEmpty(deviceId)) {
  37 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeDeviceNameFragment.newInstance(deviceId, oldName)).commitAllowingStateLoss();
40 } 38 }
41 39
42 } 40 }
43 41
44 - public static void startActivity(Activity activity,String deviceId,String oldName) { 42 + public static void startActivity(Activity activity, String deviceId, String oldName) {
45 Intent intent = new Intent(activity, ChangeDeviceNameActivity.class); 43 Intent intent = new Intent(activity, ChangeDeviceNameActivity.class);
46 - intent.putExtra("deviceId",deviceId);  
47 - intent.putExtra("oldName",oldName); 44 + intent.putExtra("deviceId", deviceId);
  45 + intent.putExtra("oldName", oldName);
48 activity.startActivity(intent); 46 activity.startActivity(intent);
49 } 47 }
50 48
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ChangeWifiActivity.java
  View file @1d68819
@@ -40,10 +40,8 @@ public class ChangeWifiActivity extends AppCompatActivity { @@ -40,10 +40,8 @@ public class ChangeWifiActivity extends AppCompatActivity {
40 protected void onCreate(Bundle savedInstanceState) { 40 protected void onCreate(Bundle savedInstanceState) {
41 super.onCreate(savedInstanceState); 41 super.onCreate(savedInstanceState);
42 setContentView(R.layout.activity_select_wifi); 42 setContentView(R.layout.activity_select_wifi);
43 - if (null != getIntent().getExtras()) {  
44 - currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");  
45 - sn = getIntent().getExtras().getString("sn");  
46 - } 43 + currentUser = (FamilyListBean.UsersBeanX) getIntent().getSerializableExtra("currentUser");
  44 + sn = getIntent().getStringExtra("sn");
47 wifiUtils = new WifiUtils(this); 45 wifiUtils = new WifiUtils(this);
48 if (null != currentUser && !TextUtils.isEmpty(sn)) { 46 if (null != currentUser && !TextUtils.isEmpty(sn)) {
49 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeWifiFragment.newInstance(sn, currentUser)).commitAllowingStateLoss(); 47 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, ChangeWifiFragment.newInstance(sn, currentUser)).commitAllowingStateLoss();
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
  View file @1d68819
@@ -38,9 +38,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity { @@ -38,9 +38,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
38 super.onCreate(savedInstanceState); 38 super.onCreate(savedInstanceState);
39 EventBusUtil.register(this); 39 EventBusUtil.register(this);
40 binding = DataBindingUtil.setContentView(this, R.layout.activity_conn_bluetooth_success); 40 binding = DataBindingUtil.setContentView(this, R.layout.activity_conn_bluetooth_success);
41 - if (null != getIntent().getExtras()) {  
42 - networkResultBean = (NetworkResultBean) getIntent().getExtras().getSerializable("networkResultBean");  
43 - } 41 + networkResultBean = (NetworkResultBean) getIntent().getSerializableExtra("networkResultBean");
44 initTopBar(); 42 initTopBar();
45 initView(); 43 initView();
46 } 44 }
@@ -100,7 +98,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity { @@ -100,7 +98,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
100 @Override 98 @Override
101 public void onClick(View view) { 99 public void onClick(View view) {
102 if (null != networkResultBean && !TextUtils.isEmpty(networkResultBean.getMainctl())) { 100 if (null != networkResultBean && !TextUtils.isEmpty(networkResultBean.getMainctl())) {
103 - ChangeDeviceNameActivity.startActivity(ConnBluetoothSuccessActivity.this, networkResultBean.getMainctl(),""); 101 + ChangeDeviceNameActivity.startActivity(ConnBluetoothSuccessActivity.this, networkResultBean.getMainctl(), "");
104 } 102 }
105 } 103 }
106 }); 104 });
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnFailActivity.java
  View file @1d68819
@@ -23,9 +23,7 @@ public class ConnFailActivity extends AppCompatActivity { @@ -23,9 +23,7 @@ public class ConnFailActivity extends AppCompatActivity {
23 protected void onCreate(Bundle savedInstanceState) { 23 protected void onCreate(Bundle savedInstanceState) {
24 super.onCreate(savedInstanceState); 24 super.onCreate(savedInstanceState);
25 binding = DataBindingUtil.setContentView(this, R.layout.activity_conn_fail); 25 binding = DataBindingUtil.setContentView(this, R.layout.activity_conn_fail);
26 - if (null != getIntent().getExtras()) {  
27 - phone = getIntent().getExtras().getString("phone");  
28 - } 26 + phone = getIntent().getStringExtra("phone");
29 if (!TextUtils.isEmpty(phone)) { 27 if (!TextUtils.isEmpty(phone)) {
30 binding.tvTip.setText("该设备已被" + phone + "绑定"); 28 binding.tvTip.setText("该设备已被" + phone + "绑定");
31 } 29 }
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceDetailActivity.java
  View file @1d68819
@@ -34,15 +34,13 @@ public class DeviceDetailActivity extends AppCompatActivity { @@ -34,15 +34,13 @@ public class DeviceDetailActivity extends AppCompatActivity {
34 protected void onCreate(Bundle savedInstanceState) { 34 protected void onCreate(Bundle savedInstanceState) {
35 super.onCreate(savedInstanceState); 35 super.onCreate(savedInstanceState);
36 binding = DataBindingUtil.setContentView(this, R.layout.activity_device_detail); 36 binding = DataBindingUtil.setContentView(this, R.layout.activity_device_detail);
37 - if (null != getIntent().getExtras()) {  
38 - FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getExtras().getSerializable("allDeviceInfo");  
39 - FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser"); 37 + FamilyListBean.UsersBeanX.DeviceListBean allDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getSerializableExtra("allDeviceInfo");
  38 + FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getSerializableExtra("currentUser");
40 if (null != allDeviceInfo && null!=currentUser) { 39 if (null != allDeviceInfo && null!=currentUser) {
41 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, DeviceDetailFragment.newInstance(allDeviceInfo, currentUser)).commitAllowingStateLoss(); 40 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, DeviceDetailFragment.newInstance(allDeviceInfo, currentUser)).commitAllowingStateLoss();
42 41
43 } 42 }
44 43
45 - }  
46 44
47 } 45 }
48 46
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInfoActivity.java
  View file @1d68819
@@ -25,11 +25,9 @@ public class DeviceInfoActivity extends AppCompatActivity { @@ -25,11 +25,9 @@ public class DeviceInfoActivity extends AppCompatActivity {
25 super.onCreate(savedInstanceState); 25 super.onCreate(savedInstanceState);
26 binding = DataBindingUtil.setContentView(this, R.layout.activity_device_info); 26 binding = DataBindingUtil.setContentView(this, R.layout.activity_device_info);
27 initTopBar(); 27 initTopBar();
28 - if (null != getIntent().getExtras()) {  
29 - DeviceDetail deviceDetail = (DeviceDetail) getIntent().getExtras().getSerializable("deviceDetail");  
30 - if (null != deviceDetail) {  
31 - initView(deviceDetail.getIP(), deviceDetail.getMAC(), deviceDetail.getSN());  
32 - } 28 + DeviceDetail deviceDetail = (DeviceDetail) getIntent().getSerializableExtra("deviceDetail");
  29 + if (null != deviceDetail) {
  30 + initView(deviceDetail.getIP(), deviceDetail.getMAC(), deviceDetail.getSN());
33 } 31 }
34 } 32 }
35 33
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceManagerActivity.java
  View file @1d68819
@@ -31,13 +31,11 @@ public class DeviceManagerActivity extends AppCompatActivity { @@ -31,13 +31,11 @@ public class DeviceManagerActivity extends AppCompatActivity {
31 protected void onCreate(Bundle savedInstanceState) { 31 protected void onCreate(Bundle savedInstanceState) {
32 super.onCreate(savedInstanceState); 32 super.onCreate(savedInstanceState);
33 binding = DataBindingUtil.setContentView(this, R.layout.activity_device_manager); 33 binding = DataBindingUtil.setContentView(this, R.layout.activity_device_manager);
34 - if (null != getIntent().getExtras()) {  
35 - FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getExtras().getSerializable("currentDeviceInfo");  
36 - FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getExtras().getSerializable("currentUser");  
37 - if (null != currentDeviceInfo && null != currentUser) {  
38 - fragment = DeviceManagerFragment.newInstance(currentUser, currentDeviceInfo);  
39 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commitAllowingStateLoss();  
40 - } 34 + FamilyListBean.UsersBeanX.DeviceListBean currentDeviceInfo = (FamilyListBean.UsersBeanX.DeviceListBean) getIntent().getSerializableExtra("currentDeviceInfo");
  35 + FamilyListBean.UsersBeanX currentUser = (FamilyListBean.UsersBeanX) getIntent().getSerializableExtra("currentUser");
  36 + if (null != currentDeviceInfo && null != currentUser) {
  37 + fragment = DeviceManagerFragment.newInstance(currentUser, currentDeviceInfo);
  38 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commitAllowingStateLoss();
41 } 39 }
42 // initTopBar(); 40 // initTopBar();
43 // initView(); 41 // initView();
@@ -100,7 +98,7 @@ public class DeviceManagerActivity extends AppCompatActivity { @@ -100,7 +98,7 @@ public class DeviceManagerActivity extends AppCompatActivity {
100 @Override 98 @Override
101 public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { 99 public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
102 super.onRequestPermissionsResult(requestCode, permissions, grantResults); 100 super.onRequestPermissionsResult(requestCode, permissions, grantResults);
103 - if (null==fragment){ 101 + if (null == fragment) {
104 return; 102 return;
105 } 103 }
106 fragment.onRequestPermissionsResult(requestCode, permissions, grantResults); 104 fragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/FirmwareUpdateActivity.java
  View file @1d68819
@@ -20,10 +20,8 @@ public class FirmwareUpdateActivity extends AppCompatActivity { @@ -20,10 +20,8 @@ public class FirmwareUpdateActivity extends AppCompatActivity {
20 protected void onCreate(Bundle savedInstanceState) { 20 protected void onCreate(Bundle savedInstanceState) {
21 super.onCreate(savedInstanceState); 21 super.onCreate(savedInstanceState);
22 setContentView(R.layout.activity_search_device); 22 setContentView(R.layout.activity_search_device);
23 - if (null!=getIntent().getExtras()){  
24 - DeviceDetail deviceDetail= (DeviceDetail) getIntent().getExtras().getSerializable("deviceDetail");  
25 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, FirmwareUpdateFragment.newInstance(deviceDetail)).commitAllowingStateLoss();  
26 - } 23 + DeviceDetail deviceDetail = (DeviceDetail) getIntent().getSerializableExtra("deviceDetail");
  24 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, FirmwareUpdateFragment.newInstance(deviceDetail)).commitAllowingStateLoss();
27 } 25 }
28 26
29 27
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/InvitFriendActivity.java
  View file @1d68819
@@ -19,14 +19,11 @@ public class InvitFriendActivity extends AppCompatActivity { @@ -19,14 +19,11 @@ public class InvitFriendActivity extends AppCompatActivity {
19 protected void onCreate(Bundle savedInstanceState) { 19 protected void onCreate(Bundle savedInstanceState) {
20 super.onCreate(savedInstanceState); 20 super.onCreate(savedInstanceState);
21 setContentView(R.layout.activity_invit_friend); 21 setContentView(R.layout.activity_invit_friend);
22 - if (null != getIntent().getExtras()) {  
23 - String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");  
24 - if (!TextUtils.isEmpty(currentSelectFamilyId)) {  
25 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, InvitFriendFragment.newInstance(currentSelectFamilyId)).commitAllowingStateLoss();  
26 - } 22 + String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
  23 + if (!TextUtils.isEmpty(currentSelectFamilyId)) {
  24 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, InvitFriendFragment.newInstance(currentSelectFamilyId)).commitAllowingStateLoss();
27 } 25 }
28 26
29 -  
30 } 27 }
31 28
32 public static void startActivity(Activity activity, String currentSelectFamilyId) { 29 public static void startActivity(Activity activity, String currentSelectFamilyId) {
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectIMFriendActivity.java
  View file @1d68819
@@ -16,11 +16,9 @@ public class SelectIMFriendActivity extends AppCompatActivity { @@ -16,11 +16,9 @@ public class SelectIMFriendActivity extends AppCompatActivity {
16 protected void onCreate(Bundle savedInstanceState) { 16 protected void onCreate(Bundle savedInstanceState) {
17 super.onCreate(savedInstanceState); 17 super.onCreate(savedInstanceState);
18 setContentView(R.layout.activity_select_imfriend); 18 setContentView(R.layout.activity_select_imfriend);
19 - if (null != getIntent().getExtras()) {  
20 - String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");  
21 - if (!TextUtils.isEmpty(currentSelectFamilyId)) {  
22 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectIMFriendFragment.newInstance(currentSelectFamilyId)).commit();  
23 - } 19 + String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
  20 + if (!TextUtils.isEmpty(currentSelectFamilyId)) {
  21 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectIMFriendFragment.newInstance(currentSelectFamilyId)).commit();
24 } 22 }
25 23
26 } 24 }
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectWifiActivity.java
  View file @1d68819
@@ -43,13 +43,11 @@ public class SelectWifiActivity extends AppCompatActivity { @@ -43,13 +43,11 @@ public class SelectWifiActivity extends AppCompatActivity {
43 protected void onCreate(Bundle savedInstanceState) { 43 protected void onCreate(Bundle savedInstanceState) {
44 super.onCreate(savedInstanceState); 44 super.onCreate(savedInstanceState);
45 setContentView(R.layout.activity_select_wifi); 45 setContentView(R.layout.activity_select_wifi);
46 - if (null != getIntent().getExtras()) {  
47 - bleDevice = (BleDevice) getIntent().getExtras().get("bleDevice");  
48 - } 46 + bleDevice = (BleDevice) getIntent().getSerializableExtra("bleDevice");
49 wifiUtils = new WifiUtils(this); 47 wifiUtils = new WifiUtils(this);
50 // registerBroadcast(); 48 // registerBroadcast();
51 // getPermissionsWithTip(); 49 // getPermissionsWithTip();
52 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectWifiFragment.newInstance(bleDevice)).commitAllowingStateLoss(); 50 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SelectWifiFragment.newInstance(bleDevice)).commitAllowingStateLoss();
53 } 51 }
54 52
55 53
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SetFriendsRoleActivity.java
  View file @1d68819
@@ -20,15 +20,12 @@ public class SetFriendsRoleActivity extends AppCompatActivity { @@ -20,15 +20,12 @@ public class SetFriendsRoleActivity extends AppCompatActivity {
20 protected void onCreate(Bundle savedInstanceState) { 20 protected void onCreate(Bundle savedInstanceState) {
21 super.onCreate(savedInstanceState); 21 super.onCreate(savedInstanceState);
22 setContentView(R.layout.activity_set_friends_role); 22 setContentView(R.layout.activity_set_friends_role);
23 - if (null != getIntent().getExtras()) {  
24 - String selectUid = getIntent().getExtras().getString("selectUid");  
25 - String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");  
26 - if (!TextUtils.isEmpty(selectUid) && !TextUtils.isEmpty(currentSelectFamilyId)) {  
27 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SetFriendsRoleFragment.newInstance(selectUid, currentSelectFamilyId)).commitAllowingStateLoss();  
28 - }else {  
29 - AlertUtil.showDeftToast(this,"参数异常");  
30 - } 23 + String selectUid = getIntent().getStringExtra("selectUid");
  24 + String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
  25 + if (!TextUtils.isEmpty(selectUid) && !TextUtils.isEmpty(currentSelectFamilyId)) {
  26 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SetFriendsRoleFragment.newInstance(selectUid, currentSelectFamilyId)).commitAllowingStateLoss();
31 } else { 27 } else {
  28 + AlertUtil.showDeftToast(this, "参数异常");
32 finish(); 29 finish();
33 } 30 }
34 31
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/UserManagerActivity.java
  View file @1d68819
@@ -19,11 +19,9 @@ public class UserManagerActivity extends AppCompatActivity { @@ -19,11 +19,9 @@ public class UserManagerActivity extends AppCompatActivity {
19 protected void onCreate(Bundle savedInstanceState) { 19 protected void onCreate(Bundle savedInstanceState) {
20 super.onCreate(savedInstanceState); 20 super.onCreate(savedInstanceState);
21 setContentView(R.layout.activity_user_manager); 21 setContentView(R.layout.activity_user_manager);
22 - if (null != getIntent().getExtras()) {  
23 - String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");  
24 - if (!TextUtils.isEmpty(currentSelectFamilyId)) {  
25 - getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, UserManagerFragment.newInstance(currentSelectFamilyId)).commitAllowingStateLoss();  
26 - } 22 + String currentSelectFamilyId = getIntent().getStringExtra("currentSelectFamilyId");
  23 + if (!TextUtils.isEmpty(currentSelectFamilyId)) {
  24 + getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, UserManagerFragment.newInstance(currentSelectFamilyId)).commitAllowingStateLoss();
27 } 25 }
28 } 26 }
29 27