diff --git a/test/.gradle/5.4.1/executionHistory/executionHistory.bin b/test/.gradle/5.4.1/executionHistory/executionHistory.bin index 17fc696..9bdda9f 100644 Binary files a/test/.gradle/5.4.1/executionHistory/executionHistory.bin and b/test/.gradle/5.4.1/executionHistory/executionHistory.bin differ diff --git a/test/.gradle/5.4.1/executionHistory/executionHistory.lock b/test/.gradle/5.4.1/executionHistory/executionHistory.lock index f2a694f..0288c3b 100644 Binary files a/test/.gradle/5.4.1/executionHistory/executionHistory.lock and b/test/.gradle/5.4.1/executionHistory/executionHistory.lock differ diff --git a/test/.gradle/5.4.1/fileHashes/fileHashes.bin b/test/.gradle/5.4.1/fileHashes/fileHashes.bin index d0ead9d..92d5cfb 100644 Binary files a/test/.gradle/5.4.1/fileHashes/fileHashes.bin and b/test/.gradle/5.4.1/fileHashes/fileHashes.bin differ diff --git a/test/.gradle/5.4.1/fileHashes/fileHashes.lock b/test/.gradle/5.4.1/fileHashes/fileHashes.lock index cf14a94..313d5ac 100644 Binary files a/test/.gradle/5.4.1/fileHashes/fileHashes.lock and b/test/.gradle/5.4.1/fileHashes/fileHashes.lock differ diff --git a/test/.gradle/5.4.1/javaCompile/classAnalysis.bin b/test/.gradle/5.4.1/javaCompile/classAnalysis.bin index 28ca27f..35ac668 100644 Binary files a/test/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/test/.gradle/5.4.1/javaCompile/classAnalysis.bin differ diff --git a/test/.gradle/5.4.1/javaCompile/javaCompile.lock b/test/.gradle/5.4.1/javaCompile/javaCompile.lock index 3ac3497..52e1e90 100644 Binary files a/test/.gradle/5.4.1/javaCompile/javaCompile.lock and b/test/.gradle/5.4.1/javaCompile/javaCompile.lock differ diff --git a/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 5adaa49..2a7acae 100644 Binary files a/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/test/.idea/workspace.xml b/test/.idea/workspace.xml index be1908b..793ae87 100644 --- a/test/.idea/workspace.xml +++ b/test/.idea/workspace.xml @@ -6,7 +6,7 @@ - @@ -22,7 +22,7 @@ - + @@ -32,122 +32,112 @@ - + - - + + - + - - + + - - - - - - - - + - + - - - - - + + - - + + - - - - - + + - + - - - - - + + - + + - - + + - - + - - + + + + + + + - - + - - + + + + + - + - - + + - - + + + - + - - + + - - - + @@ -190,41 +180,41 @@ - @@ -234,9 +224,9 @@ - - + + @@ -278,12 +268,6 @@ - - - - - - @@ -425,8 +409,8 @@ - - + + @@ -495,30 +479,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -533,52 +493,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -587,14 +501,6 @@ - - - - - - - - @@ -603,31 +509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -646,25 +527,7 @@ - - - - - - - - - - - - - - - - - - - + @@ -672,13 +535,6 @@ - - - - - - - @@ -719,41 +575,36 @@ - - - - - + - - + + - + - - + + - - + - - + + - + - - + + @@ -761,102 +612,214 @@ - + - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + - - - - - - - - + - + - - + + + + + - + - - + + - + - - + + - + - - + + + - + + + + + + + + + + + + + + + + - - + + - - + + - + - - + + + + + + + + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/test/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml index 20902ff..acfb31c 100644 --- a/test/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml +++ b/test/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml @@ -36,6 +36,7 @@ + + F:\diedai2\test\app\src\main\AndroidManifest.xml:7:22-73 14 15 F:\diedai2\test\app\src\main\AndroidManifest.xml:9:5-30:19 +15-->F:\diedai2\test\app\src\main\AndroidManifest.xml:9:5-31:19 16 android:allowBackup="true" 16-->F:\diedai2\test\app\src\main\AndroidManifest.xml:11:9-35 17 android:appComponentFactory="androidx.core.app.CoreComponentFactory" @@ -72,15 +72,18 @@ 38 38-->F:\diedai2\test\app\src\main\AndroidManifest.xml:29:9-54 38-->F:\diedai2\test\app\src\main\AndroidManifest.xml:29:19-51 -39 -40 [com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:8:9-11:40 -41 android:name="com.squareup.picasso.PicassoProvider" -41-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:9:13-64 -42 android:authorities="com.example.test.com.squareup.picasso" -42-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:10:13-72 -43 android:exported="false" /> -43-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:11:13-37 -44 -45 -46 +39 +39-->F:\diedai2\test\app\src\main\AndroidManifest.xml:30:9-47 +39-->F:\diedai2\test\app\src\main\AndroidManifest.xml:30:19-44 +40 +41 [com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:8:9-11:40 +42 android:name="com.squareup.picasso.PicassoProvider" +42-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:9:13-64 +43 android:authorities="com.example.test.com.squareup.picasso" +43-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:10:13-72 +44 android:exported="false" /> +44-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:11:13-37 +45 +46 +47 diff --git a/test/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/test/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 20902ff..acfb31c 100644 --- a/test/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/test/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -36,6 +36,7 @@ + + \ No newline at end of file diff --git a/test/app/src/main/java/com/example/test/MainActivity.java b/test/app/src/main/java/com/example/test/MainActivity.java index d7d0c8f..45d1a20 100644 --- a/test/app/src/main/java/com/example/test/MainActivity.java +++ b/test/app/src/main/java/com/example/test/MainActivity.java @@ -100,6 +100,21 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen Intent intent = getIntent(); ID = intent.getIntExtra("ID",0); + + ShopFragment fragment1 = new ShopFragment(); + Bundle bundle1 = new Bundle(); + bundle1.putInt("data1",ID); + //Log.v("OWWWWWW",bundle1+""); + fragment1.setArguments(bundle1);// + //Log.v("OOOOOOO",fragment1.getArguments()+""); + FragmentManager fragmentManager1 = getSupportFragmentManager(); + FragmentTransaction fragmentTransaction1 = fragmentManager1.beginTransaction(); + fragmentTransaction1.replace(R.id.main_body,fragment1); + fragmentTransaction1.commit(); + + + + } @@ -230,5 +245,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen } } + + } diff --git a/test/app/src/main/java/com/example/test/OrderAdapter.java b/test/app/src/main/java/com/example/test/OrderAdapter.java index 5418f9d..7e7c030 100644 --- a/test/app/src/main/java/com/example/test/OrderAdapter.java +++ b/test/app/src/main/java/com/example/test/OrderAdapter.java @@ -70,8 +70,8 @@ public class OrderAdapter extends BaseAdapter { OrderBean bean = list.get(position); //4.将数据设置给这些子控件做显示 - orderId.setText(bean.getOrderId()+""); - orderTime.setText(bean.getOrderTime()); + orderId.setText("订单编号：" + bean.getOrderId()+""); + orderTime.setText("订单生成时间：" + bean.getOrderTime()); return view; } diff --git a/test/app/src/main/java/com/example/test/OrderFragment1.java b/test/app/src/main/java/com/example/test/OrderFragment1.java index ec2981b..31e226b 100644 --- a/test/app/src/main/java/com/example/test/OrderFragment1.java +++ b/test/app/src/main/java/com/example/test/OrderFragment1.java @@ -62,14 +62,11 @@ public class OrderFragment1 extends Fragment implements AdapterView.OnItemClickL Obean = (OrderBean) parent.getItemAtPosition(position); - OrderItem fragment = new OrderItem(); - Bundle bundle = new Bundle(); - bundle.putInt("data",Obean.getOrderId()); - fragment.setArguments(bundle); - FragmentManager fragmentManager = (OrderFragment1.this).getFragmentManager(); - FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - fragmentTransaction.replace(R.id.main_body,fragment); - fragmentTransaction.commit(); + Intent intent = new Intent(getContext(), OrderItem.class); + Bundle bundle1 = new Bundle(); + bundle1.putInt("OrderID", Obean.getOrderId()); + intent.putExtras(bundle1); + getContext().startActivity(intent); Toast.makeText(getActivity(), "订单明细", Toast.LENGTH_SHORT).show(); } diff --git a/test/app/src/main/java/com/example/test/OrderItem.java b/test/app/src/main/java/com/example/test/OrderItem.java index 1479435..cda2bb0 100644 --- a/test/app/src/main/java/com/example/test/OrderItem.java +++ b/test/app/src/main/java/com/example/test/OrderItem.java @@ -1,5 +1,6 @@ package com.example.test; +import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -10,53 +11,60 @@ import android.view.ViewGroup; import android.widget.ListAdapter; import android.widget.ListView; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import java.util.ArrayList; -public class OrderItem extends Fragment { +public class OrderItem extends AppCompatActivity { int mess; OrderItemAdapter orderitemadapter; private ListView order_item_list; ArrayList list = new ArrayList<>(); - public OrderItem() { - // Required empty public constructor - } - - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { +// public OrderItem() {void +// // Required empty public constructor +// } - Bundle bundle =this.getArguments();//得到从Activity传来的数据 - //Log.v("YDYDYDYDY",bundle+""); - if(bundle!=null) { - mess = bundle.getInt("data"); - //Log.v("YYYYYYYYY",mess+""); - } + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.fragment_order_item); - return inflater.inflate(R.layout.fragment_order_item, container, false); - } + Intent intent = getIntent(); + mess = intent.getIntExtra("OrderID",529); - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - orderitemadapter = new OrderItemAdapter(getActivity().getApplicationContext() , list); + orderitemadapter = new OrderItemAdapter(this , list); //Log.d("NNNNNN",new OrderAdapter(getActivity().getApplicationContext(), list).toString()); - order_item_list = (ListView)view.findViewById(R.id.order_list_view_item); + order_item_list = (ListView)findViewById(R.id.order_list_view_item); order_item_list.setAdapter(orderitemadapter); new UploadOrderItemThread().start(); + // return inflater.inflate(R.layout.fragment_order_item, container, false); } +// public void onViewCreated(View view, Bundle savedInstanceState) { +// super.onViewCreated(view, savedInstanceState); + +// orderitemadapter = new OrderItemAdapter(getActivity().getApplicationContext() , list); +// //Log.d("NNNNNN",new OrderAdapter(getActivity().getApplicationContext(), list).toString()); +// order_item_list = (ListView)view.findViewById(R.id.order_list_view_item); +// order_item_list.setAdapter(orderitemadapter); +// +// new UploadOrderItemThread().start(); + +// } + private class UploadOrderItemThread extends Thread{ public void run() { Message message = mhandler.obtainMessage(); - int isload = OrderItemUtils.getAllOrderItem(getActivity().getApplicationContext(),list ,mess); + int isload = OrderItemUtils.getAllOrderItem(OrderItem.this,list ,mess); //Log.v("77777",mess+""); //Log.v("77777",isload+""); message.what = isload; diff --git a/test/app/src/main/java/com/example/test/OrderItemAdapter.java b/test/app/src/main/java/com/example/test/OrderItemAdapter.java index d8959ef..115ecbc 100644 --- a/test/app/src/main/java/com/example/test/OrderItemAdapter.java +++ b/test/app/src/main/java/com/example/test/OrderItemAdapter.java @@ -62,13 +62,13 @@ public class OrderItemAdapter extends BaseAdapter { } //2.获取view上的子控件对象 TextView orderName = (TextView) view.findViewById(R.id.order_item); - TextView orderPrice = (TextView) view.findViewById(R.id.order_price_item); + TextView orderCount = (TextView) view.findViewById(R.id.order_price_item); //3.获取postion位置条目对应的list集合中的新闻数据，Bean对象 OrderItemBean bean = list.get(position); //4.将数据设置给这些子控件做显示 - orderName.setText(bean.getName()); - orderPrice.setText(bean.getPrice()+""); + orderName.setText("商品名：" + bean.getName()); + orderCount.setText("数量：" + bean.getCount()+""); return view; } diff --git a/test/app/src/main/java/com/example/test/OrderItemBean.java b/test/app/src/main/java/com/example/test/OrderItemBean.java index 0bfc42b..bf9c575 100644 --- a/test/app/src/main/java/com/example/test/OrderItemBean.java +++ b/test/app/src/main/java/com/example/test/OrderItemBean.java @@ -3,7 +3,7 @@ package com.example.test; public class OrderItemBean { public String name; - public int price; + public int count; public void setName(String name){ this.name = name; @@ -13,12 +13,12 @@ public class OrderItemBean { return name; } - public void setPrice(int price){ - this.price = price; + public void setCount(int count){ + this.count = count; } - public int getPrice(){ - return price; + public int getCount(){ + return count; } } diff --git a/test/app/src/main/java/com/example/test/PayActivity.java b/test/app/src/main/java/com/example/test/PayActivity.java index f9bbe44..ecf4fc5 100644 --- a/test/app/src/main/java/com/example/test/PayActivity.java +++ b/test/app/src/main/java/com/example/test/PayActivity.java @@ -1,6 +1,8 @@ package com.example.test; import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.content.Intent; import android.os.Bundle; @@ -68,8 +70,18 @@ public class PayActivity extends AppCompatActivity { // toast.show(); // } +// finish(); } }); + +// Intent intent1 = new Intent(PayActivity.this , Shopping_CartFragment.class); +// +// intent.putExtra("key",1); +//// Log.v("IIIIIID",UserinfoID+""); +// +// startActivity(intent1); + + } private class getPay extends Thread{ @@ -100,6 +112,8 @@ public class PayActivity extends AppCompatActivity { db = new DBUtils(); CartBean bean=new CartBean(); db.insertOrderDetails(ID,bean); + db.deleteshoppingcart(ID); + finish(); }else { message.what = 3; diff --git a/test/app/src/main/java/com/example/test/SLogin/DBUtils.java b/test/app/src/main/java/com/example/test/SLogin/DBUtils.java index 639d998..258de4a 100644 --- a/test/app/src/main/java/com/example/test/SLogin/DBUtils.java +++ b/test/app/src/main/java/com/example/test/SLogin/DBUtils.java @@ -22,6 +22,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -603,8 +604,10 @@ public class DBUtils extends Thread { ps.setInt(1, userId); ps.setInt(2, addressId); + // 获取时间 Date date = getNetTime(); - String time=date.toString(); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss "); + String time=simpleDateFormat.format(date); ps.setNString(3,time); int orderId = -1; ps.executeUpdate(); @@ -667,7 +670,10 @@ public class DBUtils extends Thread { // int Gid = id; Statement st = null; - String sql = "select * from user_order where user_id = ?"; + String sql = "select * \n" + + "from user_order \n" + + "where user_id = ? \n" + + "ORDER BY order_id desc"; try { st = conn.createStatement(); @@ -711,7 +717,7 @@ public class DBUtils extends Thread { ResultSet rs = ps.executeQuery(); while (rs.next()) { OrderItemBean news = new OrderItemBean(); - news.setPrice(rs.getInt("product.product_price")); + news.setCount(rs.getInt("order_details.product_count")); news.setName(rs.getNString("product.product_name")); list.add(news); Log.v("111111",news.getName()+""); @@ -728,5 +734,27 @@ public class DBUtils extends Thread { } } } + public void deleteshoppingcart(int userid) { + Connection conn = getConnection(); + Statement st = null; + try { + st = conn.createStatement(); + String sql = "delete from shopping_cart where user_id=?"; + PreparedStatement ps = conn.prepareStatement(sql); + ps.setInt(1, userid); + ps.executeUpdate(); + + } catch (SQLException e) { + e.printStackTrace(); + } finally { + try { + if (st != null) { + st.close(); + } + } catch (SQLException e) { + e.printStackTrace(); + } + } + } } \ No newline at end of file diff --git a/test/app/src/main/java/com/example/test/Shopping_CartFragment.java b/test/app/src/main/java/com/example/test/Shopping_CartFragment.java index 1a63118..b16295a 100644 --- a/test/app/src/main/java/com/example/test/Shopping_CartFragment.java +++ b/test/app/src/main/java/com/example/test/Shopping_CartFragment.java @@ -1,8 +1,10 @@ package com.example.test; import android.app.Activity; +import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.SharedPreferences; import android.os.Bundle; @@ -40,6 +42,7 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte TextView tolal_amount;//控件 int mess = 0;//用户Id Button settle;//结算按钮 + int namString; public Shopping_CartFragment() { // Required empty public constructor @@ -85,7 +88,7 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte Bundle bundle1 = new Bundle(); bundle1.putInt("MyinfoID", mess); intent.putExtras(bundle1); - getContext().startActivity(intent); + startActivityForResult(intent,1); Toast toast = Toast.makeText(getActivity().getApplicationContext(), "生成订单", Toast.LENGTH_SHORT); toast.show(); }else{ @@ -95,6 +98,8 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte } }); + + } public void onItemClick(AdapterView parent, View view, int position, @@ -117,6 +122,21 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte } +// public void onActivityResult(int requestCode, int resultCode, Intent data) { +// super.onActivityResult(requestCode, resultCode, data); +// Bundle bundle = data.getExtras(); +// namString = bundle.getInt("date1"); +// +// } + + public void onResume(){ + super.onResume(); + new putMoney().start();//启动子线程更新控件里的总价 +// Log.v("namnamnam",namString+""); +// if(namString == 1){ +// new putMoney().start(); +// } + } private class Cutitem extends Thread{ public void run(){ @@ -171,4 +191,6 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte } + + } diff --git a/test/app/src/main/res/layout/activity_pay.xml b/test/app/src/main/res/layout/activity_pay.xml index 600c88c..d46a0a4 100644 --- a/test/app/src/main/res/layout/activity_pay.xml +++ b/test/app/src/main/res/layout/activity_pay.xml @@ -37,7 +37,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginRight="5dp" - android:text="username" + android:text="" android:textColor="#a3a3a3" android:textSize="14sp" /> @@ -70,7 +70,7 @@ android:layout_centerVertical="true" android:layout_marginRight="5dp" android:singleLine="true" - android:text="未添加" + android:text="" android:textColor="#a3a3a3" android:textSize="14sp" /> @@ -108,7 +108,7 @@ android:layout_centerVertical="true" android:layout_marginRight="5dp" android:singleLine="true" - android:text="未添加" + android:text="" android:textColor="#a3a3a3" android:textSize="14sp" /> @@ -136,7 +136,7 @@ android:layout_centerVertical="true" android:layout_marginRight="5dp" android:singleLine="true" - android:text="未添加" + android:text="" android:textColor="#a3a3a3" android:textSize="14sp" /> diff --git a/test/app/src/main/res/layout/activity_user_info.xml b/test/app/src/main/res/layout/activity_user_info.xml index 7d291d9..1afbf5b 100644 --- a/test/app/src/main/res/layout/activity_user_info.xml +++ b/test/app/src/main/res/layout/activity_user_info.xml @@ -59,7 +59,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginRight="5dp" - android:text="username" + android:text="" android:textColor="#a3a3a3" android:textSize="14sp" /> @@ -92,7 +92,7 @@ android:layout_centerVertical="true" android:layout_marginRight="5dp" android:singleLine="true" - android:text="任子琦" + android:text="" android:textColor="#a3a3a3" android:textSize="14sp" /> @@ -156,7 +156,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:text="Phone" + android:text="" android:layout_marginRight="5dp" android:textColor="#a3a3a3" @@ -193,7 +193,7 @@ android:layout_centerVertical="true" android:layout_marginRight="5dp" android:singleLine="true" - android:text="未添加" + android:text="" android:textColor="#a3a3a3" android:textSize="14sp" /> diff --git a/test/app/src/main/res/layout/fragment_shopping_cart.xml b/test/app/src/main/res/layout/fragment_shopping_cart.xml index 09f87e7..1d6d129 100644 --- a/test/app/src/main/res/layout/fragment_shopping_cart.xml +++ b/test/app/src/main/res/layout/fragment_shopping_cart.xml @@ -42,7 +42,7 @@ android:layout_toLeftOf="@+id/sum_price" android:layout_weight="1" android:gravity="center_vertical" - android:text="总计:0元" /> + android:text="总计:" />