合并功能

代码/在这里2.1/bin/jarlist.cache

@@ -1,3 +0,0 @@
-# cache for current jar dependency. DO NOT EDIT.
-# format is <lastModified> <length> <SHA-1> <path>
-# Encoding is UTF-8

代码/在这里2.1/gen/com/stone/shop/R.java

@@ -1,447 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.stone.shop;
-
-public final class R {
-    public static final class anim {
-        public static final int cycle_7=0x7f040000;
-        public static final int scale=0x7f040001;
-        public static final int shake=0x7f040002;
-    }
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int actionbar_background_end=0x7f050002;
-        public static final int actionbar_background_item_pressed_end=0x7f050005;
-        public static final int actionbar_background_item_pressed_start=0x7f050004;
-        public static final int actionbar_background_start=0x7f050001;
-        public static final int actionbar_separator=0x7f050000;
-        public static final int actionbar_title=0x7f050003;
-        public static final int qq_common_bg=0x7f050006;
-        public static final int second_color=0x7f050008;
-        public static final int theme_color=0x7f050007;
-    }
-    public static final class dimen {
-        /**  Default screen margins, per the Android Design guidelines. 
-
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    
-         */
-        public static final int activity_horizontal_margin=0x7f060000;
-        public static final int activity_vertical_margin=0x7f060001;
-    }
-    public static final class drawable {
-        public static final int abs__tab_selected_focused_holo=0x7f020000;
-        public static final int abs__tab_selected_holo=0x7f020001;
-        public static final int abs__tab_selected_pressed_holo=0x7f020002;
-        public static final int abs__tab_unselected_pressed_holo=0x7f020003;
-        public static final int action_hate=0x7f020004;
-        public static final int action_rate=0x7f020005;
-        public static final int actionbar_background=0x7f020006;
-        public static final int bg1=0x7f020007;
-        public static final int bg3=0x7f020008;
-        public static final int bg_account=0x7f020009;
-        public static final int bg_account_focus=0x7f02000a;
-        public static final int bg_account_normal=0x7f02000b;
-        public static final int bg_comment_comment=0x7f02000c;
-        public static final int bg_comment_floor=0x7f02000d;
-        public static final int bg_logout_normal=0x7f02000e;
-        public static final int bg_logout_pressed=0x7f02000f;
-        public static final int btn_comment_publish=0x7f020010;
-        public static final int btn_green_normal=0x7f020011;
-        public static final int btn_green_pressed=0x7f020012;
-        public static final int checkbox_bg1=0x7f020013;
-        public static final int checkbox_selected=0x7f020014;
-        public static final int checkbox_selected_press=0x7f020015;
-        public static final int checkbox_unselect=0x7f020016;
-        public static final int checkbox_unselect_press=0x7f020017;
-        public static final int custom_ratingbar=0x7f020018;
-        public static final int default_ptr_flip=0x7f020019;
-        public static final int default_ptr_rotate=0x7f02001a;
-        public static final int edittext_focus=0x7f02001b;
-        public static final int edittext_normal=0x7f02001c;
-        public static final int ic_1=0x7f02001d;
-        public static final int ic_2=0x7f02001e;
-        public static final int ic_3=0x7f02001f;
-        public static final int ic_41=0x7f020020;
-        public static final int ic_42=0x7f020021;
-        public static final int ic_5=0x7f020022;
-        public static final int ic_6=0x7f020023;
-        public static final int ic_7=0x7f020024;
-        public static final int ic_8=0x7f020025;
-        public static final int ic_action_comment=0x7f020026;
-        public static final int ic_action_edit=0x7f020027;
-        public static final int ic_action_fav=0x7f020028;
-        public static final int ic_action_fav_choose=0x7f020029;
-        public static final int ic_action_fav_normal=0x7f02002a;
-        public static final int ic_action_love=0x7f02002b;
-        public static final int ic_action_share=0x7f02002c;
-        public static final int ic_app=0x7f02002d;
-        public static final int ic_app1=0x7f02002e;
-        public static final int ic_banner1=0x7f02002f;
-        public static final int ic_banner_hide=0x7f020030;
-        public static final int ic_banner_image_default1=0x7f020031;
-        public static final int ic_banner_image_default11=0x7f020032;
-        public static final int ic_banner_image_default2=0x7f020033;
-        public static final int ic_banner_image_default22=0x7f020034;
-        public static final int ic_banner_image_default3=0x7f020035;
-        public static final int ic_banner_image_default4=0x7f020036;
-        public static final int ic_banner_image_default55=0x7f020037;
-        public static final int ic_banner_image_default77=0x7f020038;
-        public static final int ic_breakfast=0x7f020039;
-        public static final int ic_car=0x7f02003a;
-        public static final int ic_date=0x7f02003b;
-        public static final int ic_hbut=0x7f02003c;
-        public static final int ic_hide=0x7f02003d;
-        public static final int ic_launcher=0x7f02003e;
-        public static final int ic_loc=0x7f02003f;
-        public static final int ic_menu_copy_holo_light=0x7f020040;
-        public static final int ic_menu_find_holo_light=0x7f020041;
-        public static final int ic_menu_info_details=0x7f020042;
-        public static final int ic_menu_myplaces=0x7f020043;
-        public static final int ic_menu_notifications=0x7f020044;
-        public static final int ic_menu_share=0x7f020045;
-        public static final int ic_mine=0x7f020046;
-        public static final int ic_page_indicator=0x7f020047;
-        public static final int ic_page_indicator_focused=0x7f020048;
-        public static final int ic_phone=0x7f020049;
-        public static final int ic_phone2=0x7f02004a;
-        public static final int ic_phone3=0x7f02004b;
-        public static final int ic_sale=0x7f02004c;
-        public static final int ic_search=0x7f02004d;
-        public static final int ic_shelf_category_divider=0x7f02004e;
-        public static final int ic_shop=0x7f02004f;
-        public static final int ic_shop_info_bg=0x7f020050;
-        public static final int ic_shop_info_bg2=0x7f020051;
-        public static final int ic_shop_info_bg22=0x7f020052;
-        public static final int ic_star_no=0x7f020053;
-        public static final int ic_star_yes=0x7f020054;
-        public static final int indicator_arrow=0x7f020055;
-        public static final int login_button=0x7f020056;
-        public static final int login_button_select=0x7f020057;
-        public static final int qq=0x7f020058;
-        public static final int selector_edittext=0x7f020059;
-        public static final int selector_edittext_account=0x7f02005a;
-        public static final int selector_load_more=0x7f02005b;
-        public static final int selector_logout=0x7f02005c;
-        public static final int shap_circle=0x7f02005d;
-        public static final int shap_divider=0x7f02005e;
-        public static final int shape_color_frame=0x7f02005f;
-        public static final int shape_grid_item=0x7f020060;
-        public static final int shape_left_radius_color_square=0x7f020061;
-        public static final int shape_radius=0x7f020062;
-        public static final int shape_radius_color_square=0x7f020063;
-        public static final int shape_radius_square=0x7f020064;
-        public static final int splash=0x7f020065;
-        public static final int star_img1=0x7f020066;
-        public static final int star_img2=0x7f020067;
-        public static final int star_img3=0x7f020068;
-        public static final int star_img4=0x7f020069;
-        public static final int star_img5=0x7f02006a;
-        public static final int tab_bg_selector=0x7f02006b;
-        public static final int user_icon_default=0x7f02006c;
-        public static final int user_icon_default_main=0x7f02006d;
-        public static final int welcome_background=0x7f02006e;
-    }
-    public static final class id {
-        public static final int action_settings=0x7f0a00b7;
-        public static final int actionbar_comment=0x7f0a000f;
-        public static final int area_commit=0x7f0a0014;
-        public static final int btn_about=0x7f0a004c;
-        public static final int btn_add=0x7f0a0093;
-        public static final int btn_add_good=0x7f0a0075;
-        public static final int btn_add_news=0x7f0a0076;
-        public static final int btn_add_shop=0x7f0a0074;
-        public static final int btn_buy_good=0x7f0a0090;
-        public static final int btn_commit=0x7f0a00b6;
-        public static final int btn_contact=0x7f0a004d;
-        public static final int btn_dlg_ok=0x7f0a008c;
-        public static final int btn_feedback_submit=0x7f0a001b;
-        public static final int btn_hide_ads=0x7f0a0022;
-        public static final int btn_login=0x7f0a002b;
-        public static final int btn_look_goods=0x7f0a0072;
-        public static final int btn_look_news=0x7f0a0073;
-        public static final int btn_look_shops=0x7f0a0071;
-        public static final int btn_look_users=0x7f0a0070;
-        public static final int btn_order_count_less=0x7f0a0055;
-        public static final int btn_order_count_more=0x7f0a0057;
-        public static final int btn_order_submit=0x7f0a005c;
-        public static final int btn_publish=0x7f0a0017;
-        public static final int btn_qq=0x7f0a002f;
-        public static final int btn_reg_now=0x7f0a0065;
-        public static final int btn_register=0x7f0a002e;
-        public static final int btn_set_time=0x7f0a0059;
-        public static final int btn_share=0x7f0a004e;
-        public static final int cancel=0x7f0a00b9;
-        public static final int cb_rem_psd=0x7f0a002d;
-        public static final int comment_commit=0x7f0a0016;
-        public static final int comment_content=0x7f0a0015;
-        public static final int comment_item=0x7f0a0011;
-        public static final int comment_list=0x7f0a0012;
-        public static final int commit_scroll=0x7f0a0010;
-        public static final int content_comment=0x7f0a0085;
-        public static final int content_image=0x7f0a007d;
-        public static final int content_text=0x7f0a007c;
-        public static final int datepicker=0x7f0a008a;
-        public static final int edit_content=0x7f0a0019;
-        public static final int edit_title=0x7f0a0018;
-        public static final int et_comfirm_psd=0x7f0a0060;
-        public static final int et_commit=0x7f0a00b5;
-        public static final int et_feedback_content=0x7f0a001a;
-        public static final int et_mineinfo_cademy=0x7f0a0040;
-        public static final int et_mineinfo_dornum=0x7f0a0042;
-        public static final int et_mineinfo_dorpart=0x7f0a0041;
-        public static final int et_mineinfo_phone=0x7f0a0043;
-        public static final int et_mineinfo_qq=0x7f0a0044;
-        public static final int et_mineinfo_school=0x7f0a003f;
-        public static final int et_mineinfo_username=0x7f0a003e;
-        public static final int et_order_phone=0x7f0a005a;
-        public static final int et_order_words=0x7f0a005b;
-        public static final int et_password=0x7f0a0029;
-        public static final int et_phone=0x7f0a0063;
-        public static final int et_username=0x7f0a0026;
-        public static final int fl_image_ads=0x7f0a0020;
-        public static final int gv_classroom=0x7f0a000e;
-        public static final int gv_food_class=0x7f0a0068;
-        public static final int gv_gift_class=0x7f0a0067;
-        public static final int gv_out_class=0x7f0a0069;
-        public static final int gv_school_class=0x7f0a0066;
-        public static final int header_shop_all=0x7f0a006a;
-        public static final int imageview=0x7f0a00a9;
-        public static final int img_call=0x7f0a00b0;
-        public static final int img_chooseImage=0x7f0a00a8;
-        public static final int img_date=0x7f0a001d;
-        public static final int img_item=0x7f0a0098;
-        public static final int img_search=0x7f0a0096;
-        public static final int img_shop=0x7f0a00a1;
-        public static final int img_welcome=0x7f0a0001;
-        public static final int index_comment=0x7f0a0084;
-        public static final int item_action_comment=0x7f0a007e;
-        public static final int item_action_hate=0x7f0a0080;
-        public static final int item_action_love=0x7f0a0081;
-        public static final int item_action_share=0x7f0a007f;
-        public static final int listScrollView=0x7f0a001c;
-        public static final int ll_commit_parent_view=0x7f0a00b4;
-        public static final int ll_commit_son_view=0x7f0a0087;
-        public static final int ll_row1=0x7f0a0024;
-        public static final int ll_row2=0x7f0a0027;
-        public static final int ll_row3=0x7f0a002a;
-        public static final int ll_row4=0x7f0a0061;
-        public static final int ll_row6=0x7f0a0064;
-        public static final int loadmore=0x7f0a0013;
-        public static final int lv_bxt_news=0x7f0a0003;
-        public static final int lv_goods_list=0x7f0a00ab;
-        public static final int lv_mine_about=0x7f0a0036;
-        public static final int lv_mine_order=0x7f0a0035;
-        public static final int lv_mine_soft=0x7f0a006e;
-        public static final int lv_mine_user=0x7f0a0034;
-        public static final int lv_news=0x7f0a0023;
-        public static final int lv_order_info=0x7f0a005d;
-        public static final int lv_shop_all=0x7f0a006b;
-        public static final int modify=0x7f0a00b8;
-        public static final int new_login_btn=0x7f0a0030;
-        public static final int pagertab=0x7f0a006d;
-        public static final int pull_refresh_list=0x7f0a0002;
-        public static final int ratingBar1=0x7f0a00ad;
-        public static final int rb_rate=0x7f0a00a7;
-        public static final int relaGrid=0x7f0a0091;
-        public static final int rl_last=0x7f0a002c;
-        public static final int rl_splash=0x7f0a006f;
-        public static final int rl_welcome=0x7f0a0000;
-        public static final int sp_bxt_header=0x7f0a0094;
-        public static final int textview=0x7f0a00aa;
-        public static final int time_comment=0x7f0a0086;
-        public static final int time_text=0x7f0a007a;
-        public static final int timepicker=0x7f0a008b;
-        public static final int title_text=0x7f0a007b;
-        public static final int tp_dlg_time=0x7f0a008d;
-        public static final int tv_bowl=0x7f0a0046;
-        public static final int tv_bxt_news_holder1=0x7f0a0009;
-        public static final int tv_bxt_news_holder2=0x7f0a000a;
-        public static final int tv_bxt_news_item_title=0x7f0a0082;
-        public static final int tv_bxt_news_loc=0x7f0a0008;
-        public static final int tv_bxt_news_point=0x7f0a000b;
-        public static final int tv_bxt_news_speaker=0x7f0a0006;
-        public static final int tv_bxt_news_speaker_info=0x7f0a000c;
-        public static final int tv_bxt_news_time=0x7f0a0007;
-        public static final int tv_bxt_news_title=0x7f0a0004;
-        public static final int tv_bxt_news_topic=0x7f0a0005;
-        public static final int tv_cademy=0x7f0a0049;
-        public static final int tv_chooseText=0x7f0a0092;
-        public static final int tv_comfirm_psd=0x7f0a005f;
-        public static final int tv_commit_content=0x7f0a0089;
-        public static final int tv_commit_title=0x7f0a00b3;
-        public static final int tv_commit_user=0x7f0a0088;
-        public static final int tv_day=0x7f0a001f;
-        public static final int tv_dorNum=0x7f0a004b;
-        public static final int tv_dorPart=0x7f0a004a;
-        public static final int tv_edit=0x7f0a0095;
-        public static final int tv_good_name=0x7f0a008e;
-        public static final int tv_good_price=0x7f0a008f;
-        public static final int tv_item_content=0x7f0a009a;
-        public static final int tv_item_name=0x7f0a0099;
-        public static final int tv_me=0x7f0a0045;
-        public static final int tv_mineinfo_cademy=0x7f0a0039;
-        public static final int tv_mineinfo_dornum=0x7f0a003b;
-        public static final int tv_mineinfo_dorpart=0x7f0a003a;
-        public static final int tv_mineinfo_phone=0x7f0a003c;
-        public static final int tv_mineinfo_qq=0x7f0a003d;
-        public static final int tv_mineinfo_school=0x7f0a0038;
-        public static final int tv_mineinfo_username=0x7f0a0037;
-        public static final int tv_news_author=0x7f0a0050;
-        public static final int tv_news_content=0x7f0a0052;
-        public static final int tv_news_date=0x7f0a009c;
-        public static final int tv_news_time=0x7f0a0051;
-        public static final int tv_news_title=0x7f0a004f;
-        public static final int tv_news_type=0x7f0a009b;
-        public static final int tv_order_count=0x7f0a0056;
-        public static final int tv_order_good=0x7f0a0054;
-        public static final int tv_order_info_good_name=0x7f0a009d;
-        public static final int tv_order_info_price=0x7f0a009f;
-        public static final int tv_order_info_shop_name=0x7f0a009e;
-        public static final int tv_order_info_state=0x7f0a00a0;
-        public static final int tv_order_shop=0x7f0a0053;
-        public static final int tv_order_time=0x7f0a0058;
-        public static final int tv_password=0x7f0a0028;
-        public static final int tv_phone=0x7f0a0062;
-        public static final int tv_reg_title=0x7f0a005e;
-        public static final int tv_res=0x7f0a0078;
-        public static final int tv_room=0x7f0a0097;
-        public static final int tv_school=0x7f0a0048;
-        public static final int tv_shop_discount=0x7f0a00a4;
-        public static final int tv_shop_introduce=0x7f0a00b1;
-        public static final int tv_shop_loc=0x7f0a00a6;
-        public static final int tv_shop_location=0x7f0a00ae;
-        public static final int tv_shop_name=0x7f0a00a2;
-        public static final int tv_shop_paper=0x7f0a00a3;
-        public static final int tv_shop_phone=0x7f0a00af;
-        public static final int tv_shop_promotion=0x7f0a00b2;
-        public static final int tv_shop_title=0x7f0a00ac;
-        public static final int tv_shop_type=0x7f0a00a5;
-        public static final int tv_title=0x7f0a0077;
-        public static final int tv_username=0x7f0a0025;
-        public static final int tv_week=0x7f0a001e;
-        public static final int tv_xiaocai=0x7f0a0047;
-        public static final int userName_comment=0x7f0a0083;
-        public static final int user_callback=0x7f0a0033;
-        public static final int user_logo=0x7f0a0032;
-        public static final int user_name=0x7f0a0079;
-        public static final int user_nickname=0x7f0a0031;
-        public static final int view_pager=0x7f0a0021;
-        public static final int viewpager=0x7f0a006c;
-        public static final int wv_wsq=0x7f0a000d;
-    }
-    public static final class layout {
-        public static final int activity_about=0x7f030000;
-        public static final int activity_award=0x7f030001;
-        public static final int activity_base=0x7f030002;
-        public static final int activity_bxt=0x7f030003;
-        public static final int activity_bxt_news=0x7f030004;
-        public static final int activity_car=0x7f030005;
-        public static final int activity_classroom=0x7f030006;
-        public static final int activity_comment=0x7f030007;
-        public static final int activity_edit=0x7f030008;
-        public static final int activity_feedback=0x7f030009;
-        public static final int activity_home=0x7f03000a;
-        public static final int activity_login=0x7f03000b;
-        public static final int activity_mine=0x7f03000c;
-        public static final int activity_mine_info=0x7f03000d;
-        public static final int activity_mine_info_edit=0x7f03000e;
-        public static final int activity_mine_old=0x7f03000f;
-        public static final int activity_news=0x7f030010;
-        public static final int activity_order=0x7f030011;
-        public static final int activity_order_info=0x7f030012;
-        public static final int activity_reg=0x7f030013;
-        public static final int activity_shop=0x7f030014;
-        public static final int activity_shop_all=0x7f030015;
-        public static final int activity_shop_item=0x7f030016;
-        public static final int activity_soft=0x7f030017;
-        public static final int activity_splash=0x7f030018;
-        public static final int activity_test=0x7f030019;
-        public static final int activity_userinfo=0x7f03001a;
-        public static final int ai_item=0x7f03001b;
-        public static final int bxt_list_item=0x7f03001c;
-        public static final int comment_item=0x7f03001d;
-        public static final int commit=0x7f03001e;
-        public static final int common_datetime=0x7f03001f;
-        public static final int dlg_order_settime=0x7f030020;
-        public static final int goods_list_item=0x7f030021;
-        public static final int gv_item_classroom=0x7f030022;
-        public static final int header_award=0x7f030023;
-        public static final int header_bxt=0x7f030024;
-        public static final int header_bxt_news=0x7f030025;
-        public static final int header_feedback=0x7f030026;
-        public static final int header_home=0x7f030027;
-        public static final int header_mine=0x7f030028;
-        public static final int header_mine_info=0x7f030029;
-        public static final int header_mine_info_edit=0x7f03002a;
-        public static final int header_news=0x7f03002b;
-        public static final int header_order=0x7f03002c;
-        public static final int header_order_info=0x7f03002d;
-        public static final int header_shop=0x7f03002e;
-        public static final int header_shop_all=0x7f03002f;
-        public static final int header_soft=0x7f030030;
-        public static final int layout_reservation=0x7f030031;
-        public static final int mine_list_item=0x7f030032;
-        public static final int mine_soft_list_item=0x7f030033;
-        public static final int news_list_item=0x7f030034;
-        public static final int order_info_list_item=0x7f030035;
-        public static final int popmenu=0x7f030036;
-        public static final int scom_list_item=0x7f030037;
-        public static final int shop_all_list_item=0x7f030038;
-        public static final int shop_grid_item=0x7f030039;
-        public static final int tab_widget_item=0x7f03003a;
-        public static final int viewpager_menu=0x7f03003b;
-        public static final int viewpager_shopinfo=0x7f03003c;
-    }
-    public static final class menu {
-        public static final int main=0x7f090000;
-        public static final int popup=0x7f090001;
-    }
-    public static final class string {
-        public static final int action_settings=0x7f070001;
-        public static final int app_name=0x7f070000;
-        public static final int hello_world=0x7f070002;
-    }
-    public static final class style {
-        /** 
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-         */
-        public static final int AppBaseTheme=0x7f080000;
-        public static final int AppNoTitleBarTheme=0x7f080003;
-        public static final int AppTheme=0x7f080001;
-        /**  自定义对话框的样式 
-         */
-        public static final int MyDialog=0x7f080004;
-        public static final int NoTitleBarTheme=0x7f080002;
-        /**  自定义对话框样式 
-    <style name="MyDialog" parent="@android:Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowNoTitle">true</item> 
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>  
-         */
-        public static final int TextTheme=0x7f080006;
-        public static final int TextTheme_tipstheme_second=0x7f080007;
-        /**  自定义RatingBar样式 
-         */
-        public static final int custom_ratingbar_style=0x7f080005;
-    }
-}

代码/在这里3.0/AndroidManifest.xml

@@ -73,6 +73,10 @@
         <activity
             android:name="com.stone.shop.view.ClassroomActivity"
             android:label="@string/app_name" >
+        </activity>
+                <activity
+            android:name="com.stone.shop.view.LibraryActivity"
+            android:label="@string/app_name" >
         </activity>
         <activity
             android:name="com.stone.shop.view.RegisterActivity"
@@ -118,6 +122,10 @@
             android:name="com.stone.shop.view.ReservationActivity"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.LibraryReservationActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.MineInfoActivity"
             android:label="@string/app_name" >
@@ -155,6 +163,30 @@
         <activity
             android:name="com.stone.shop.view.BXTNewsActivity"
             android:label="@string/app_name" >
+        </activity> 
+        <activity
+            android:name="com.stone.shop.view.InformationActivity"
+            android:label="@string/app_name" >
+        </activity> 
+        <activity
+            android:name="com.stone.shop.view.InfoContentActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.InfoNewsContentActivity"
+            android:label="@string/app_name" >
+        </activity>
+         <activity
+            android:name="com.stone.shop.view.MultiScreenActivity"
+            android:label="@string/app_name" >
+        </activity>
+         <activity
+            android:name="com.stone.shop.view.MultiViewGroup"
+            android:label="@string/app_name" >
+        </activity>
+         <activity
+            android:name="com.stone.shop.view.MainActivity"
+            android:label="@string/app_name" >
         </activity>
         <activity
             android:name="com.tencent.tauth.AuthActivity"

代码/在这里3.0/bin/AndroidManifest.xml

@@ -73,6 +73,10 @@
         <activity
             android:name="com.stone.shop.view.ClassroomActivity"
             android:label="@string/app_name" >
+        </activity>
+                <activity
+            android:name="com.stone.shop.view.LibraryActivity"
+            android:label="@string/app_name" >
         </activity>
         <activity
             android:name="com.stone.shop.view.RegisterActivity"
@@ -118,6 +122,10 @@
             android:name="com.stone.shop.view.ReservationActivity"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.LibraryReservationActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.MineInfoActivity"
             android:label="@string/app_name" >
@@ -155,6 +163,30 @@
         <activity
             android:name="com.stone.shop.view.BXTNewsActivity"
             android:label="@string/app_name" >
+        </activity> 
+        <activity
+            android:name="com.stone.shop.view.InformationActivity"
+            android:label="@string/app_name" >
+        </activity> 
+        <activity
+            android:name="com.stone.shop.view.InfoContentActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.InfoNewsContentActivity"
+            android:label="@string/app_name" >
+        </activity>
+         <activity
+            android:name="com.stone.shop.view.MultiScreenActivity"
+            android:label="@string/app_name" >
+        </activity>
+         <activity
+            android:name="com.stone.shop.view.MultiViewGroup"
+            android:label="@string/app_name" >
+        </activity>
+         <activity
+            android:name="com.stone.shop.view.MainActivity"
+            android:label="@string/app_name" >
         </activity>
         <activity
             android:name="com.tencent.tauth.AuthActivity"