ソースを参照

Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into draft

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java
#	app_core/common/src/main/java/com/core/dao/DBManager.java
Bitliker 9 年 前
コミット
569970b18d
100 ファイル変更1183 行追加78 行削除
  1. 6 10
      WeiChat/build.gradle
  2. 7 1
      WeiChat/src/main/AndroidManifest.xml
  3. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  4. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java
  5. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterSelectActivity.java
  6. 21 12
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java
  7. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java
  8. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/AboutActivity.java
  9. 0 25
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/IntentUtils.java
  10. 0 4
      WeiChat/src/main/res/layout/activity_login.xml
  11. 1 0
      WeiChat/src/main/res/values/styles.xml
  12. 11 1
      app_core/common/build.gradle
  13. 3 1
      app_core/common/src/main/AndroidManifest.xml
  14. 1 1
      app_core/common/src/main/java/com/core/app/ActionBackActivity.java
  15. 1 2
      app_core/common/src/main/java/com/core/app/MyApplication.java
  16. 1 1
      app_core/common/src/main/java/com/core/base/EasyFragment.java
  17. 2 2
      app_core/common/src/main/java/com/core/dao/DBManager.java
  18. 1 1
      app_core/common/src/main/java/com/core/db/SQLiteHelper.java
  19. 1 1
      app_core/common/src/main/java/com/core/model/EmployeesEntity.java
  20. 1 1
      app_core/common/src/main/java/com/core/net/http/ViewUtil.java
  21. 1 1
      app_core/common/src/main/java/com/core/net/volley/Result.java
  22. 1 1
      app_core/common/src/main/java/com/core/utils/CommonUtil.java
  23. 15 0
      app_core/common/src/main/java/com/core/utils/IntentUtils.java
  24. 1 1
      app_core/common/src/main/java/com/core/utils/OpenFilesUtils.java
  25. 1 1
      app_core/common/src/main/java/com/core/utils/TimeUtils.java
  26. 1 1
      app_core/common/src/main/java/com/core/utils/ToastUtil.java
  27. 1 1
      app_core/common/src/main/java/com/core/widget/ClearEditText.java
  28. 163 0
      app_core/common/src/main/java/com/core/widget/ClearEditText.java~HEAD
  29. 1 1
      app_core/common/src/main/java/com/core/widget/CustomProgressDialog.java
  30. 1 1
      app_core/common/src/main/java/com/core/widget/VoiceSearchView.java
  31. 1 1
      app_core/common/src/main/java/com/core/xmpp/dao/ChatMessageDao.java
  32. 1 1
      app_core/common/src/main/java/com/core/xmpp/dao/FriendDao.java
  33. 29 0
      app_core/common/src/main/res/anim/input_method_enter.xml
  34. 28 0
      app_core/common/src/main/res/anim/input_method_exit.xml
  35. 5 0
      app_core/common/src/main/res/color/btn_textcolor_selector.xml
  36. 7 0
      app_core/common/src/main/res/color/hyper_text.xml
  37. 7 0
      app_core/common/src/main/res/color/main_tab_btn_text.xml
  38. 6 0
      app_core/common/src/main/res/color/menu_tab_btn_text.xml
  39. 7 0
      app_core/common/src/main/res/color/selector_schedule_text.xml
  40. 5 0
      app_core/common/src/main/res/color/tv_textcolor_selector.xml
  41. 8 0
      app_core/common/src/main/res/drawable/above_shadow.xml
  42. 6 0
      app_core/common/src/main/res/drawable/actionbar_menu_selector.xml
  43. 12 0
      app_core/common/src/main/res/drawable/attendance_dl.xml
  44. 53 0
      app_core/common/src/main/res/drawable/audio_volume_level.xml
  45. 8 0
      app_core/common/src/main/res/drawable/below_shadow.xml
  46. 6 0
      app_core/common/src/main/res/drawable/bg_aguanzu.xml
  47. 5 0
      app_core/common/src/main/res/drawable/bg_bay.xml
  48. 7 0
      app_core/common/src/main/res/drawable/bg_blue_button.xml
  49. 17 0
      app_core/common/src/main/res/drawable/bg_btn.xml
  50. 24 0
      app_core/common/src/main/res/drawable/bg_bule_btn.xml
  51. 23 0
      app_core/common/src/main/res/drawable/bg_bule_btn1.xml
  52. 6 0
      app_core/common/src/main/res/drawable/bg_bule_yellow_text.xml
  53. 9 0
      app_core/common/src/main/res/drawable/bg_button_enabled.xml
  54. 9 0
      app_core/common/src/main/res/drawable/bg_button_focus.xml
  55. 9 0
      app_core/common/src/main/res/drawable/bg_button_green_focus.xml
  56. 9 0
      app_core/common/src/main/res/drawable/bg_button_invalid.xml
  57. 9 0
      app_core/common/src/main/res/drawable/bg_button_normal.xml
  58. 24 0
      app_core/common/src/main/res/drawable/bg_green_btn.xml
  59. 7 0
      app_core/common/src/main/res/drawable/bg_green_button.xml
  60. 5 0
      app_core/common/src/main/res/drawable/bg_grid.xml
  61. 5 0
      app_core/common/src/main/res/drawable/bg_guanzu.xml
  62. 8 0
      app_core/common/src/main/res/drawable/bg_item_del.xml
  63. 17 0
      app_core/common/src/main/res/drawable/bg_orange_btn.xml
  64. 17 0
      app_core/common/src/main/res/drawable/bg_orange_btn_pass.xml
  65. 10 0
      app_core/common/src/main/res/drawable/bg_popuwin.xml
  66. 8 0
      app_core/common/src/main/res/drawable/bg_room_info_add_btn.xml
  67. 8 0
      app_core/common/src/main/res/drawable/bg_room_info_minus_btn.xml
  68. 34 0
      app_core/common/src/main/res/drawable/bg_select_blue.xml
  69. 27 0
      app_core/common/src/main/res/drawable/bg_select_red.xml
  70. 24 0
      app_core/common/src/main/res/drawable/bg_transparent_btn.xml
  71. 24 0
      app_core/common/src/main/res/drawable/bg_white_btn.xml
  72. 33 0
      app_core/common/src/main/res/drawable/blend_dialog_frame.xml
  73. 10 0
      app_core/common/src/main/res/drawable/blend_holo_progressbar_circle.xml
  74. 12 0
      app_core/common/src/main/res/drawable/blend_view_bg_default.xml
  75. 5 0
      app_core/common/src/main/res/drawable/btn_dialog_selector.xml
  76. 5 0
      app_core/common/src/main/res/drawable/btn_index_selector.xml
  77. 21 0
      app_core/common/src/main/res/drawable/btn_selector_shape_one.xml
  78. 8 0
      app_core/common/src/main/res/drawable/button_green_bg.xml
  79. 8 0
      app_core/common/src/main/res/drawable/button_orange_bg.xml
  80. 17 0
      app_core/common/src/main/res/drawable/button_round_shape.xml
  81. 8 0
      app_core/common/src/main/res/drawable/chat_face_bg.xml
  82. 8 0
      app_core/common/src/main/res/drawable/chat_to_warp_bg.xml
  83. 8 0
      app_core/common/src/main/res/drawable/circle_add_float_view_bg.xml
  84. 9 0
      app_core/common/src/main/res/drawable/circle_add_item_default_bg.xml
  85. 14 0
      app_core/common/src/main/res/drawable/detail_seekbar.xml
  86. 20 0
      app_core/common/src/main/res/drawable/detail_seekbar_progress.xml
  87. 20 0
      app_core/common/src/main/res/drawable/detail_seekbar_progress_bg.xml
  88. 9 0
      app_core/common/src/main/res/drawable/dialog_style_bg.xml
  89. 8 0
      app_core/common/src/main/res/drawable/dialog_style_left_btn_bg.xml
  90. 13 0
      app_core/common/src/main/res/drawable/dialog_style_left_btn_normal.xml
  91. 13 0
      app_core/common/src/main/res/drawable/dialog_style_left_btn_press.xml
  92. 8 0
      app_core/common/src/main/res/drawable/dialog_style_right_btn_bg.xml
  93. 13 0
      app_core/common/src/main/res/drawable/dialog_style_right_btn_normal.xml
  94. 13 0
      app_core/common/src/main/res/drawable/dialog_style_right_btn_press.xml
  95. 5 0
      app_core/common/src/main/res/drawable/endmeeting.xml
  96. 9 0
      app_core/common/src/main/res/drawable/face_chang_bg.xml
  97. 76 0
      app_core/common/src/main/res/drawable/frame_loading.xml
  98. 12 0
      app_core/common/src/main/res/drawable/garden_padding_bg.xml
  99. 7 0
      app_core/common/src/main/res/drawable/globle_player_progress_bar_bg.xml
  100. 9 0
      app_core/common/src/main/res/drawable/im_btn_collapse_bg.xml

+ 6 - 10
WeiChat/build.gradle

@@ -81,7 +81,7 @@ dependencies {
     compile(deps.stetho) {
         force = true
     }
-    compile deps.circleimageview
+   
     compile deps.jodatime
     compile deps.systembartint
     compile deps.photoView
@@ -97,16 +97,12 @@ dependencies {
     releaseCompile deps.leakcanaryNp
     //project
     compile project(':common')
+    compile project(':network')
+    compile project(':imageload')
+  //  compile project(':applogin')
+//    compile project(':message')
     compile project(':appcontact')
-    compile project(':pullToRefershLibraryMy')
-    compile project(':MPAndroidChart')
-    compile project(':libedittextformlibrary')
-    compile project(':libfloatingactionbutton')
-    compile project(':libbdupdatesdk')
-    compile project(':library-swipemenu_lv')
-    compile project(':library-viewpager-indicator')
-    compile project(':lib-zxing')
-    compile project(':library-refreshlayout')
+ 
 }
 
 buildscript {

+ 7 - 1
WeiChat/src/main/AndroidManifest.xml

@@ -209,7 +209,13 @@
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.erp.activity.WebViewCommActivity"
-            android:hardwareAccelerated="false" />
+            android:hardwareAccelerated="false" >
+            <intent-filter>
+                <action android:name="com.modular.main.WebViewCommActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    
         <activity
             android:name=".ui.erp.activity.DetailTaskActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -82,7 +82,7 @@ import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.dialog.QSearchPpwindowUtils;
 import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.util.oa.AutoErpService;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -33,7 +33,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.R;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 
 import java.util.HashMap;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterSelectActivity.java

@@ -10,7 +10,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.PersonalRegActivity;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 
 public class RegisterSelectActivity extends BaseActivity {
     @ViewInject(R.id.person_btn)

+ 21 - 12
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java

@@ -82,7 +82,10 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     private TextView text_dialog;
     @ViewInject(R.id.pull_refresh_list)
     private StickyListHeadersListView refreshListView;
-    private TextView  tv_uu_new;
+
+
+    private TextView tv_uu_new;
+
     private FriendSortAdapter adapter;
     private String loginUserId;
     private List<BaseSortModel<Friend>> showDatas;//显示的数据
@@ -143,7 +146,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
 //                if (OAConfig.canShowCrm2_0())
 //                    startActivity(new Intent(getActivity(), AddContactsActivity.class));
 //                else
-                    startActivity(new Intent(getActivity(), UserSearchActivity.class));
+                startActivity(new Intent(getActivity(), UserSearchActivity.class));
             } else {
                 showPopupWindow();
             }
@@ -235,15 +238,15 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         mPullToRefreshView.setOnRefreshListener(new PullToRefreshView.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                if ("1".equals(UserRoleUtils.getUserRole())){
+                if ("1".equals(UserRoleUtils.getUserRole())) {
                     mPullToRefreshView.setRefreshing(false, false);
                     mcProgressDialog.dismiss();
-                   
-                }else{
+
+                } else {
                     loadFriendsNet();
-                   
+
                 }
-                
+
             }
         });
         //item点击事件处理
@@ -283,7 +286,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         loadDataInThread();
         //mcProgressDialog.show();
 
-       
+
     }
 
     @Override
@@ -302,7 +305,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         headview.findViewById(R.id.group).setOnClickListener(this);//商务群
         headview.findViewById(R.id.uu_friend).setOnClickListener(this);//我的好友
         headview.findViewById(R.id.peculiar_tv).setOnClickListener(this);//我的好友
-        tv_uu_new= (TextView) headview.findViewById(R.id.tv_uu_new);
+        tv_uu_new = (TextView) headview.findViewById(R.id.tv_uu_new);
         tv_uu_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, Constants.SET_UU_NEW, false) ? View.GONE : View.VISIBLE);
     }
 
@@ -518,13 +521,19 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
                 break;
             case R.id.peculiar_tv://常用联系人
                 intent = new Intent(ct, MyFriendActivity.class);
-                intent.putExtra("isPeculiar",true);
+                intent.putExtra("isPeculiar", true);
                 ct.startActivity(intent);
+//                intent = new Intent(ct, SelectPContactsActivity.class);
+//                SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
+//                        .setTitle(getString(R.string.app_local_contacts))
+//                        .setSingleAble(true)
+//                        .setSelectCode(null);
+//                intent.putExtra(OAConfig.MODEL_DATA, bean);
+//                intent.putExtra("type",0);
+//                startActivityForResult(intent, 0x01);
                 break;
         }
     }
 
 
-
-
 }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -22,7 +22,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/AboutActivity.java

@@ -27,7 +27,7 @@ import com.umeng.socialize.media.UMImage;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.xzjmyk.pm.activity.CommonWebviewActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 public class AboutActivity extends BaseActivity implements View.OnClickListener {

+ 0 - 25
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/IntentUtils.java

@@ -1,25 +0,0 @@
-package com.xzjmyk.pm.activity.util;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
-
-/**
- * Created by Arison on 2017/8/29.
- */
-
-public class IntentUtils {
-
-    /**
-     * @注释:跳转嵌入网页页面
-     * @param: url 经过登录验证之后的URL路径跳转
-     * text 客户端嵌入网页页面动态显示文字
-     */
-    public static void webLinks(Context ct, String url, String text) {
-        Intent intent_web = new Intent(ct, WebViewCommActivity.class);
-        intent_web.putExtra("url", url);
-        intent_web.putExtra("p", text);
-        ct.startActivity(intent_web);
-    }
-}

+ 0 - 4
WeiChat/src/main/res/layout/activity_login.xml

@@ -48,7 +48,6 @@
                     android:background="@color/white"
                     android:hint="@string/please_input_phone_number"
                     android:inputType="phone"
-
                     android:paddingBottom="0dp"
                     android:paddingTop="0dp" />
             </LinearLayout>
@@ -76,7 +75,6 @@
                     android:id="@+id/password_edit"
                     style="@style/IMLineEditPass"
                     android:background="@color/white"
-
                     android:hint="@string/please_input_password" />
             </LinearLayout>
 
@@ -102,7 +100,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/ll_content"
             android:layout_marginLeft="20dp"
-
             android:text="@string/login_losspwd"
             android:textColor="@color/titleBlue" />
 
@@ -113,7 +110,6 @@
             android:layout_alignParentRight="true"
             android:layout_below="@+id/ll_content"
             android:layout_marginRight="20dp"
-
             android:text="@string/login_register"
             android:textColor="@color/titleBlue" />
     </RelativeLayout>

+ 1 - 0
WeiChat/src/main/res/values/styles.xml

@@ -1172,6 +1172,7 @@
         <item name="android:taskToBackEnterAnimation">@null</item>
         <item name="android:taskToBackExitAnimation">@null</item>
     </style>
+
     android:layout_width="0dp"
     android:layout_weight="1"
 

+ 11 - 1
app_core/common/build.gradle

@@ -29,8 +29,18 @@ dependencies {
     compile(deps.stetho) {
         force = true
     }
-
+    compile deps.circleimageview
     compile project(':lib-zxing')
     compile deps.activityOnCrash
     compile 'com.umeng.analytics:analytics:6.1.2'
+
+    compile project(':pullToRefershLibraryMy')
+    compile project(':MPAndroidChart')
+    compile project(':libedittextformlibrary')
+    compile project(':libfloatingactionbutton')
+    compile project(':libbdupdatesdk')
+    compile project(':library-swipemenu_lv')
+    compile project(':library-viewpager-indicator')
+    compile project(':lib-zxing')
+    compile project(':library-refreshlayout')
 }

+ 3 - 1
app_core/common/src/main/AndroidManifest.xml

@@ -1,3 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.common">
+    package="com.core.app"
+    android:versionCode="111"
+    android:versionName="5.8.9">
 </manifest>

+ 1 - 1
app_core/common/src/main/java/com/core/app/ActionBackActivity.java

@@ -11,7 +11,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 
-import com.common.R;
+
 import com.core.base.StackActivity;
 
 

+ 1 - 2
app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -15,7 +15,7 @@ import android.util.Log;
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 import com.baidu.mapapi.SDKInitializer;
-import com.common.R;
+import com.core.app.R;
 import com.common.config.BaseApplication;
 import com.common.preferences.PreferenceUtils;
 import com.common.preferences.SharedUtil;
@@ -55,7 +55,6 @@ import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 /**
  * Created by Arison on 2017/8/25.
  */
-
 public class MyApplication extends BaseApplication {
 
     private static MyApplication INSTANCE = null;

+ 1 - 1
app_core/common/src/main/java/com/core/base/EasyFragment.java

@@ -9,7 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.common.R;
+import com.core.app.R;
 import com.lidroid.xutils.ViewUtils;
 
 /**

+ 2 - 2
app_core/common/src/main/java/com/core/dao/DBManager.java

@@ -7,11 +7,11 @@ import android.database.sqlite.SQLiteStatement;
 import android.util.Log;
 
 import com.common.LogUtil;
+import com.core.app.R;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.db.DatabaseManager;
 import com.core.model.B2BMsg;
-import com.common.R;
 import com.core.model.EmployeesEntity;
 import com.core.model.Hrorgs;
 import com.core.model.HrorgsEntity;
@@ -257,7 +257,7 @@ public class DBManager {
     }
 
     private boolean checkDbObject() {
-        if (db == null) db = DatabaseManager.getInstance().openDatabase();
+        if (db==null)db=DatabaseManager.getInstance().openDatabase();
         if (!db.isOpen()) {
             return true;
         } else {

+ 1 - 1
app_core/common/src/main/java/com/core/db/SQLiteHelper.java

@@ -3,7 +3,7 @@ package com.core.db;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.common.R;
+import com.core.app.R;
 import com.core.model.AuthCode;
 import com.core.model.CircleMessage;
 import com.core.model.Company;

+ 1 - 1
app_core/common/src/main/java/com/core/model/EmployeesEntity.java

@@ -2,7 +2,7 @@ package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import com.common.R;
+import com.core.app.R;
 import com.core.app.MyApplication;
 
 public class EmployeesEntity implements Parcelable {

+ 1 - 1
app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -17,7 +17,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
-import com.common.R;
+import com.core.app.R;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;

+ 1 - 1
app_core/common/src/main/java/com/core/net/volley/Result.java

@@ -7,7 +7,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
-import com.common.R;
+import com.core.app.R;
 import com.common.hmac.Md5Util;
 import com.common.system.SystemUtil;
 import com.core.app.AppConfig;

+ 1 - 1
app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -3,7 +3,7 @@ package com.core.utils;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.common.R;
+import com.core.app.R;
 import com.common.data.StringUtil;
 import com.common.file.PropertiesUtil;
 import com.core.api.wxapi.ApiPlatform;

+ 15 - 0
app_core/common/src/main/java/com/core/utils/IntentUtils.java

@@ -0,0 +1,15 @@
+package com.core.utils;
+
+import android.content.Context;
+import android.content.Intent;
+
+
+public class IntentUtils {
+    
+    public static void webLinks(Context ct, String url, String text) {
+        Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
+        intent_web.putExtra("url", url);
+        intent_web.putExtra("p", text);
+        ct.startActivity(intent_web);
+    }
+}

+ 1 - 1
app_core/common/src/main/java/com/core/utils/OpenFilesUtils.java

@@ -12,7 +12,7 @@ import android.webkit.MimeTypeMap;
 import android.widget.Toast;
 
 import com.common.LogUtil;
-import com.common.R;
+import com.core.app.R;
 import com.core.app.MyApplication;
 import com.core.net.http.HttpUtil;
 import com.lidroid.xutils.HttpUtils;

+ 1 - 1
app_core/common/src/main/java/com/core/utils/TimeUtils.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.widget.TextView;
 
-import com.common.R;
+import com.core.app.R;
 import com.common.data.DateFormatUtil;
 
 import java.text.ParseException;

+ 1 - 1
app_core/common/src/main/java/com/core/utils/ToastUtil.java

@@ -10,7 +10,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.common.R;
+import com.core.app.R;
 import com.common.data.StringUtil;
 import com.core.widget.crouton.Crouton;
 

+ 1 - 1
app_core/common/src/main/java/com/core/widget/ClearEditText.java

@@ -15,7 +15,7 @@ import android.view.animation.Animation;
 import android.view.animation.CycleInterpolator;
 import android.view.animation.TranslateAnimation;
 
-import com.common.R;
+import com.core.app.R;
 
 
 public class ClearEditText extends AppCompatEditText implements OnFocusChangeListener, TextWatcher {

+ 163 - 0
app_core/common/src/main/java/com/core/widget/ClearEditText.java~HEAD

@@ -0,0 +1,163 @@
+package com.core.widget;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.v4.view.MotionEventCompat;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnFocusChangeListener;
+import android.view.animation.Animation;
+import android.view.animation.CycleInterpolator;
+import android.view.animation.TranslateAnimation;
+import android.widget.EditText;
+
+import com.core.app.R;
+
+
+public class ClearEditText extends EditText implements OnFocusChangeListener, TextWatcher {
+	/**
+	 * 删除按钮的引用
+	 */
+	private Drawable mClearDrawable;
+	private boolean mFocusClear = false;
+
+	public ClearEditText(Context context) {
+		this(context, null);
+	}
+
+	public ClearEditText(Context context, AttributeSet attrs) {
+		this(context, attrs, android.R.attr.editTextStyle);
+	}
+
+	public ClearEditText(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		init();
+	}
+
+	private void init() {
+		// 获取EditText的DrawableRight,假如没有设置我们就使用默认的图片
+		mClearDrawable = getCompoundDrawables()[2];
+		if (mClearDrawable == null) {
+			mClearDrawable = getResources().getDrawable(R.drawable.search_clear);
+		}
+		mClearDrawable.setBounds(0, 0, mClearDrawable.getIntrinsicWidth(), mClearDrawable.getIntrinsicHeight());
+		setClearIconVisible(false);
+		setOnFocusChangeListener(this);
+		addTextChangedListener(this);
+	}
+
+	/**
+	 * 因为我们不能直接给EditText设置点击事件,所以我们用记住我们按下的位置来模拟点击事件 当我们按下的位置 在 EditText的宽度 - 图标到控件右边的间距 - 图标的宽度 和 EditText的宽度 - 图标到控件右边的间距之间我们就算点击了图标,竖直方向没有考虑
+	 */
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		int action = MotionEventCompat.getActionMasked(event);
+		if (action == MotionEvent.ACTION_DOWN) {
+			if (!TextUtils.isEmpty(getError())) {
+				setError(null, null);
+				setClearIconVisible(getText().length() > 0);
+				return false;
+			}
+		}
+
+		if (getCompoundDrawables()[2] != null) {
+			if (event.getAction() == MotionEvent.ACTION_UP) {
+				boolean touchable = event.getX() > (getWidth() - getPaddingRight() - mClearDrawable.getIntrinsicWidth())
+						&& (event.getX() < ((getWidth() - getPaddingRight())));
+				if (touchable) {
+					this.setText("");
+				}
+			}
+		}
+
+		return super.onTouchEvent(event);
+	}
+
+	/**
+	 * 当ClearEditText焦点发生变化的时候,判断里面字符串长度设置清除图标的显示与隐藏
+	 */
+	@Override
+	public void onFocusChange(View v, boolean hasFocus) {
+		if (mFocusClear) {
+			if (hasFocus) {
+				setClearIconVisible(getText().length() > 0);
+			} else {
+				setClearIconVisible(false);
+			}
+		}
+	}
+
+	/**
+	 * 当焦点改变的时候,显示或者隐藏Clear icon
+	 */
+	public void setFocusClear(boolean focusClear) {
+		mFocusClear = focusClear;
+	}
+
+	/**
+	 * 设置清除图标的显示与隐藏,调用setCompoundDrawables为EditText绘制上去
+	 * 
+	 * @param visible
+	 */
+	protected void setClearIconVisible(boolean visible) {
+		if (visible) {
+			if (!TextUtils.isEmpty(getError())) {
+				setError(null);
+			}
+		}
+		if (visible) {
+			if (mFocusClear && !hasFocus()) {
+				visible = false;
+			}
+		}
+		Drawable right = visible ? mClearDrawable : null;
+		if (getCompoundDrawables()[2] != right) {
+			setCompoundDrawables(getCompoundDrawables()[0], getCompoundDrawables()[1], null, getCompoundDrawables()[3]);
+		}
+		setCompoundDrawables(getCompoundDrawables()[0], getCompoundDrawables()[1], right, getCompoundDrawables()[3]);
+	}
+
+	/**
+	 * 当输入框里面内容发生变化的时候回调的方法
+	 */
+	@Override
+	public void onTextChanged(CharSequence s, int start, int count, int after) {
+		setClearIconVisible(s.length() > 0);
+	}
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+	}
+
+	@Override
+	public void afterTextChanged(Editable s) {
+
+	}
+
+	/**
+	 * 设置晃动动画
+	 */
+	public void setShakeAnimation() {
+		this.setAnimation(shakeAnimation(5));
+	}
+
+	/**
+	 * 晃动动画
+	 * 
+	 * @param counts
+	 *            1秒钟晃动多少下
+	 * @return
+	 */
+	public static Animation shakeAnimation(int counts) {
+		Animation translateAnimation = new TranslateAnimation(0, 10, 0, 0);
+		translateAnimation.setInterpolator(new CycleInterpolator(counts));
+		translateAnimation.setDuration(1000);
+		return translateAnimation;
+	}
+
+}

+ 1 - 1
app_core/common/src/main/java/com/core/widget/CustomProgressDialog.java

@@ -9,7 +9,7 @@ import android.view.Gravity;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.common.R;
+import com.core.app.R;
 
 
 /**

+ 1 - 1
app_core/common/src/main/java/com/core/widget/VoiceSearchView.java

@@ -9,7 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import com.common.R;
+import com.core.app.R;
 import com.core.utils.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechConstant;

+ 1 - 1
app_core/common/src/main/java/com/core/xmpp/dao/ChatMessageDao.java

@@ -3,8 +3,8 @@ package com.core.xmpp.dao;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.common.BuildConfig;
 import com.common.data.CalendarUtil;
+import com.core.app.BuildConfig;
 import com.core.app.MyApplication;
 import com.core.db.SQLiteHelper;
 import com.core.db.SQLiteRawUtil;

+ 1 - 1
app_core/common/src/main/java/com/core/xmpp/dao/FriendDao.java

@@ -5,7 +5,7 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.common.R;
+import com.core.app.R;
 import com.common.data.CalendarUtil;
 import com.core.app.MyApplication;
 import com.core.db.SQLiteHelper;

+ 29 - 0
app_core/common/src/main/res/anim/input_method_enter.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/fade_in.xml
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+		android:shareInterpolator="false">
+    <translate android:fromYDelta="10%" android:toYDelta="0"
+	        android:interpolator="@interpolator/decelerate_quint"
+            android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="0.5" android:toAlpha="1.0"
+			android:interpolator="@interpolator/decelerate_cubic"
+            android:duration="@android:integer/config_shortAnimTime" />
+</set>

+ 28 - 0
app_core/common/src/main/res/anim/input_method_exit.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/fade_out.xml
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shareInterpolator="false">
+    <translate android:fromYDelta="0" android:toYDelta="10%"
+			android:interpolator="@interpolator/accelerate_quint"
+            android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+			android:interpolator="@interpolator/accelerate_cubic"
+            android:duration="@android:integer/config_shortAnimTime"/>
+</set>

+ 5 - 0
app_core/common/src/main/res/color/btn_textcolor_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#99000000" android:state_pressed="true"/>
+    <item android:color="@android:color/white"/>
+</selector>

+ 7 - 0
app_core/common/src/main/res/color/hyper_text.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#ff809aff" />
+    <item android:state_pressed="true" android:color="#ff01bafe" />
+    <item android:color="#ff2e5f93" />
+</selector>

+ 7 - 0
app_core/common/src/main/res/color/main_tab_btn_text.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/bar_pass" android:state_checked="true" />
+    <item android:color="@color/text_hine" />
+
+</selector>

+ 6 - 0
app_core/common/src/main/res/color/menu_tab_btn_text.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@color/text_select" />
+    <item android:color="@color/text_black" />
+</selector>

+ 7 - 0
app_core/common/src/main/res/color/selector_schedule_text.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/black" android:state_selected="true"/>
+    <item android:color="@color/black" android:state_pressed="true"/>
+    <item android:color="@color/black" android:state_checked="true"/>
+    <item android:color="@color/white" />
+</selector>

+ 5 - 0
app_core/common/src/main/res/color/tv_textcolor_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#ffffff" android:state_pressed="true"/>
+    <item android:color="#000000"/>
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/above_shadow.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">   
+    <gradient
+        android:startColor="#20000000"
+        android:endColor="@android:color/transparent"
+        android:angle="90" >
+    </gradient>
+</shape>

+ 6 - 0
app_core/common/src/main/res/drawable/actionbar_menu_selector.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/actionbar_selector_color"  android:state_pressed="true"  />
+    
+    <item android:drawable="@color/transparent"/>
+</selector>

+ 12 - 0
app_core/common/src/main/res/drawable/attendance_dl.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#afb9ff" />
+
+            <corners android:radius="360dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+
+</selector>

+ 53 - 0
app_core/common/src/main/res/drawable/audio_volume_level.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:drawable="@drawable/record_animate_01"
+        android:maxLevel="0"/>
+    <item
+        android:drawable="@drawable/record_animate_01"
+        android:maxLevel="1"/>
+    <item
+        android:drawable="@drawable/record_animate_02"
+        android:maxLevel="2"/>
+    <item
+        android:drawable="@drawable/record_animate_03"
+        android:maxLevel="3"/>
+    <item
+        android:drawable="@drawable/record_animate_04"
+        android:maxLevel="4"/>
+    <item
+        android:drawable="@drawable/record_animate_05"
+        android:maxLevel="5"/>
+    <item
+        android:drawable="@drawable/record_animate_06"
+        android:maxLevel="6"/>
+    <item
+        android:drawable="@drawable/record_animate_07"
+        android:maxLevel="7"/>
+    <item
+        android:drawable="@drawable/record_animate_08"
+        android:maxLevel="8"/>
+    <item
+        android:drawable="@drawable/record_animate_09"
+        android:maxLevel="9"/>
+    <item
+        android:drawable="@drawable/record_animate_10"
+        android:maxLevel="10"/>
+    <item
+        android:drawable="@drawable/record_animate_11"
+        android:maxLevel="11"/>
+    <item
+        android:drawable="@drawable/record_animate_12"
+        android:maxLevel="12"/>
+    <item
+        android:drawable="@drawable/record_animate_13"
+        android:maxLevel="13"/>
+    <item
+        android:drawable="@drawable/record_animate_14"
+        android:maxLevel="14"/>
+    <item
+        android:drawable="@drawable/record_animate_14"
+        android:maxLevel="15"/>
+
+</level-list>

+ 8 - 0
app_core/common/src/main/res/drawable/below_shadow.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">   
+    <gradient
+        android:startColor="#20000000"
+        android:endColor="@android:color/transparent"
+        android:angle="270" >
+    </gradient>
+</shape>

+ 6 - 0
app_core/common/src/main/res/drawable/bg_aguanzu.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/aguanzu_pass" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/aguanzu" />
+
+</selector>

+ 5 - 0
app_core/common/src/main/res/drawable/bg_bay.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/boy_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/boy"/>
+</selector>

+ 7 - 0
app_core/common/src/main/res/drawable/bg_blue_button.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/bg_button_focus"/>
+    <item android:state_enabled="true" android:drawable="@drawable/bg_button_enabled"/>
+    <item android:state_enabled="false" android:drawable="@drawable/bg_button_invalid"/>
+    <item android:drawable="@drawable/bg_button_normal"/>
+</selector>

+ 17 - 0
app_core/common/src/main/res/drawable/bg_btn.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_login_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/btn_login_nomarl" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 24 - 0
app_core/common/src/main/res/drawable/bg_bule_btn.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/titleBlue" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 23 - 0
app_core/common/src/main/res/drawable/bg_bule_btn1.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+       
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/titleBlue" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 6 - 0
app_core/common/src/main/res/drawable/bg_bule_yellow_text.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/yellow_home" android:state_selected="true"></item>
+    <item android:color="@color/yellow_home" android:state_pressed="true"></item>
+    <item android:color="@color/titleBlue" android:state_selected="false"></item>
+</selector>

+ 9 - 0
app_core/common/src/main/res/drawable/bg_button_enabled.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/button_normal"/>
+            <corners android:radius="5dip"/>
+        </shape>
+    </item>
+</layer-list>

+ 9 - 0
app_core/common/src/main/res/drawable/bg_button_focus.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/button_focus"/>
+            <corners android:radius="5dip"/>
+        </shape>
+    </item>
+</layer-list>

+ 9 - 0
app_core/common/src/main/res/drawable/bg_button_green_focus.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/light_green"/>
+            <corners android:radius="5dip"/>
+        </shape>
+    </item>
+</layer-list>

+ 9 - 0
app_core/common/src/main/res/drawable/bg_button_invalid.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/button_invalid"/>
+            <corners android:radius="5dip"/>
+        </shape>
+    </item>
+</layer-list>

+ 9 - 0
app_core/common/src/main/res/drawable/bg_button_normal.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/text_normal"/>
+            <corners android:radius="5dip"/>
+        </shape>
+    </item>
+</layer-list>

+ 24 - 0
app_core/common/src/main/res/drawable/bg_green_btn.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/light_green" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 7 - 0
app_core/common/src/main/res/drawable/bg_green_button.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_button_green_focus" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_button_green_focus" android:state_enabled="true"/>
+    <item android:drawable="@drawable/bg_button_invalid" android:state_enabled="false"/>
+    <item android:drawable="@drawable/bg_button_normal"/>
+</selector>

+ 5 - 0
app_core/common/src/main/res/drawable/bg_grid.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/grid_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/grid"/>
+</selector>

+ 5 - 0
app_core/common/src/main/res/drawable/bg_guanzu.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/guanzu_pass" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/guanzu" />
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/bg_item_del.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/appitem_del_btn_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/appitem_del_btn_pressed" />
+    <item android:state_pressed="true" android:drawable="@drawable/appitem_del_btn_pressed" />
+    <item android:drawable="@drawable/appitem_del_btn_normal" />
+</selector>

+ 17 - 0
app_core/common/src/main/res/drawable/bg_orange_btn.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/btn_orange_normal" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 17 - 0
app_core/common/src/main/res/drawable/bg_orange_btn_pass.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 10 - 0
app_core/common/src/main/res/drawable/bg_popuwin.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/transparent" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/bg_room_info_add_btn.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/roominfo_add_btn_normal" />
+    <item android:state_selected="true" android:drawable="@drawable/roominfo_add_btn_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/roominfo_add_btn_normal" />
+    <item android:drawable="@drawable/roominfo_add_btn_pressed" />
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/bg_room_info_minus_btn.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/roominfo_minus_btn_normal" />
+    <item android:state_selected="true" android:drawable="@drawable/roominfo_minus_btn_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/roominfo_minus_btn_normal" />
+    <item android:drawable="@drawable/roominfo_minus_btn_pressed" />
+</selector>

+ 34 - 0
app_core/common/src/main/res/drawable/bg_select_blue.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" android:topLeftRadius="3dp" android:topRightRadius="3dp"></corners>
+            <stroke android:width="1dp" android:color="#f10813"></stroke>
+            <solid android:color="#f10813"></solid>
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" android:topLeftRadius="3dp" android:topRightRadius="3dp"></corners>
+            <stroke
+                android:width="1dp"
+                android:color="#999999">
+            </stroke>
+            <solid android:color="@color/white"></solid>
+        </shape>
+
+    </item>
+
+    <item >
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" android:topLeftRadius="3dp" android:topRightRadius="3dp"></corners>
+            <stroke
+                android:width="1dp"
+                android:color="#676767">
+            </stroke>
+            <solid android:color="@color/white"></solid>
+        </shape>
+
+    </item>
+</selector>

+ 27 - 0
app_core/common/src/main/res/drawable/bg_select_red.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" android:topLeftRadius="3dp" android:topRightRadius="3dp"></corners>
+            <stroke android:width="1dp" android:color="#f10813"></stroke>
+            <solid android:color="#f10813"></solid>
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" android:topLeftRadius="3dp" android:topRightRadius="3dp"></corners>
+            <stroke android:width="1dp" android:color="@color/gray_light"></stroke>
+            <solid android:color="@color/gray_light"></solid>
+        </shape>
+
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" android:topLeftRadius="3dp" android:topRightRadius="3dp"></corners>
+            <stroke android:width="1dp" android:color="#80CCCCCC"></stroke>
+            <solid android:color="#80CCCCCC"></solid>
+        </shape>
+    </item>
+</selector>

+ 24 - 0
app_core/common/src/main/res/drawable/bg_transparent_btn.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="#20FFFFFF" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="#20FFFFFF" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#20FFFFFF" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 24 - 0
app_core/common/src/main/res/drawable/bg_white_btn.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 33 - 0
app_core/common/src/main/res/drawable/blend_dialog_frame.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape>
+            <corners
+                android:bottomLeftRadius="0dip"
+                android:bottomRightRadius="0dip"
+                android:topLeftRadius="0dip"
+                android:topRightRadius="0dip" />
+
+            <padding
+                android:bottom="0.0dip"
+                android:left="0.0dip"
+                android:right="0.0dip"
+                android:top="0.0dip" />
+
+            <solid android:color="@color/blend_item_theme_color" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <corners
+                android:bottomLeftRadius="0dip"
+                android:bottomRightRadius="0dip"
+                android:topLeftRadius="0dip"
+                android:topRightRadius="0dip" />
+
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+
+</layer-list>

+ 10 - 0
app_core/common/src/main/res/drawable/blend_holo_progressbar_circle.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate android:drawable="@drawable/blend_spinner_76_outer_holo" android:fromDegrees="0.0" android:toDegrees="1080.0" android:pivotX="50.0%" android:pivotY="50.0%" />
+    </item>
+    <item>
+        <rotate android:drawable="@drawable/blend_spinner_76_inner_holo" android:fromDegrees="720.0" android:toDegrees="0.0" android:pivotX="50.0%" android:pivotY="50.0%" />
+    </item>
+</layer-list>

+ 12 - 0
app_core/common/src/main/res/drawable/blend_view_bg_default.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"><shape>
+            <solid android:color="@color/lightgray" />
+        </shape></item>
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/lightgray" />
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape></item>
+</selector>

+ 5 - 0
app_core/common/src/main/res/drawable/btn_dialog_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/dg_btn_pressed" android:state_pressed="true"></item>
+    <item android:drawable="@drawable/dg_btn_normal"></item>
+</selector>

+ 5 - 0
app_core/common/src/main/res/drawable/btn_index_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/indexnormal" android:state_pressed="true"/>
+    <item android:drawable="@color/indexpress"/>
+</selector>

+ 21 - 0
app_core/common/src/main/res/drawable/btn_selector_shape_one.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:state_focused="true" ><shape>
+            <solid android:color="#FFFFFF" />
+            <stroke android:width="0.6dp" android:color="#00EEEE" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape></item>
+    <item  android:state_pressed="true"><shape>
+            <solid android:color="#FFFFFF" />
+            <stroke android:width="0.6dp" android:color="#00EEEE" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape></item>
+    <item><shape>
+            <solid android:color="#FFFFFF" />
+            <stroke android:width="0.6dp" android:color="#008B00" />
+            <corners android:radius="50dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape></item>
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/button_green_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/button_green_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_green_press" android:state_focused="true"/>
+    <item android:drawable="@drawable/button_green"/>
+ 
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/button_orange_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/button_orange_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_orange_press" android:state_focused="true"/>
+    <item android:drawable="@drawable/button_orange"/>
+ 
+</selector>

+ 17 - 0
app_core/common/src/main/res/drawable/button_round_shape.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"  >
+        <shape>
+            <solid android:color="@color/TextRed" />
+            <corners android:radius="360dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/light_green" />
+            <corners android:radius="360dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/chat_face_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@color/transparent" />
+    <item android:state_selected="true" android:drawable="@drawable/bg_face_sel" />
+    <item android:state_pressed="true" android:drawable="@drawable/bg_face_sel" />
+    <item android:drawable="@color/transparent" />
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/chat_to_warp_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/chat_bg_white_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/chat_bg_white_press" android:state_focused="true"/>
+    <item android:drawable="@drawable/chat_bg_white"/>
+
+</selector>

+ 8 - 0
app_core/common/src/main/res/drawable/circle_add_float_view_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@color/black_trans_33" />
+    <item android:state_selected="true" android:drawable="@color/black_trans_33" />
+    <item android:state_pressed="true" android:drawable="@color/black_trans_33" />
+    <item android:drawable="@color/transparent" />
+</selector>

+ 9 - 0
app_core/common/src/main/res/drawable/circle_add_item_default_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners android:radius="10dp" />
+
+    <solid android:color="@color/circle_add_item_bg" />
+
+</shape>

+ 14 - 0
app_core/common/src/main/res/drawable/detail_seekbar.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/detail_seekbar_progress_bg"/>
+    <item
+        android:id="@android:id/secondaryProgress"
+        android:drawable="@drawable/detail_seekbar_progress_bg"/>
+    <item
+        android:id="@android:id/progress"
+        android:drawable="@drawable/detail_seekbar_progress"/>
+
+</layer-list>

+ 20 - 0
app_core/common/src/main/res/drawable/detail_seekbar_progress.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <clip>
+            <shape>
+                <corners android:radius="0.0dip" />
+                <solid android:color="@color/orange" />
+            </shape>
+        </clip>
+    </item>
+    <item>
+        <clip>
+            <shape>
+                <corners android:radius="0.0dip" />
+                <solid android:color="@color/orange" />
+            </shape>
+        </clip>
+    </item>
+</selector>

+ 20 - 0
app_core/common/src/main/res/drawable/detail_seekbar_progress_bg.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <clip>
+            <shape>
+                <solid android:color="@color/fade_black" />
+                <corners android:radius="2.0dip" />
+            </shape>
+        </clip>
+    </item>
+    <item>
+        <clip>
+            <shape>
+                <solid android:color="@color/fade_black" />
+                <corners android:radius="2.0dip" />
+            </shape>
+        </clip>
+    </item>
+</selector>

+ 9 - 0
app_core/common/src/main/res/drawable/dialog_style_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners android:radius="10dp" />
+
+    <solid android:color="@color/white" />
+
+</shape>

+ 8 - 0
app_core/common/src/main/res/drawable/dialog_style_left_btn_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/dialog_style_left_btn_press" />
+    <item android:state_selected="true" android:drawable="@drawable/dialog_style_left_btn_press" />
+    <item android:state_pressed="true" android:drawable="@drawable/dialog_style_left_btn_press" />
+    <item android:drawable="@drawable/dialog_style_left_btn_normal" />
+</selector>

+ 13 - 0
app_core/common/src/main/res/drawable/dialog_style_left_btn_normal.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+
+    <solid android:color="@color/white" />
+
+</shape>

+ 13 - 0
app_core/common/src/main/res/drawable/dialog_style_left_btn_press.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+
+    <solid android:color="@color/grey" />
+
+</shape>

+ 8 - 0
app_core/common/src/main/res/drawable/dialog_style_right_btn_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/dialog_style_right_btn_press" />
+    <item android:state_selected="true" android:drawable="@drawable/dialog_style_right_btn_press" />
+    <item android:state_pressed="true" android:drawable="@drawable/dialog_style_right_btn_press" />
+    <item android:drawable="@drawable/dialog_style_right_btn_normal" />
+</selector>

+ 13 - 0
app_core/common/src/main/res/drawable/dialog_style_right_btn_normal.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="10dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+
+    <solid android:color="@color/white" />
+
+</shape>

+ 13 - 0
app_core/common/src/main/res/drawable/dialog_style_right_btn_press.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="10dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+
+    <solid android:color="@color/grey" />
+
+</shape>

+ 5 - 0
app_core/common/src/main/res/drawable/endmeeting.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/end_meeting_pass" android:state_pressed="true" />
+    <item android:drawable="@drawable/end_meeting" />
+</selector>

+ 9 - 0
app_core/common/src/main/res/drawable/face_chang_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/face_chang_1" android:state_enabled="true" android:state_focused="true" android:state_pressed="false"/>
+    <item android:drawable="@drawable/face_chang_2" android:state_enabled="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/face_chang_2" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/face_chang_1"/>
+
+</selector>

+ 76 - 0
app_core/common/src/main/res/drawable/frame_loading.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false" >
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_01"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_02"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_03"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_04"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_05"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_06"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_07"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_08"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_09"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_10"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_11"
+            android:gravity="left" />
+    </item>
+    <item android:duration="150">
+        <clip
+            android:clipOrientation="horizontal"
+            android:drawable="@drawable/loading_12"
+            android:gravity="left" />
+    </item>
+</animation-list>

+ 12 - 0
app_core/common/src/main/res/drawable/garden_padding_bg.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#F69535" />
+            <corners android:radius="360dp" />
+            <padding android:bottom="10dp" android:left="10dp"
+                android:right="10dp" android:top="10dp" />
+        </shape>
+    </item>
+
+</selector>

+ 7 - 0
app_core/common/src/main/res/drawable/globle_player_progress_bar_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>    
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">    
+<!--  设置背景色图像资源  -->    
+<item android:id="@android:id/background" android:drawable="@drawable/globle_player_progress_trough" />    
+<!--  设置第一级进度条颜色图像资源  -->    
+<item android:id="@android:id/progress" android:drawable="@drawable/globle_player_progress_bar" />    
+</layer-list> 

+ 9 - 0
app_core/common/src/main/res/drawable/im_btn_collapse_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/im_collapse_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/im_collapse_pressed" android:state_focused="true"/>
+    <item android:drawable="@drawable/im_collapse_nor"/>
+
+
+</selector>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません