UI改版-更改设置标题栏

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon May 14 16:26:14 CST 2018
-debugName=236
+#Mon May 14 18:16:19 CST 2018
+debugName=242
 versionName=629
-debugCode=236
+debugCode=242
 versionCode=169

app_core/common/src/main/java/com/core/base/OABaseActivity.java

@@ -10,7 +10,7 @@ import com.core.utils.ToastUtil;
  * Created by Bitliker on 2017/1/17.
  */
 
-public class OABaseActivity extends BaseActivity implements HttpImp {
+public class OABaseActivity extends SupportToolBarActivity implements HttpImp {
     @Override
     public void showLoading() {
         try {

app_modular/appme/src/main/AndroidManifest.xml

@@ -9,19 +9,27 @@
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
+      
         android:supportsRtl="true">
         <activity
             android:name=".pedometer.view.NewStepActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/set_sport" />
         <activity
             android:name=".pedometer.view.NewStepListActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/sports_recode_more" />
         <activity android:name=".pedometer.view.StepSplashActivity" />
-        <activity android:name=".settings.activity.AboutActivity" />
+        <activity android:name=".settings.activity.AboutActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_about"/>
         <activity android:name=".settings.activity.BaseInfoActivity" />
-        <activity android:name=".settings.activity.BookingSetActivity" />
+        <activity android:name=".settings.activity.BookingSetActivity" 
+            android:label="@string/booking_time_set"
+            android:theme="@style/MainBaseTheme"/>
         <activity
             android:name=".settings.activity.FeedbackActivity"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden">
             <intent-filter>
                 <action android:name="com.modular.main.FeedbackActivity" />
@@ -29,7 +37,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".settings.activity.SelectLanguageActivity" />
+        <activity android:name=".settings.activity.SelectLanguageActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_language"/>
         <activity
             android:name=".settings.activity.SettingActivity"
             android:theme="@style/MainBaseTheme"
@@ -40,6 +50,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".pedometer.view.UURanking"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/ranking">
             <intent-filter>
                 <action android:name="com.modular.appme.UURanking" />
@@ -53,23 +64,29 @@
             android:label="@string/share" />
         <activity
             android:name=".settings.activity.BSettingActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/business_setting" />
         <activity
             android:name=".settings.activity.ImageSettingActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/information_photo" />
         <activity
             android:name=".settings.activity.PersonSettingActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/add_new_people"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".settings.activity.PersonSettingListActivity" />
         <activity
             android:name=".settings.activity.BComSetEmployeeRestActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/set_e_relax" />
         <activity
             android:name=".settings.activity.BComSetCompanyRestActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/set_c_relax" />
         <activity
             android:name=".settings.activity.BSettingLocationActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/set_location" />
         <activity android:name=".settings.activity.BRestActivity" />
         <activity android:name=".settings.activity.BSetComRestListActivity" />
@@ -79,6 +96,7 @@
         <activity android:name=".settings.activity.SigatureActivity" />
         <activity
             android:name=".settings.handwritedemo.LandscapeActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/salary_sign"
             android:screenOrientation="landscape" />
         <activity

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -21,7 +21,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.core.app.Constants;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
@@ -42,7 +42,7 @@ import java.util.TimerTask;
  * Created by FANGlh on 2017/4/13.
  * function:
  */
-public class NewStepActivity extends BaseActivity implements Handler.Callback {
+public class NewStepActivity extends SupportToolBarActivity implements Handler.Callback {
 
     /**
      * 屏幕长度和宽度

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepListActivity.java

@@ -15,7 +15,7 @@ import com.common.data.ListUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.dao.DBManager;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
@@ -34,7 +34,7 @@ import java.util.List;
  * Created by FANGlh on 2017/4/13.
  * function:
  */
-public class NewStepListActivity extends BaseActivity {
+public class NewStepListActivity extends SupportToolBarActivity {
     private UuStepNumAdapter muuStepNumAdapter;
     private StepDataDao stepDataDao;
     private List<StepEntity> stepEntityList;

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -25,7 +25,7 @@ import com.common.data.StringUtil;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.MyListView;
@@ -55,7 +55,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
  * function:
  */
 
-public class UURanking extends BaseActivity implements View.OnClickListener {
+public class UURanking extends SupportToolBarActivity implements View.OnClickListener {
     private CircleImageView mPhotoImg;
     private TextView mNameTv;
     private TextView mRankingTv;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java

@@ -16,7 +16,7 @@ import android.widget.TextView;
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.common.system.SystemUtil;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.IntentUtils;
 import com.core.widget.view.Activity.CommonWebviewActivity;
@@ -28,7 +28,7 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
-public class AboutActivity extends BaseActivity implements View.OnClickListener {
+public class AboutActivity extends SupportToolBarActivity implements View.OnClickListener {
 
     private RelativeLayout me_name;
     private RelativeLayout me_function;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetCompanyRestActivity.java

@@ -21,7 +21,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.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.time.wheel.OASigninPicker;
@@ -42,7 +42,7 @@ import java.util.List;
  * function:
  */
 
-public class BComSetCompanyRestActivity extends BaseActivity implements View.OnClickListener{
+public class BComSetCompanyRestActivity extends SupportToolBarActivity implements View.OnClickListener{
     private MyListView mComList;
     private List<CompanyRestBean> mList;  //进行保存的员工休息数据列表
     private ComRestAdapter myAdapter;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetEmployeeRestActivity.java

@@ -31,7 +31,7 @@ import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
@@ -59,7 +59,7 @@ import static com.common.data.JSONUtil.getJSONArray;
  * function:
  */
 
-public class BComSetEmployeeRestActivity extends BaseActivity implements View.OnClickListener{
+public class BComSetEmployeeRestActivity extends SupportToolBarActivity implements View.OnClickListener{
     private MyListView mComList;
     private List<ComRestBean> mList;  //进行保存的员工休息数据列表
     private ComRestAdapter myAdapter;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -13,7 +13,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
@@ -26,7 +26,7 @@ import com.uas.appme.R;
  * function:
  */
 
-public class BSettingActivity extends BaseActivity implements View.OnClickListener {
+public class BSettingActivity extends SupportToolBarActivity implements View.OnClickListener {
 
     private String sc_industry = null;
     private String sc_industrycode = null;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -40,6 +40,7 @@ import com.common.ui.CameraUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -72,7 +73,7 @@ import java.util.regex.Pattern;
  * function:
  */
 
-public class BSettingLocationActivity extends BaseActivity implements View.OnClickListener{
+public class BSettingLocationActivity extends SupportToolBarActivity implements View.OnClickListener{
     private MyListView mComList;
     private List<BSetLocationBean> mList;  //进行保存的员工休息数据列表
     private BSetLocationAdapter myAdapter;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FeedbackActivity.java

@@ -41,10 +41,10 @@ import com.common.ui.ProgressDialogUtil;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
-import com.core.app.AppConstant;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.UploadFileResult;
 import com.core.net.http.ViewUtil;
 import com.core.net.volley.ObjectResult;
@@ -65,9 +65,9 @@ import com.lidroid.xutils.http.RequestParams;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
-import com.uas.appme.R;
 import com.modular.login.activity.LoginActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appme.R;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -83,7 +83,7 @@ import java.util.regex.Pattern;
  * @author：Arison on 2016/9/27
  * update : FANGlh on 2017-5-23 关于问题反馈上传文字新增字段，发送图片及更新更新附件ID接口
  */
-public class FeedbackActivity extends BaseActivity implements View.OnClickListener {
+public class FeedbackActivity extends SupportToolBarActivity implements View.OnClickListener {
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
     private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
     private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
@@ -216,9 +216,9 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.display_rl).setOnClickListener(this);
 
         if (mType == 0) {
-            getSupportActionBar().setTitle(getString(R.string.send_words));
+          setTitle(getString(R.string.send_words));
         } else {
-            getSupportActionBar().setTitle(getString(R.string.Rated_suggest));
+            setTitle(getString(R.string.Rated_suggest));
         }
         mTextEdit = (EditText) findViewById(R.id.text_edit);
         mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);

app_modular/appme/src/main/java/com/uas/appme/settings/activity/ImageSettingActivity.java

@@ -24,7 +24,7 @@ import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -50,7 +50,7 @@ import java.util.Map;
  * function:
  */
 
-public class ImageSettingActivity extends BaseActivity implements View.OnClickListener{
+public class ImageSettingActivity extends SupportToolBarActivity implements View.OnClickListener{
     private ImageView mImageIm;
     private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -34,7 +34,7 @@ import com.common.ui.ImageUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
@@ -70,9 +70,7 @@ import java.util.Map;
  * Created by FANGlh on 2017/10/10.
  * function:
  */
-
-
-public class PersonSettingActivity extends BaseActivity implements View.OnClickListener{
+public class PersonSettingActivity extends SupportToolBarActivity implements View.OnClickListener{
     private FormEditText mUserNameTv;
     private FormEditText mUserSexTv;
     private RelativeLayout mRySetStartTime;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SelectLanguageActivity.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -17,8 +16,7 @@ import android.widget.TextView;
 
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
-import com.core.base.BaseActivity;
-import com.core.widget.view.EmptyLayout;
+import com.core.base.SupportToolBarActivity;
 import com.core.widget.view.SmoothCheckBox;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -28,14 +26,10 @@ import com.uas.appme.settings.model.Business;
 
 import java.util.ArrayList;
 
-/**
- * @desc:切换语言
- * @author：Arison on 2017/5/11
- */
-public class SelectLanguageActivity extends BaseActivity {
+
+public class SelectLanguageActivity extends SupportToolBarActivity {
 
     private PullToRefreshListView mlist;
-    private EmptyLayout mEmptyLayout;
     private BussinessDetailAdapter mAdapter;
     private ArrayList<Business> mData = new ArrayList<Business>();
     private String currentLanguage;
@@ -73,10 +67,7 @@ public class SelectLanguageActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.set_language));
-
         mlist = (PullToRefreshListView) findViewById(R.id.list_business);
-        mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -84,9 +75,7 @@ public class SelectLanguageActivity extends BaseActivity {
                 BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
                 //ToastMessage();
                 final boolean flag = !mAdapter.getMdata().get(position - 1).isChecked;
-                Log.i(TAG, "onClick:" + position + " check:" + !flag);
                 currentLanguage = holder.tv_business_name.getHint().toString();
-
                 for (Business model : mAdapter.getMdata()) {
                     model.setIsChecked(false);
                 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -142,20 +142,14 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         businessmen_setting_rl = (RelativeLayout) findViewById(R.id.businessmen_setting_rl);
         businessmen_setting_rl.setOnClickListener(this);
         bsettingRed = (TextView) findViewById(R.id.businessmen_setting_new);
-
         if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constants.B_SETTINGRED)) //商家设置红点
             bsettingRed.setVisibility(View.GONE);
-
         new_step_rl.setOnClickListener(this);
-//        new_step_rl.setVisibility(View.GONE);
-
         dialog = new ProgressDialog(this);
         dialog.setIndeterminate(true);
         share_rl = (RelativeLayout) findViewById(R.id.share_rl);
         mExitBtn = (TextView) findViewById(R.id.exit_btn);
-        //share_rl.setVisibility(View.GONE);
         int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.BAIDU_PUSH);
-
         if (isPush == -1) {//第一次进入没有配置
             cb_task_reply.setChecked(true);
         } else if (isPush == 0) {//选择不推送
@@ -184,7 +178,6 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             @Override
             public void onClick(View v) {
                 showExitDialog();
-
             }
         });
         mCacheTv = (TextView) findViewById(R.id.cache_tv);

app_modular/appme/src/main/java/com/uas/appme/settings/handwritedemo/LandscapeActivity.java

@@ -1,17 +1,17 @@
 package com.uas.appme.settings.handwritedemo;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
 
+import com.core.base.SupportToolBarActivity;
 import com.uas.appme.R;
 import com.uas.appme.settings.activity.SigatureActivity;
 import com.uas.appme.settings.activity.WagesDetailsActivity;
 
 import java.io.IOException;
 
-public class LandscapeActivity extends Activity implements View.OnClickListener {
+public class LandscapeActivity extends SupportToolBarActivity implements View.OnClickListener {
    private LinePathView pathView;
     private int signCode;
 

app_modular/apputils/src/main/res/values/style.xml

@@ -19,5 +19,6 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="styleLoadingLayout">@style/LoadingLayoutStyle</item>
         <item name="android:homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
+        <item name="actionMenuTextColor">#ffffff</item>
     </style>
 </resources>

app_modular/appworks/src/main/AndroidManifest.xml

@@ -198,6 +198,7 @@
             android:label="@string/change_mobile" />
         <activity
             android:name=".OA.erp.activity.MissionSetActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/activity_mission_set" />
         <activity
             android:name=".OA.erp.activity.MissionActivity"

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MissionSetActivity.java

@@ -14,7 +14,7 @@ import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.utils.CommonInterface;
 import com.core.widget.view.Activity.SelectActivity;
@@ -24,7 +24,7 @@ import com.uas.appworks.R;
 
 import java.util.ArrayList;
 
-public class MissionSetActivity extends BaseActivity implements View.OnClickListener {
+public class MissionSetActivity extends SupportToolBarActivity implements View.OnClickListener {
     private SwitchView auto_sv;
     private SwitchView needprocess_sv;
     private RelativeLayout distance_rl;