FANGLH 8 سال پیش
والد
کامیت
03cd5c837c

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

@@ -59,7 +59,6 @@ import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.newpedo.view.NewStepActivity;
@@ -536,7 +535,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             super.onPostExecute(result);
             progressDialog.dismiss();
             if (!canceled && result == filesNumber) {
-                ToastUtil.showToast(mContext, R.string.clear_completed);
+//                ToastUtil.showToast(mContext, R.string.clear_completed);
             }
             long cacheSize = FileUtils.getFileSize(rootFile);
             mCacheTv.setText(FileUtils.formatFileSize(cacheSize));

+ 2 - 0
app_modular/appme/build.gradle

@@ -24,6 +24,8 @@ dependencies {
     compile deps.fastjson
     //project
     compile project(':common')
+    compile project(':message')
     compile project(':pullToRefershLibraryMy')
     compile files('libs/ormlite-core-4.48.jar')
+    compile project(path: ':WeiChat')
 }

+ 3 - 0
app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -21,6 +21,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.ui.ViewUtils;
+import com.core.base.BaseActivity;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.calendar.BeforeOrAfterCalendarView;
@@ -29,6 +31,7 @@ import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.service.StepService;
 import com.uas.appme.pedometer.utils.StepCountCheckUtil;
 import com.uas.appme.pedometer.utils.TimeUtil;
+import com.uas.appme.settings.activity.SettingActivity;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;

+ 4 - 0
app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepListActivity.java

@@ -10,6 +10,10 @@ import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.data.ListUtils;
+import com.common.ui.ViewUtils;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.db.StepDataDao;

+ 2 - 0
app_modular/appme/src/main/java/com/uas/appme/pedometer/view/StepSplashActivity.java

@@ -13,6 +13,8 @@ import android.view.animation.ScaleAnimation;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.loopj.android.http.BinaryHttpResponseHandler;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.utils.StepHttpUtils;

+ 591 - 0
app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -0,0 +1,591 @@
+package com.uas.appme.settings.activity;
+
+import android.annotation.TargetApi;
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.common.file.FileUtils;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.DisplayUtil;
+import com.common.ui.ViewUtils;
+import com.core.app.AppConfig;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appme.R;
+
+import java.io.File;
+
+
+/**
+ * 设置
+ */
+public class SettingActivity extends BaseActivity implements View.OnClickListener {
+
+    private Button mExitBtn;
+    private TextView mCacheTv;
+    @ViewInject(R.id.uas_website_tv)
+    private TextView uas_website_tv;
+
+
+    @ViewInject(R.id.tv_menu_setting)
+    private TextView tv_menu_setting;
+
+    @ViewInject(R.id.cb_task_reply)
+    private SwitchView cb_task_reply;
+
+    @ViewInject(R.id.uu_step_rl)
+    private RelativeLayout uu_step_rl;
+
+    @ViewInject(R.id.sign_in_rl)
+    private RelativeLayout sign_in_rl;
+    @ViewInject(R.id.sign_out_rl)
+    private RelativeLayout sign_out_rl;
+
+    @ViewInject(R.id.tv_signauto_new)
+    private TextView tv_signauto_new;
+    @ViewInject(R.id.tv_sign_new)
+    private TextView tv_sign_new;
+    @ViewInject(R.id.tv_language_new)
+    private TextView tv_language_new;
+    @ViewInject(R.id.tv_booking_new)
+    private TextView tv_booking_new;
+
+    @ViewInject(R.id.tv_help_new)
+    private TextView tv_help_new;
+
+
+    @ViewInject(R.id.language_us_rl)
+    private RelativeLayout language_us_rl;
+
+    @ViewInject(R.id.uu_step_im)
+    private ImageView uu_step_im;
+    @ViewInject(R.id.uu_step_reply)
+    private SwitchView uu_step_reply;
+
+    @ViewInject(R.id.rl_app_update)
+    private RelativeLayout rl_app_update;
+    @ViewInject(R.id.version_value)
+    private TextView version_value;
+    @ViewInject(R.id.close_push_rl)
+    private RelativeLayout close_push_rl;
+    @ViewInject(R.id.speech_recognition_rl)
+    private RelativeLayout speech_recognition_rl;
+    @ViewInject(R.id.new_step_rl)
+    private RelativeLayout new_step_rl;
+    @ViewInject(R.id.booking_set_rl)
+    private RelativeLayout booking_set_rl;
+
+    private ProgressDialog dialog;
+    private RelativeLayout share_rl;
+    private String newStep_service_name = "com.xzjmyk.pm.newpedo.service.StepService";
+
+    private PopupWindow setWindow = null;//
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_setting);
+        ViewUtils.inject(this);
+        getSupportActionBar().setTitle(getString(R.string.user_setting));
+        initView();
+
+//        ThreadPool.getThreadPool().addTask(new Runnable() {
+//            @Override
+//            public void run() {
+//
+//                ContactsUtils.testAddContact();
+//            }
+//        });
+
+    }
+
+
+    private void initView() {
+        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 = (Button) findViewById(R.id.exit_btn);
+        //share_rl.setVisibility(View.GONE);
+        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.BAIDU_PUSH);
+
+        if (isPush == -1) {//第一次进入没有配置
+            cb_task_reply.setChecked(true);
+        } else if (isPush == 0) {//选择不推送
+            cb_task_reply.setChecked(false);
+        } else { //选择推送
+            cb_task_reply.setChecked(true);
+        }
+        share_rl.setOnClickListener(this);
+        cb_task_reply.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(View view, boolean isChecked) {
+                if (isChecked) {
+                    PreferenceUtils.putInt(MainActivity.BAIDU_PUSH, 1);
+                    PushManager.resumeWork(MyApplication.getInstance());
+                } else {
+                    PushManager.stopWork(MyApplication.getInstance());
+                    PreferenceUtils.putInt(MainActivity.BAIDU_PUSH, 0);
+                }
+            }
+        });
+
+        rl_app_update.setOnClickListener(this);
+        close_push_rl.setOnClickListener(this);
+        version_value.setText(CommonUtil.ApkVersionCode(this));
+        mExitBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showExitDialog();
+
+            }
+        });
+        mCacheTv = (TextView) findViewById(R.id.cache_tv);
+        findViewById(R.id.clear_cache_rl).setOnClickListener(this);
+        findViewById(R.id.use_help_rl).setOnClickListener(this);
+        findViewById(R.id.about_us_rl).setOnClickListener(this);
+        long cacheSize = FileUtils.getFileSize(new File(MyApplication.getInstance().mAppDir));
+        mCacheTv.setText(FileUtils.formatFileSize(cacheSize));
+        uas_website_tv.setText(CommonUtil.getSharedPreferences(this, "erp_baseurl"));
+
+
+        //UU开关的 根据StepService是否开启显示状态
+        int isStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
+        if (isServiceRunning(newStep_service_name) && (isStep == -1 || isStep == 1)) {
+            uu_step_reply.setChecked(true);
+        } else {
+            speech_recognition_rl.setVisibility(View.GONE);
+            uu_step_reply.setChecked(false);
+        }
+
+        uu_step_reply.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(View view, boolean isChecked) {
+                tv_menu_setting.setVisibility(View.GONE);
+                CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
+                if (isChecked) {
+                    PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
+//                    PushManager.resumeWork(MyApplication.getInstance());
+//
+                    startActivity(new Intent(mContext, StepSplashActivity.class));
+                } else {
+//                    PushManager.stopWork(MyApplication.getInstance());
+                    PreferenceUtils.putInt(MainActivity.UU_STEP, 0);
+//                    stopService(intent);
+                    Toast.makeText(mContext, getString(R.string.set_close_step_notice1), Toast.LENGTH_LONG).show();
+                    speech_recognition_rl.setVisibility(View.GONE);
+                }
+            }
+        });
+        uu_step_rl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                tv_menu_setting.setVisibility(View.GONE);
+                CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
+                int last_isStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
+                if (isServiceRunning(newStep_service_name) && last_isStep == 1) {
+                    startActivity(new Intent(mContext, NewStepActivity.class));
+                } else {
+                    Toast.makeText(mContext, getString(R.string.set_close_step_notice2), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        new_step_rl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                tv_menu_setting.setVisibility(View.GONE);
+                CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
+                startActivity(new Intent(mContext, NewStepActivity.class));
+            }
+        });
+
+        booking_set_rl.setOnClickListener(this);
+
+        tv_menu_setting.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.NEW_UURUN, false) ? View.GONE : View.VISIBLE);
+        tv_signauto_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_AUTO, false) ? View.GONE : View.VISIBLE);
+        tv_sign_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_IN, false) ? View.GONE : View.VISIBLE);
+        tv_language_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_LANGUAGE, false) ? View.GONE : View.VISIBLE);
+        tv_booking_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_BOOKING_TIME, false) ? View.GONE : View.VISIBLE);
+        tv_help_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_CALL, false) ? View.GONE : View.VISIBLE);
+
+        speech_recognition_rl.setOnClickListener(this);
+        sign_in_rl.setOnClickListener(this);
+        sign_out_rl.setOnClickListener(this);
+        language_us_rl.setOnClickListener(this);
+
+        if (ApiUtils.getApiModel() instanceof ApiPlatform) {
+            language_us_rl.setVisibility(View.GONE);
+        } else {
+            language_us_rl.setVisibility(View.VISIBLE);
+        }
+        UserRoleUtils.checkUserRole(this,getRootView());
+    }
+
+    private boolean isServiceRunning(String servicename) { // 判断某个服务是否已经运行
+        ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (servicename.equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            startActivity(new Intent(mContext, MainActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        startActivity(new Intent(mContext, MainActivity.class));
+        super.onBackPressed();
+    }
+
+    private void showExitDialog() {
+        new AlertDialog.Builder(mContext).setTitle(R.string.app_name).setMessage(R.string.exit_tips).setNegativeButton(R.string.common_cancel, null)
+                .setPositiveButton(R.string.common_sure, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        UserSp.getInstance(mContext).clearUserInfo();
+                        ViewUtil.clearAccount(mContext);
+                        LoginHelper.broadcastLogout(mContext);
+                        SettingActivity.this.finish();
+                        String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+                        String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_Exit);
+                        if (!TextUtils.isEmpty(saved_time)) {
+                            PreferenceUtils.putString(TimeStatisticsActivity.Login_Exit, saved_time + "," + nowtime);
+                        } else {
+                            PreferenceUtils.putString(TimeStatisticsActivity.Login_Exit, nowtime);
+                        }
+
+                    }
+                }).create().show();
+    }
+
+    private void save(String login_exit_time) throws Exception {
+        InAndExitTimeEntity bean = new InAndExitTimeEntity();
+        bean.setLoginin_time(login_exit_time);
+        InAndExitTimeDao.getInstance().insert(bean);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.booking_set_rl:
+                startActivity(new Intent(this, BookingSetActivity.class));
+                CommonUtil.setSharedPreferences(this, Constants.SET_BOOKING_TIME, true);
+                tv_booking_new.setVisibility(View.GONE);
+                break;
+            case R.id.language_us_rl:
+                startActivity(new Intent(this, SelectLanguageActivity.class));
+                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_LANGUAGE, true);
+                tv_language_new.setVisibility(View.GONE);
+                break;
+            case R.id.sign_in_rl:
+                showPopupWindow();
+                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_IN, true);
+                tv_sign_new.setVisibility(View.GONE);
+                break;
+            case R.id.sign_out_rl:
+                Intent intent = new Intent(mContext, MissionSetActivity.class);
+                intent.putExtra(AppConfig.IS_ADMIN, PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false));
+                startActivity(intent);
+                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_AUTO, true);
+                tv_signauto_new.setVisibility(View.GONE);
+                break;
+            case R.id.speech_recognition_rl:
+                startActivity(new Intent(mContext, SpeechrecognitionActivity.class));
+                break;
+            case R.id.close_push_rl:
+                break;
+            case R.id.clear_cache_rl:
+                showclearDialog();
+                break;
+            case R.id.use_help_rl: {
+                CommonUtil.setSharedPreferences(this, Constants.SET_CALL, true);
+                tv_help_new.setVisibility(View.GONE);
+                intent = new Intent(mContext, FeedbackActivity.class);
+                intent.putExtra("type", 1);
+                intent.putExtra(WebViewActivity.EXTRA_URL, mConfig.help_url);
+                intent.putExtra(WebViewActivity.EXTRA_TITLE, getString(R.string.use_help));
+                startActivity(intent);
+            }
+            break;
+            case R.id.about_us_rl:// 关于我们
+                startActivity(new Intent(mContext, AboutActivity.class));
+
+                break;
+            case R.id.share_rl:
+                share();
+                break;
+            case R.id.rl_app_update:
+                dialog.setMessage(getString(R.string.set_check_update_wait));
+                dialog.show();
+                BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
+                    @Override
+                    public void onCheckComplete() {
+                        BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
+                                new CPCheckUpdateCallback() {
+
+                                    @Override
+                                    public void onCheckUpdateCallback(
+                                            AppUpdateInfo info,
+                                            AppUpdateInfoForInstall infoForInstall) {
+                                        if (infoForInstall != null
+                                                && !TextUtils
+                                                .isEmpty(infoForInstall
+                                                        .getInstallPath())) {
+                                        } else if (info != null) {
+                                        } else {
+                                            ViewUtil.ShowMessageTitle(
+                                                    SettingActivity.this,
+                                                    getString(R.string.set_isnewVersion));
+                                        }
+                                        dialog.dismiss();
+                                    }
+                                });
+                    }
+                });
+
+                break;
+            case R.id.super_setting_tv:
+                startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
+                closePopupWindow();
+                break;
+            case R.id.work_setting_tv:
+                intent = new Intent(mContext, FlightsActivity.class);
+                startActivityForResult(intent, 0x12);
+                closePopupWindow();
+                break;
+            case R.id.office_addr_setting_tv:
+                startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
+                closePopupWindow();
+                break;
+            case R.id.my_rule_setting_tv:
+                intent = new Intent(mContext, MyRuleSetActivity.class);
+//                presenter.showMyRele(intent, adapter.getModels());
+                startActivity(intent);
+                closePopupWindow();
+                break;
+            case R.id.cancel_tv:
+                closePopupWindow();
+                break;
+        }
+    }
+
+    private void share() {
+        shareSingleImage();
+    }
+
+    //分享单张图片
+    public void shareSingleImage() {
+        Uri imageUri = Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/" + R.drawable.ic_uu_scan_code);
+        Intent shareIntent = new Intent();
+        shareIntent.setAction(Intent.ACTION_SEND);
+        shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri);
+        shareIntent.setType("image/*");
+        startActivity(Intent.createChooser(shareIntent, getString(R.string.set_share_to)));
+    }
+
+    //确认是否清空本地缓存
+    private void showclearDialog() {
+        new AlertDialog
+                .Builder(mContext)
+                .setTitle(getString(R.string.common_notice))
+                .setMessage(getString(R.string.cache_msg))
+                .setNegativeButton(getString(R.string.common_cancel), null)
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        clearCache();
+                        Log.i("clearCache", "clearCache");
+                    }
+                }).create().show();
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    private void clearCache() {
+        String filePath = MyApplication.getInstance().mAppDir;
+        //删除文件
+        VideoFileDao.getInstance().deleteAllVideoFile(
+                VideoFileDao.getInstance().getVideoFiles(
+                        MyApplication.getInstance().mLoginUser.getUserId()));
+        if (Build.VERSION.SDK_INT >= 11)
+            new ClearCacheAsyncTaska(filePath).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, true);
+        else
+            new ClearCacheAsyncTaska(filePath).execute(true);
+    }
+
+    private class ClearCacheAsyncTaska extends AsyncTask<Boolean, String, Integer> {
+        private File rootFile;
+        private ProgressDialog progressDialog;
+        private int filesNumber = 0;
+        private boolean canceled = false;
+
+        public ClearCacheAsyncTaska(String filePath) {
+            this.rootFile = new File(filePath);
+        }
+
+        @Override
+        protected void onPreExecute() {
+            filesNumber = FileUtils.getFolderSubFilesNumber(rootFile);
+            progressDialog = new ProgressDialog(mContext);
+            progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+            progressDialog.setIndeterminate(false);
+            progressDialog.setCancelable(false);
+            progressDialog.setMessage(getString(R.string.deleteing));
+            progressDialog.setMax(filesNumber);
+            progressDialog.setProgress(0);
+            // 设置取消按钮
+            progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int i) {
+                    canceled = true;
+                }
+            });
+            progressDialog.show();
+        }
+
+        /**
+         * 返回true代表删除完成,false表示取消了删除
+         */
+        @Override
+        protected Integer doInBackground(Boolean... params) {
+            if (filesNumber == 0) {
+                return 0;
+            }
+            Log.i("gongpengming", "doInBackground");
+            boolean deleteSubFolder = params[0];// 是否删除已清空的子文件夹
+            return deleteFolder(rootFile, true, deleteSubFolder, 0);
+        }
+
+        @Override
+        protected void onProgressUpdate(String... values) {
+            super.onProgressUpdate(values);
+            // String filePath = values[0];
+            int progress = Integer.parseInt(values[1]);
+            // progressDialog.setMessage(filePath);
+            progressDialog.setProgress(progress);
+        }
+
+        @Override
+        protected void onPostExecute(Integer result) {
+            super.onPostExecute(result);
+            progressDialog.dismiss();
+            if (!canceled && result == filesNumber) {
+                ToastUtil.showToast(mContext, R.string.clear_completed);
+            }
+            long cacheSize = FileUtils.getFileSize(rootFile);
+            mCacheTv.setText(FileUtils.formatFileSize(cacheSize));
+        }
+
+        private long notifyTime = 0;
+
+        /**
+         * 是否删除完毕
+         *
+         * @param file
+         * @param deleteSubFolder
+         * @return
+         */
+        private int deleteFolder(File file, boolean rootFolder, boolean deleteSubFolder, int progress) {
+            if (file == null || !file.exists() || !file.isDirectory()) {
+                return 0;
+            }
+            File flist[] = file.listFiles();
+            for (File subFile : flist) {
+                if (canceled) {
+                    return progress;
+                }
+                if (subFile.isFile()) {
+                    subFile.delete();
+                    progress++;
+                    long current = System.currentTimeMillis();
+                    if (current - notifyTime > 200) {// 200毫秒更新一次界面
+                        notifyTime = current;
+                        publishProgress(subFile.getAbsolutePath(), String.valueOf(progress));
+                    }
+                } else {
+                    progress = deleteFolder(subFile, false, deleteSubFolder, progress);
+                    if (deleteSubFolder) {
+                        subFile.delete();
+                    }
+                }
+            }
+            return progress;
+        }
+    }
+
+    private void showPopupWindow() {
+        if (setWindow == null) initPopupWindow();
+        setWindow.showAtLocation(getWindow().getDecorView().
+                findViewById(android.R.id.content), Gravity.BOTTOM, 0, 0);
+        DisplayUtil.backgroundAlpha(this, 0.4f);
+    }
+
+    private void initPopupWindow() {
+        View viewContext = LayoutInflater.from(mContext).inflate(R.layout.pop_work_activity, null);
+        if (!PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
+            viewContext.findViewById(R.id.super_setting_tv).setVisibility(View.GONE);
+            viewContext.findViewById(R.id.work_setting_tv).setVisibility(View.GONE);
+            viewContext.findViewById(R.id.office_addr_setting_tv).setVisibility(View.GONE);
+        } else {
+            viewContext.findViewById(R.id.super_setting_tv).setOnClickListener(this);
+            viewContext.findViewById(R.id.work_setting_tv).setOnClickListener(this);
+            viewContext.findViewById(R.id.office_addr_setting_tv).setOnClickListener(this);
+        }
+        viewContext.findViewById(R.id.my_rule_setting_tv).setOnClickListener(this);
+        viewContext.findViewById(R.id.cancel_tv).setOnClickListener(this);
+        setWindow = new PopupWindow(viewContext,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        setWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        setWindow.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.bg_popuwin));
+        setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closePopupWindow();
+            }
+        });
+    }
+
+    private void closePopupWindow() {
+        if (setWindow != null)
+            setWindow.dismiss();
+        DisplayUtil.backgroundAlpha(this, 1f);
+    }
+}

+ 24 - 0
app_modular/appme/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>

+ 8 - 0
app_modular/appme/src/main/res/drawable/selector_me_menu_item_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="@color/me_menu_item_press" android:state_checked="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
+
+    <item android:drawable="@color/me_menu_item_normal"/>
+</selector>

+ 528 - 0
app_modular/appme/src/main/res/layout/activity_setting.xml

@@ -0,0 +1,528 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="none"
+        android:paddingLeft="5dp"
+        android:paddingRight="10dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+            <!--公司-->
+            <RelativeLayout
+                android:id="@+id/rl_uas_website"
+                style="@style/IMTbleLine"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/uas_website_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/uas_website_address"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/uas_website_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/uas_website_arrow_img"
+                    android:layout_toRightOf="@+id/uas_website_text"
+                    android:textColor="@color/dark_dark_grey"
+                    android:textSize="12sp" />
+
+                <ImageView
+                    android:id="@+id/uas_website_arrow_img"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/speech_recognition_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="语音识别"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/new_step_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="gone">
+
+                <View
+                    android:id="@+id/view2"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
+                    android:background="@color/item_line" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="计步助手"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/uu_step_rl"
+                style="@style/IMTbleLine1"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="visible">
+
+                <View
+                    android:id="@+id/view3"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+
+                <TextView
+                    android:id="@+id/uu_step_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_sport"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:id="@+id/uu_step_im"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toRightOf="@+id/uu_step_text"
+                    android:src="@drawable/uu_step"
+                    android:visibility="gone" />
+
+                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                    android:id="@+id/uu_step_reply"
+                    android:layout_width="40dp"
+                    android:layout_height="25dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true" />
+
+                <TextView
+                    android:id="@+id/tv_menu_setting"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="5dp"
+                    android:layout_toLeftOf="@id/uu_step_reply"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+
+            </RelativeLayout>
+
+            <!--设置关闭推送-->
+            <RelativeLayout
+                android:id="@+id/close_push_rl"
+                style="@style/IMTbleLine1"
+                android:background="@drawable/selector_me_menu_item_bg">
+
+                <View
+                    android:id="@+id/view4"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+
+                <TextView
+                    android:id="@+id/push_setting_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_push"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                    android:id="@+id/cb_task_reply"
+                    android:layout_width="40dp"
+                    android:layout_height="25dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/sign_in_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_sigin"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+                <TextView
+                    android:id="@+id/tv_sign_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/sign_out_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/activity_mission_set"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+                <TextView
+                    android:id="@+id/tv_signauto_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_alignTop="@+id/tv_oa"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/booking_set_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/booking_time_set"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+                <TextView
+                    android:id="@+id/tv_booking_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+            </RelativeLayout>
+            <!--清除缓存-->
+
+            <RelativeLayout
+                android:id="@+id/clear_cache_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:id="@+id/cache_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_clear"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/cache_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/cache_arrow_img"
+                    android:layout_toRightOf="@+id/cache_text"
+                    android:textColor="@color/dark_dark_grey" />
+
+                <ImageView
+                    android:id="@+id/cache_arrow_img"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/use_help_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/Rated_suggest"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/tv_help_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+          
+            <RelativeLayout
+                android:id="@+id/language_us_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_language"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/tv_language_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+            
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:background="@color/item_line" />
+            <RelativeLayout
+
+                android:id="@+id/about_us_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_about"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/share_rl"
+                style="@style/IMTbleLine"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text=" 分    享"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:id="@+id/rl_app_update"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:clickable="true">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:id="@+id/version_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/set_version"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/version_value"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/version_arrow_img"
+                    android:layout_toRightOf="@+id/version_text"
+                    android:textColor="@color/dark_dark_grey" />
+
+                <ImageView
+                    android:id="@+id/version_arrow_img"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <Button
+                android:id="@+id/exit_btn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="50dp"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="@string/set_login_out"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>

+ 66 - 0
app_modular/appme/src/main/res/layout/newstep_data.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/for_dyy">
+    <LinearLayout
+        android:id="@+id/steps_history_ll"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
+        android:orientation="horizontal">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/uustephistory"/>
+
+        <TextView
+            android:id="@+id/steps_history_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/sports_recode_more"
+            android:textColor="#288af8"
+            android:textSize="16sp"
+            android:layout_marginLeft="10dp"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/step_em_ll"
+        android:layout_marginTop="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginLeft="50dp">
+        <com.xzjmyk.pm.activity.ui.erp.view.CircleImageView
+            android:id="@+id/step_photo_im"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/common_header_boy"/>
+        <TextView
+            android:id="@+id/step_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="名字"
+            android:layout_marginLeft="10dp"
+           android:layout_gravity="center_vertical"/>
+    </LinearLayout>
+    <ScrollView
+        android:layout_marginLeft="35dp"
+        android:layout_marginRight="35dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
+        <com.xzjmyk.pm.activity.view.MyListView
+            android:id="@+id/step_num_lv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/selector_me_menu_item_bg">
+        </com.xzjmyk.pm.activity.view.MyListView>
+    </ScrollView>
+</LinearLayout>

+ 14 - 0
app_modular/appme/src/main/res/values/dimens.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <dimen name="next_height">15.0dip</dimen>
+    <dimen name="next_width">10.0dip</dimen>
+    <dimen name="line">1px</dimen>
+    <dimen name="line_big">7.0dip</dimen>
+    <dimen name="line_min">2.0dip</dimen>
+    <dimen name="item_height_edit">100.0dip</dimen>
+    <dimen name="item_height">60.0dip</dimen>
+    <dimen name="item_height_min">45.0dip</dimen>
+    <dimen name="item_me_height">80.0dip</dimen>
+    <dimen name="text_main">16.0sp</dimen>
+</resources>

+ 29 - 0
app_modular/appme/src/main/res/values/styles.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="IMTbleLine">
+        <item name="android:background">@color/item_color1</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:paddingLeft">9dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
+    <style name="IMTbleLine_TextValue">
+        <item name="android:textColorHint">@color/grey</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:gravity">right</item>
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_centerVertical">true</item>
+    </style>
+    <style name="IMTbleLine1">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:paddingLeft">9dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
+</resources>