UI改版：修改标题栏

WeiChat/src/main/AndroidManifest.xml

@@ -292,7 +292,8 @@
             </intent-filter>
         </activity>
         <!-- 消息模块 -->
-        <activity android:name=".ui.message.ChatActivity">
+        <activity android:name=".ui.message.ChatActivity"
+            android:theme="@style/MainBaseTheme">
             <intent-filter>
                 <action android:name="com.modular.message.ChatActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1006,7 +1007,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.erp.activity.secretary.BookingListActivity">
+        <activity android:name=".ui.erp.activity.secretary.BookingListActivity"
+            android:label="@string/booking_menu"
+            android:theme="@style/MainBaseTheme">
             <intent-filter>
                 <action android:name="com.modular.booking.BookingListActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1014,6 +1017,8 @@
         </activity>
         <activity
             android:name=".ui.erp.activity.secretary.BookingAddActivity"
+            android:label="@string/booking_add"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.core.utils.pictureselector.PictureSelectorDemo"

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -31,7 +31,7 @@ import java.util.Locale;
  * 带网络请求的Activity继承
  *
  * @author Dean Tao
- */
+ */ 
 public abstract class BaseActivity extends ActionBackActivity {
 
     private FastVolley mFastVolley;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -27,8 +27,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.HttpImp;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.net.volley.ObjectResult;
@@ -59,7 +58,7 @@ import java.util.regex.Pattern;
  * @desc:小秘书新增界面
  * @author：Arison on 2017/6/22
  */
-public class BookingAddActivity extends OABaseActivity implements HttpImp, View.OnClickListener {
+public class BookingAddActivity extends SupportToolBarActivity implements  View.OnClickListener {
     
     private TextView tvBookObject;
     private RelativeLayout companyAddRl;
@@ -271,7 +270,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
             bt_commit.setEnabled(true);
             return;
         }
-        showLoading();
+//        showLoading();
         String content = "";
         content = et_book_content.getText().toString();
         content = content.replace("'", "''");
@@ -333,7 +332,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
             bt_commit.setEnabled(true);
             return;
         }
-        showLoading();
+//        showLoading();
         String content = "";
         content = et_book_content.getText().toString();
         content = content.replace("'", "''");
@@ -367,7 +366,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            dimssLoading();
+//            dimssLoading();
             switch (msg.what) {
                 case 0x01:
                     try {
@@ -387,7 +386,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                             bt_commit.setEnabled(true);
                         }
 
-                        dimssLoading();
+//                        dimssLoading();
                     } catch (Exception e) {
                         ToastMessage("预约失败！");
                         bt_commit.setEnabled(true);
@@ -516,19 +515,20 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
         if (!StringUtil.isMobileNumber(phone)) {
-            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
+           // showToast(, R.color.load_submit);
+            showToast("选择人员电话号码为空或是格式不正确");
             return;
         }
         StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
                 Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                dimssLoading();
+              // dimssLoading();
             }
         }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
             @Override
             public void onResponse(ObjectResult<AddAttentionResult> result) {
-                showToast("短信发送成功", R.color.load_submit);
+                showToast("短信发送成功");
 
             }
         }, AddAttentionResult.class, null) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -26,6 +26,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.HttpImp;
 import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.sp.UserSp;
@@ -60,7 +61,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class BookingListActivity extends OABaseActivity implements HttpImp, View.OnClickListener {
+public class BookingListActivity extends SupportToolBarActivity implements  View.OnClickListener {
 
     @ViewInject(R.id.tv_book_me)
     TextView tv_book_me;
@@ -137,7 +138,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
             finish();
         }
         return super.onOptionsItemSelected(item);
-
     }
 
     private void initEvent() {
@@ -268,11 +268,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                 startActivity(new Intent(mContext, BBookingAddActivity.class));
                 break;
             case R.id.mBookService:
-              if (BaseConfig.isDebug()){
-                  startActivity(new Intent(mContext,  BServicesActivity.class));
-              }else{
-                  startActivity(new Intent(mContext,  BServicesActivity.class));
-              }
+                startActivity(new Intent(mContext,  BServicesActivity.class));
                 break;
             case R.id.mBookShares:
                 Intent intent = new Intent(mContext, BBSharesListActivity.class);
@@ -334,7 +330,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
 
     private void loadListData() {
-        showLoading();
+//        showLoading();
         String url = Constants.IM_BASE_URL() + "user/appBookingList";
         Map<String, Object> params = new HashMap<>();
         params.put("token",  UserSp.getInstance(MyApplication.getInstance()).getAccessToken(""));
@@ -350,7 +346,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            dimssLoading();
+//            dimssLoading();
             setCalenderOnClicklistener();
             switch (msg.what) {
                 case 0x01:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -35,9 +35,10 @@ import com.common.data.ListUtils;
 import com.common.preferences.PreferenceUtils;
 import com.common.thread.ThreadPool;
 import com.common.ui.CameraUtil;
-import com.core.app.ActionBackActivity;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
+import com.core.base.SupportToolBarActivity;
 import com.core.broadcast.MsgBroadcast;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
@@ -52,7 +53,6 @@ import com.core.net.volley.StringJsonObjectRequest;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.xmpp.CoreService;
-import com.core.xmpp.FriendHelper;
 import com.core.xmpp.ListenerManager;
 import com.core.xmpp.ReceiptManager;
 import com.core.xmpp.dao.ChatMessageDao;
@@ -61,13 +61,12 @@ import com.core.xmpp.downloader.Downloader;
 import com.core.xmpp.downloader.UploadEngine;
 import com.core.xmpp.listener.ChatMessageListener;
 import com.core.xmpp.model.ChatMessage;
-import com.core.app.AppConstant;
 import com.core.xmpp.utils.flie.FileUtils;
 import com.core.xmpp.widget.ChatBottomView;
 import com.core.xmpp.widget.ChatContentView;
 import com.core.xmpp.widget.PullDownListView;
-import com.uas.appcontact.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appcontact.R;
 import com.uas.appcontact.db.TopContactsDao;
 
 import java.io.File;
@@ -91,7 +90,7 @@ import java.util.UUID;
  * @修改时间: $Date$
  * @修改的内容: TODO 修改聊天，点击用户头像，加入黑名单，返回，还可以和加入黑名单的用户聊天的bug
  */
-public class ChatActivity extends ActionBackActivity
+public class ChatActivity extends SupportToolBarActivity
         implements ChatContentView.MessageEventListener, ChatBottomView.ChatBottomListener, ChatMessageListener {
 
 
@@ -243,9 +242,11 @@ public class ChatActivity extends ActionBackActivity
     private void initView() {
         String remarkName = mFriend.getRemarkName();
         if (remarkName == null) {
-            getSupportActionBar().setTitle(mFriend.getNickName());
+           // getSupportActionBar().setTitle(mFriend.getNickName());
+            setTitle(mFriend.getNickName());
         } else {
-            getSupportActionBar().setTitle(mFriend.getRemarkName());
+            //getSupportActionBar().setTitle(mFriend.getRemarkName());
+            setTitle(mFriend.getRemarkName());
         }
         findViewById(R.id.root_view);
         mAuthStateTipTv = (TextView) findViewById(R.id.auth_state_tip);

WeiChat/src/main/res/layout/activity_booking_list.xml

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
+    android:background="@color/white"
     android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
@@ -45,7 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:background="#6A6A6A"
+            android:background="#FFFFFF"
             android:paddingTop="10dp"
             android:paddingBottom="10dp">
             <RelativeLayout
@@ -72,11 +73,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center_horizontal"
-                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawablePadding="@dimen/padding"
                     android:drawableTop="@drawable/booking_personal"
                     android:layout_centerInParent="true"
                     android:text="@string/booking_personal"
-                    android:textColor="@color/white"
                     android:layout_marginTop="2dp"/>
             </RelativeLayout>
             <RelativeLayout
@@ -102,12 +102,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center_horizontal"
-                    android:layout_marginTop="2dp"
-                    android:drawablePadding="@dimen/drawable_padding"
+
+                    android:drawablePadding="@dimen/padding"
                     android:drawableTop="@drawable/booking_business"
                     android:layout_centerInParent="true"
                     android:text="@string/booking_business"
-                    android:textColor="@color/white" />
+                    android:layout_marginTop="2dp"
+                    />
             </RelativeLayout>
 
             <TextView
@@ -116,27 +117,27 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:layout_weight="1"
-                android:drawablePadding="@dimen/drawable_padding"
+                android:drawablePadding="@dimen/padding"
                 android:drawableTop="@drawable/booking_service"
                 android:gravity="center"
                 android:text="@string/booking_service"
-                android:textColor="@color/white" />
+                />
             <TextView
                 android:id="@+id/mBookShares"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:layout_weight="1"
-                android:drawablePadding="@dimen/drawable_padding"
+                android:drawablePadding="@dimen/padding"
                 android:drawableTop="@drawable/booking_share"
                 android:gravity="center"
                 android:text="@string/booking_shared"
-                android:textColor="@color/white" />
+             />
             <LinearLayout
                 android:id="@+id/oamain_more_menu_ll"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="@dimen/padding"
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:paddingLeft="5dp"
@@ -180,7 +181,7 @@
         <!--年月日布局-->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="35dp"
+            android:layout_height="30dp"
             android:layout_gravity="center_horizontal"
             android:gravity="center">
 
@@ -210,7 +211,8 @@
         <android.support.v4.view.ViewPager
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
-            android:layout_height="230dp" />
+            android:layout_height="200dp" 
+            android:background="@color/white"/>
 
         <View
             android:layout_width="match_parent"

WeiChat/src/main/res/layout/book_empty_list.xml

@@ -15,6 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
+        android:textColor="@color/gray"
         android:layout_centerInParent="true"
         android:textSize="14sp"
         android:text="@string/book_empty"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue May 15 13:51:11 CST 2018
-debugName=251
+#Tue May 15 17:03:37 CST 2018
+debugName=257
 versionName=630
-debugCode=251
+debugCode=257
 versionCode=170

app_modular/appbooking/src/main/AndroidManifest.xml

@@ -3,12 +3,18 @@
     package="com.modular.booking">
 
     <application>
-        <activity android:name=".activity.business.BBookingAddActivity" />
-        <activity android:name=".activity.shares.BBSharesListActivity" />
+        <activity android:name=".activity.business.BBookingAddActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/booking_business"/>
+        <activity android:name=".activity.shares.BBSharesListActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/booking_share"/>
         <activity android:name=".activity.business.BBCompanyListActivity" />
         <activity android:name=".activity.business.MuilSelectBeanActivity" />
         <activity android:name=".activity.business.BBookingDetailActivity" />
-        <activity android:name=".activity.shares.MuiltSelectShareActivity" />
+        <activity android:name=".activity.shares.MuiltSelectShareActivity" 
+            android:label="@string/booking_share"
+            android:theme="@style/MainBaseTheme"/>
         <activity android:name=".activity.services.BServicesActivity" />
         <activity android:name=".activity.services.BServiceListActivity" />
         <activity android:name=".activity.services.BServiceAddActivity" />

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -28,7 +28,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectEmUser;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.StringJsonObjectRequest;
@@ -57,7 +57,7 @@ import java.util.Map;
  * @desc:商务预约新增界面
  * @author：Arison on 2017/9/7
  */
-public class BBookingAddActivity extends OABaseActivity implements View.OnClickListener {
+public class BBookingAddActivity extends SupportToolBarActivity implements View.OnClickListener {
     private TextView tvBookObject;
     private RelativeLayout companyAddRl;
     private RelativeLayout rlObject;
@@ -350,7 +350,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 "\"ab_longitude\":\"" + longitude + "\",\n" +
                 "\"ab_latitude\":\"" + latitude + "\"" +
                 "}\n";
-        showLoading();
+       // showLoading();
         LogUtil.d("HttpLogs", "map:" + map);
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
@@ -362,7 +362,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                dimssLoading();
+                //dimssLoading();
                 LogUtil.d("", "" + o.toString());
                 if (JSONUtil.validate(o.toString())) {
                     String success = JSON.parseObject(o.toString()).getString("result");
@@ -581,19 +581,19 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
         if (!StringUtil.isMobileNumber(phone)) {
-            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
+            showToast("选择人员电话号码为空或是格式不正确");
             return;
         }
         StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
                 Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                dimssLoading();
+              //  dimssLoading();
             }
         }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
             @Override
             public void onResponse(ObjectResult<AddAttentionResult> result) {
-                showToast("短信发送成功", R.color.load_submit);
+                showToast("短信发送成功");
 
             }
         }, AddAttentionResult.class, null) {

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/BBSharesListActivity.java

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
 
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.widget.EmptyLayout;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.modular.booking.R;
@@ -15,11 +15,8 @@ import com.modular.booking.model.BookingModel;
 
 import java.util.ArrayList;
 
-/**
-  * @desc:分享列表界面
-  * @author：Arison on 2017/9/7
-  */
-public class BBSharesListActivity extends BaseActivity {
+
+public class BBSharesListActivity extends SupportToolBarActivity {
     
     private ArrayList<BookingModel> mDatas = new ArrayList<>();
     private BookAdapter mAdapter;

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/MuiltSelectShareActivity.java

@@ -13,7 +13,7 @@ import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.OAConfig;
 import com.core.model.SelectCollisionTurnBean;
 import com.core.model.SelectEmUser;
@@ -30,7 +30,7 @@ import com.modular.booking.model.BookingModel;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MuiltSelectShareActivity extends OABaseActivity {
+public class MuiltSelectShareActivity extends SupportToolBarActivity {
     private ArrayList<BookingModel> mDatas = new ArrayList<>();
     private MuiltBookAdapter mAdapter;
     private PullToRefreshListView mlist;
@@ -152,10 +152,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
 
 
     public void shareBooking(String planids, String bplanids, String imids) {
-        showLoading();
-        //map包括planids 个人计划id,bplanids商务计划id,userids共享人员imid，多个id用逗号连接
         String map = "{\"planids\":\"" + planids + "\",\"bplanids\":\"" + bplanids + "\",\"userids\":\"" + imids + "\"}";
-        LogUtil.d("HttpLogs", "map:" + map);
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appBatchShare")
@@ -165,7 +162,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                dimssLoading();
+//                dimssLoading();
                 if (JSONUtil.validate(o.toString())){
                     String result=JSON.parseObject(o.toString()).getString("result");
                     if ("success".equals(result)){

app_modular/appbooking/src/main/res/values-zh-rCN/strings.xml

@@ -32,7 +32,7 @@
     <string name="booking_personal">个人预约</string>
     <string name="booking_business">商务预约</string>
     <string name="booking_service">服务预约</string>
-    <string name="booking_share">共享预约</string>
+    <string name="booking_share">预约共享</string>
 
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>

app_modular/appbooking/src/main/res/values-zh-rTW/strings.xml

@@ -32,7 +32,7 @@
     <string name="booking_personal">个人预约</string>
     <string name="booking_business">商务预约</string>
     <string name="booking_service">服务预约</string>
-    <string name="booking_share">共享预约</string>
+    <string name="booking_share">预约共享</string>
 
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>

app_modular/appbooking/src/main/res/values/strings.xml

@@ -33,7 +33,7 @@
     <string name="booking_personal">个人预约</string>
     <string name="booking_business">商务预约</string>
     <string name="booking_service">服务预约</string>
-    <string name="booking_share">共享预约</string>
+    <string name="booking_share">预约共享</string>
 
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>