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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -41,6 +41,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
+import com.uas.appme.settings.activity.CheckWagesActivity;
 import com.uas.appme.settings.activity.SettingActivity;
 import com.uas.appme.settings.activity.SigatureActivity;
 import com.uas.appme.widget.MasterDialog;
@@ -372,6 +373,14 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 
             }
         });
+        picture_selector_rl.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+
+                startActivity(new Intent(ct, CheckWagesActivity.class));
+                return true;
+            }
+        });
 
     }
 

app_core/common/src/main/java/com/core/dao/StepRankingFirstDao.java

@@ -112,6 +112,7 @@ public class StepRankingFirstDao {
         ContentValues values = new ContentValues();
         try {
             stepDb.beginTransaction();
+            values.put("_id",bean.get_id());
             values.put("my_userid",bean.getMy_userid());
             values.put("my_rank",bean.getMy_rank());
             values.put("my_steps",bean.getMy_steps());

app_modular/applogin/src/main/java/com/modular/login/activity/PersonalRegActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -158,6 +159,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
         @Override
         public void handleMessage(Message msg) {
             String result = msg.getData().getString("result");
+            Log.i("fanglh",result);
             switch (msg.what) {
                 case 0x01:
                     if (!StringUtil.isEmpty(result)) {

app_modular/appme/src/main/AndroidManifest.xml

@@ -70,5 +70,10 @@
             android:label="签名"
             android:screenOrientation="landscape"
             />
+        <activity android:name=".settings.activity.CheckWagesActivity"
+            android:windowSoftInputMode="stateUnspecified|adjustNothing"
+            />
+        <activity android:name=".settings.activity.WagesDetailsActivity"
+            />
     </application>
 </manifest>

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

@@ -19,7 +19,10 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.config.BaseConfig;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
@@ -32,6 +35,7 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.MyListView;
 import com.core.widget.view.Activity.SelectActivity;
@@ -48,6 +52,8 @@ import com.uas.appme.settings.model.PersonSetingBean;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.common.data.JSONUtil.getJSONArray;
+
 /**
  * Created by FANGlh on 2017/10/12.
  * function:
@@ -60,13 +66,15 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     private String current_date;
     private List<String> serviceMans;
     private int click_positon;
+    private ArrayList<SelectBean> selectBeens;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
         initView();
-        initData();
+        loadServiceMan();
+//        initData();
     }
 
     private void initData() {
@@ -138,7 +146,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         model.setSf_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
         model.setSf_username("");
         model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
-        model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());
+        model.setSf_userid("");
         model.setSf_date("");
         mList.add(model);
         myAdapter.notifyDataSetChanged();
@@ -156,7 +164,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             model.setSf_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSf_username("");
             model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
-            model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());
+            model.setSf_userid("");
             model.setSf_date("");
             mList.add(model);
             myAdapter.notifyDataSetChanged();
@@ -284,11 +292,16 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                 @Override
                 public void onClick(View v) {
                     click_positon = position;
-                    if (ListUtils.isEmpty(serviceMans)) {
+                    if (ListUtils.isEmpty(selectBeens)) {
                         doInputName(position);
-                    }
-                    else{
-                        ArrayList<SelectBean> beans = new ArrayList<>();
+                    } else{
+                            Intent intent = new Intent(ct, SelectActivity.class)
+                                    .putExtra("type", 2)
+                                    .putExtra("title", "选择人员")
+                                    .putParcelableArrayListExtra("data", selectBeens);
+                            startActivityForResult(intent, 0x02);
+
+                       /* ArrayList<SelectBean> beans = new ArrayList<>();
                         SelectBean bean = null;
                         for (String e : serviceMans) {
                             bean = new SelectBean();
@@ -300,7 +313,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                         intent.putExtra("type", 2);
                         intent.putParcelableArrayListExtra("data", beans);
                         intent.putExtra("title", "人员选择");
-                        startActivityForResult(intent, 0x01);
+                        startActivityForResult(intent, 0x01);*/
                     }
                 }
             });
@@ -319,7 +332,50 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             TextView date_tv;
         }
     }
+    //load 选择服务人员
+    private String companyid;
+    public void loadServiceMan() {
+        progressDialog.show();
+        new HttpClient.Builder(Constants.IM_BASE_URL())
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("/user/appStoreman")
+                        .add("companyid", StringUtil.isEmpty(companyid) ? CommonUtil.getSharedPreferences(ct, "erp_uu") : companyid)
+                        .add("serviceid", "0")
+                        .add("token", MyApplication.getInstance().mAccessToken)
+                        .method(Method.GET)
+                        .build(), new ResultSubscriber<>(new ResultListener<Object>() {
+                    @Override
+                    public void onResponse(Object o) {
+                        LogUtil.prinlnLongMsg("appStoreman", o.toString()+"");
+                        if (JSONUtil.validateJSONObject(o.toString())) {
+                            JSONArray array = getJSONArray(o.toString(), "result");
+                            SelectBean bean = null;
+                            selectBeens = new ArrayList<SelectBean>();
+
+                            if (!ListUtils.isEmpty(array)) {
+                                for (int i = 0; i < array.size(); i++) {
+                                    JSONObject object = array.getJSONObject(i);
+                                    bean = new SelectBean();
+                                    int id = JSONUtil.getInt(object, "sm_id");
+                                    String name = JSONUtil.getText(object, "sm_username");
+                                    bean.setId(id);
+                                    bean.setFields(String.valueOf(id));
+                                    bean.setName(name);
+                                    bean.setJson(object.toJSONString());
+                                    selectBeens.add(bean);
+                                }
+                            } else {
+                                ToastUtil.showToast(ct, "当前公司还没有设置员工");
+                            }
 
+                        }
+                        progressDialog.dismiss();
+                    }
+                }));
+    }
     private PopupWindow popupWindow = null;
     private void doInputName(final int position) {
         // 一个自定义的布局，作为显示的内容
@@ -398,18 +454,23 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (data == null) return;
-        if (resultCode == 0x20) {
-            SelectBean b = data.getParcelableExtra("data");
-            if (b == null) return;
-            String name = StringUtil.isEmpty(b.getName()) ? "" : b.getName();
-            if (requestCode == 0x01) {
-              mList.get(click_positon).setSf_username(name);
-              myAdapter.notifyDataSetChanged();
+        if (data != null && 0x02 == requestCode) {
+            SelectBean bean = data.getParcelableExtra("data");
+            if (bean != null) {
+                String json = bean.getJson();
+                if (JSONUtil.validateJSONObject(json)) {
+                    JSONObject object = JSON.parseObject(json);
+                    LogUtil.prinlnLongMsg("fanglh1",JSON.toJSONString(object));
+                    if (object != null) {
+                        mList.get(click_positon).setSf_username(JSONUtil.getText(object, "sm_username"));
+                        mList.get(click_positon).setSf_userid(JSONUtil.getText(object, "sm_userid"));
+                        myAdapter.notifyDataSetChanged();
+                    }
+                    LogUtil.prinlnLongMsg("fanglh2",JSON.toJSONString(mList));
+                }
             }
         }
     }
-
     private void doSelectEndDate(final int pos) {
         OASigninPicker picker = new OASigninPicker(this);
         picker.setRange(CalendarUtil.getYear()+1, CalendarUtil.getMonth(), CalendarUtil.getDay());

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

@@ -0,0 +1,83 @@
+package com.uas.appme.settings.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.andreabaccega.widget.FormEditText;
+import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
+import com.core.base.BaseActivity;
+import com.core.utils.time.wheel.DatePicker;
+import com.uas.appme.R;
+
+import java.util.Calendar;
+
+/**
+ * Created by FANGlh on 2017/11/10.
+ * function:
+ */
+
+public class CheckWagesActivity extends BaseActivity implements View.OnClickListener {
+    private TextView mWagesDate;
+    private FormEditText mWagesPhoneEt;
+    private FormEditText mWagesPasswordEt;
+    private FormEditText mWagesCodeEt;
+    private Button mWagesCodeBtn;
+    private Button mCheckBtn;
+    private String myearmonth = DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMM");//默认当前月
+    private String checkYear;
+    private String checkMonth;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+    }
+
+    private void initView() {
+        setContentView(R.layout.check_wages_activity);
+        getSupportActionBar().setTitle("工资条查询");
+
+        mWagesDate = (TextView) findViewById(R.id.wages_date);
+        mWagesPhoneEt = (FormEditText) findViewById(R.id.wages_phone_et);
+        mWagesPasswordEt = (FormEditText) findViewById(R.id.wages_password_et);
+        mWagesCodeEt = (FormEditText) findViewById(R.id.wages_code_et);
+        mWagesCodeBtn = (Button) findViewById(R.id.wages_code_btn);
+        mCheckBtn = (Button) findViewById(R.id.check_btn);
+
+        mWagesDate.setOnClickListener(this);
+        mWagesCodeBtn.setOnClickListener(this);
+        mCheckBtn.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+       int id =  v.getId();
+        if (id == R.id.wages_date){
+            DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH);
+            picker.setRange(2016, 2017);
+            picker.setSelectedItem(
+                    Calendar.getInstance().get(Calendar.YEAR),
+                    Calendar.getInstance().get(Calendar.MONTH) + 1);
+            picker.setOnDatePickListener(new DatePicker.OnYearMonthPickListener() {
+                @Override
+                public void onDatePicked(String year, String month) {
+                    myearmonth =  year + "年" + month+"月";
+                    checkYear = year;
+                    checkMonth = month;
+                    mWagesDate.setText(myearmonth);
+                }
+            });
+            picker.show();
+        }else if (id == R.id.wages_code_btn){
+
+        }else if (id == R.id.check_btn){
+            startActivity(new Intent(this,WagesDetailsActivity.class)
+            .putExtra("checkYear",checkYear)
+            .putExtra("checkMonth",checkMonth));
+        }
+    }
+}

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

@@ -95,6 +95,8 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     private String photoselect=null;
     private ProgressDialog mProgressDialog;
     private Boolean updateChangeP = false; //更新是否更换了头像，若没换
+    private String imid;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -430,7 +432,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     if (!JSONUtil.validate(o.toString()) || o == null) return;
                     if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")){
                         if (o.toString().contains("imid")){
-                            String imid = JSON.parseObject(o.toString()).getString("imid");
+                            imid = JSON.parseObject(o.toString()).getString("imid");
                             if (StringUtil.isEmpty(imid)) {
                                ToastMessage("imid获取失败，请稍后再试");
                                 return;
@@ -457,6 +459,50 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     }
 
     private void jumpTo() {
+        /*Map<String,Object> formStoreMap = new HashMap<>();
+        formStoreMap.put("userName",mUserNameTv.getText().toString());
+        formStoreMap.put("userSex","男".equals(mUserSexTv.getText().toString()) ? "M" : "F");
+        formStoreMap.put("userTel",mUserTelTv.getText().toString());
+        formStoreMap.put("userEmail",mUserEmailTv.getText().toString());
+
+        HttpClient httpClient =
+//                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+                new HttpClient.Builder("http://uas.ubtob.com/")
+                        .isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("mobile/adduser/user")
+                .add("formStore", JSONUtil.map2JSON(formStoreMap))
+                .add("dept",mUserDepartmentEv.getText().toString())
+                .add("role",mUserJobTv.getText().toString())
+                .add("enuu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
+                .add("emcode",imid)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                Log.d("fanglh",o.toString());
+                try {
+                    if (!StringUtil.isEmpty(o.toString()) && JSON.parseObject(o.toString()).containsKey("success") &&
+                            "人员添加成功".equals(JSON.parseObject(o.toString()).getString("success"))){
+                        if (!StringUtil.isEmpty(sm_id)){
+                            Toast.makeText(ct,getString(R.string.update_success),Toast.LENGTH_LONG).show();
+                            setResult(20);
+                        }else {
+                            Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                            startActivity(new Intent(PersonSettingActivity.this,PersonSettingListActivity.class)
+                                    .putExtra("sc_industry",sc_industry)
+                                    .putExtra("sc_industrycode",sc_industrycode));
+                        }
+                        finish();
+                    }else{
+
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }));*/
+
         if (!StringUtil.isEmpty(sm_id)){
             Toast.makeText(ct,getString(R.string.update_success),Toast.LENGTH_LONG).show();
             setResult(20);

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

@@ -40,13 +40,15 @@ public class SigatureActivity extends BaseActivity implements View.OnClickListen
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.btn2){
-            startActivityForResult(new Intent(this, LandscapeActivity.class), 101);
+            startActivityForResult(new Intent(this, LandscapeActivity.class)
+                            .putExtra("signCode",002)
+                    , 101);
         }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if(resultCode==101){
+        if(resultCode==101 && requestCode == 101){
             BitmapFactory.Options options = new BitmapFactory.Options();
             options.inSampleSize = 2;
             Bitmap bm = BitmapFactory.decodeFile(path1, options);

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

@@ -0,0 +1,142 @@
+package com.uas.appme.settings.activity;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.Toast;
+
+import com.common.system.DisplayUtil;
+import com.core.base.BaseActivity;
+import com.core.widget.MyListView;
+import com.uas.appme.R;
+import com.uas.appme.settings.handwritedemo.LinePathView;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Created by FANGlh on 2017/11/10.
+ * function:
+ */
+public class WagesDetailsActivity extends BaseActivity implements View.OnClickListener {
+    private String checkYear;
+    private String checkMonth;
+    private MyListView mWagesLv;
+    private Button mBtnSignature;
+    private PopupWindow setWindow = null;//
+    private LinePathView pathView;
+    public static String plainpath= Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "sign.png";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.wages_details_activity);
+        initView();
+        initData();
+
+    }
+
+    private void initData() {
+
+    }
+
+    private void initView() {
+        checkYear = getIntent().getStringExtra("checkYear");
+        checkMonth = getIntent().getStringExtra("checkMonth");
+        String title = checkYear + "年" + checkMonth + "月"+"工资";
+        getSupportActionBar().setTitle(title);
+
+        mWagesLv = (MyListView) findViewById(R.id.wages_lv);
+        mBtnSignature = (Button) findViewById(R.id.btn_signature); mBtnSignature.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.btn_signature){
+            showSiganWindow();
+        }else if (v.getId() == R.id.clear_im){
+            pathView.clear();
+        }else if (v.getId() == R.id.cancel_tv){
+            pathView.clear();
+            closePopupWindow();
+        }
+        /*else if (v.getId() == R.id.hscreen_btn){
+            startActivityForResult(new Intent(this, LandscapeActivity.class)
+                    .putExtra("signCode",001)
+                    , 101);
+        }*/
+        else if (v.getId() == R.id.submit_btn){
+            if (pathView.getTouched())
+            {
+                try {
+                    pathView.save(plainpath,false,10);  //将图片路径保存到plainpath中，并获取Bimap对象
+                    BitmapFactory.Options options = new BitmapFactory.Options();
+                    options.inSampleSize = 2;
+                    Bitmap pathBm = BitmapFactory.decodeFile(plainpath, options);
+                    doSubmit(pathBm);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }else {
+                Toast.makeText(this,"您没有签名~", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    /*  @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+         if(requestCode==101 && resultCode == 102){
+             BitmapFactory.Options options = new BitmapFactory.Options();
+             options.inSampleSize = 2;
+             Bitmap pathBm = BitmapFactory.decodeFile(plainpath, options);
+         }
+
+     }*/
+    private void doSubmit(Bitmap pathBm) {
+        Log.i("fanglh",plainpath+","+pathBm);
+    }
+
+    private void showSiganWindow() {
+        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(ct).inflate(R.layout.sigature_pop, null);
+
+        viewContext.findViewById(R.id.submit_btn).setOnClickListener(this);
+        viewContext.findViewById(R.id.clear_im).setOnClickListener(this);
+        viewContext.findViewById(R.id.cancel_tv).setOnClickListener(this);
+//        viewContext.findViewById(R.id.hscreen_btn).setOnClickListener(this);
+
+        pathView = (LinePathView) viewContext.findViewById(R.id.sigature_view);
+        pathView.setPaintWidth(5);
+
+        setWindow = new PopupWindow(viewContext,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        setWindow.setAnimationStyle(com.uas.appworks.R.style.MenuAnimationFade);
+        setWindow.setBackgroundDrawable(mContext.getResources().getDrawable(com.uas.appworks.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);
+    }
+}

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

@@ -7,11 +7,14 @@ import android.widget.Toast;
 
 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 {
    private LinePathView pathView;
+    private int signCode;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,6 +29,8 @@ public class LandscapeActivity extends Activity implements View.OnClickListener
         findViewById(R.id.save1).setOnClickListener(this);
         pathView = (LinePathView) findViewById(R.id.view);
         pathView.setPaintWidth(5);
+
+        signCode = getIntent().getIntExtra("signCode",-1);
     }
 
 
@@ -40,7 +45,15 @@ public class LandscapeActivity extends Activity implements View.OnClickListener
             if (pathView.getTouched())
             {
                 try {
-                    pathView.save(SigatureActivity.path1,false,10);
+                    switch (signCode){
+                        case 001:
+                            pathView.save(WagesDetailsActivity.plainpath,false,10);
+                            break;
+                        case 002:
+                            pathView.save(SigatureActivity.path1,false,10);
+                            break;
+                    }
+
                 } catch (IOException e) {
                     e.printStackTrace();
                 }

app_modular/appme/src/main/res/layout/check_wages_activity.xml

@@ -0,0 +1,106 @@
+<?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/bg_main">
+
+    <TextView
+        android:id="@+id/wages_date"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:text="2017年11月"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:drawableRight="@drawable/oa_next"
+        android:textSize="15sp"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:background="@color/item_line" />
+    <com.andreabaccega.widget.FormEditText
+        android:id="@+id/wages_phone_et"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:textColor="@color/dark_dark_grey"
+        android:padding="10dp"
+        android:layout_centerVertical="true"
+        android:background="@null"
+        android:hint="请输入手机号码"
+        android:textSize="15sp"
+        android:gravity="center_vertical"
+        android:inputType="number"
+        android:maxLength="11"
+        />
+    <View
+    android:layout_width="match_parent"
+    android:layout_height="2px"
+    android:background="@color/item_line" />
+    <com.andreabaccega.widget.FormEditText
+        android:id="@+id/wages_password_et"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:textColor="@color/dark_dark_grey"
+        android:padding="10dp"
+        android:layout_centerVertical="true"
+        android:background="@null"
+        android:hint="请输入查询密码"
+        android:textSize="15sp"
+        android:gravity="center_vertical"
+        android:inputType="textPassword"
+        />
+
+    <View
+    android:layout_width="match_parent"
+    android:layout_height="2px"
+    android:background="@color/item_line" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        >
+        <com.andreabaccega.widget.FormEditText
+            android:id="@+id/wages_code_et"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:textColor="@color/dark_dark_grey"
+            android:padding="10dp"
+            android:layout_centerVertical="true"
+            android:background="@null"
+            android:hint="请输入6位数查询密码"
+            android:textSize="15sp"
+            android:gravity="center_vertical"
+            android:maxLength="6"
+            />
+        <Button
+            android:id="@+id/wages_code_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:padding="10dp"
+            android:text="获取验证码"
+            android:textColor="@color/blue"
+            android:textSize="@dimen/text_main"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
+            android:background="@color/white"
+            />
+    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:background="@color/item_line" />
+
+    <Button
+        android:id="@+id/check_btn"
+        android:layout_margin="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/bg_bule_btn"
+        android:padding="10dp"
+        android:text="查询"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_main"
+        android:visibility="visible"/>
+</LinearLayout>

app_modular/appme/src/main/res/layout/sigature_pop.xml

@@ -0,0 +1,99 @@
+<?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/bg">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="工资条签名"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            />
+        <TextView
+            android:id="@+id/cancel_tv"
+            android:layout_alignParentRight="true"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:text="取消"
+            android:textColor="@color/LightBlue"
+            android:textSize="16sp"
+            android:gravity="right"
+            />
+    </RelativeLayout>
+    <View
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:background="@color/item_line" />
+    <RelativeLayout
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:background="@color/white">
+        <Button
+            android:id="@+id/hscreen_btn"
+            android:layout_width="80dp"
+            android:layout_height="35dp"
+            android:text="横屏签名"
+            android:background="@drawable/bg"
+            android:layout_alignBottom="@+id/clear_im"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
+            android:visibility="gone"/>
+        <ImageView
+            android:id="@+id/clear_im"
+            android:layout_alignParentRight="true"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/common_header_boy"
+            android:layout_margin="10dp"
+            android:background="@color/white"/>
+        <View
+            android:id="@+id/view3"
+            android:layout_below="@+id/clear_im"
+            android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line" />
+        <com.uas.appme.settings.handwritedemo.LinePathView
+            android:id="@+id/sigature_view"
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_below="@+id/view3"
+            android:background="@color/white"
+            />
+    </RelativeLayout>
+
+    <TextView
+        android:gravity="center"
+        android:background="@color/white"
+        android:text="签名区域"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"/>
+    <Button
+        android:id="@+id/submit_btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="20dp"
+        android:background="@drawable/bg_bule_btn"
+        android:padding="10dp"
+        android:text="@string/common_submit_button"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_main"/>
+
+</LinearLayout>

app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -0,0 +1,49 @@
+<?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">
+    <TextView
+        android:background="@color/white"
+        android:layout_margin="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"/>
+    <View
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:background="@color/item_line" />
+    <com.core.widget.CustomerScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.core.widget.MyListView
+
+                android:id="@+id/wages_lv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white">
+            </com.core.widget.MyListView>
+            <Button
+                android:id="@+id/btn_signature"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="签字"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main"
+                />
+        </LinearLayout>
+   </com.core.widget.CustomerScrollView>
+
+</LinearLayout>

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/UUSportActivity.java

@@ -54,7 +54,7 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
 
     private void initData() {
         model = mStepRankingFirstDao.getAllRFIDatas();
-        StepRankingFirstBean mm = mStepRankingFirstDao.getCurDataByDate("2017年11月06日");
+        StepRankingFirstBean mm = mStepRankingFirstDao.getCurDataByDate("2017年11月09日");
         LogUtil.prinlnLongMsg("fanglh", JSON.toJSONString(model)+","+JSON.toJSONString(mm));
         if (ListUtils.isEmpty(model)){
             mEmptyLayout.showEmpty();