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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed May 23 13:47:22 CST 2018
-debugName=325
+#Tue May 22 17:48:24 CST 2018
+debugName=322
 versionName=630
-debugCode=325
+debugCode=322
 versionCode=170

app_core/common/src/main/res/values-en/strings.xml

@@ -1553,7 +1553,7 @@
     <string name="salary">wage</string>
     <string name="send_error_ok">Error reported</string>
     <string name="ss_send_success">Payroll signature submitted successfully</string>
-    <string name="no_salary_data">No salary information</string>
+    <string name="no_salary_data">No salary information this month</string>
     <string name="error_msg">No salary information</string>
     <string name="salary_sign">sign</string>
     <string name="confirm_phone">Please confirm the phone number</string>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1614,7 +1614,7 @@
     <string name="salary">工资</string>
     <string name="send_error_ok">报错成功</string>
     <string name="ss_send_success">工资条签名提交成功</string>
-    <string name="no_salary_data">暂无工资信息</string>
+    <string name="no_salary_data">本月无工资信息</string>
     <string name="error_msg">报错信息</string>
     <string name="salary_sign">签名</string>
     <string name="confirm_phone">请确认手机号</string>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1604,7 +1604,7 @@
     <string name="salary">工資</string>
     <string name="send_error_ok">報錯成功</string>
     <string name="ss_send_success">工資條簽名提交成功</string>
-    <string name="no_salary_data">暫無工資信息</string>
+    <string name="no_salary_data">本月無工資信息</string>
     <string name="error_msg">報錯信息</string>
     <string name="salary_sign">簽名</string>
     <string name="confirm_phone">請確認手機號</string>

app_core/common/src/main/res/values/strings.xml

@@ -1955,7 +1955,7 @@
     <string name="salary">工资</string>
     <string name="send_error_ok">报错成功</string>
     <string name="ss_send_success">工资条签名提交成功</string>
-    <string name="no_salary_data">暂无工资信息</string>
+    <string name="no_salary_data">本月无工资信息</string>
     <string name="error_msg">报错信息</string>
     <string name="salary_sign">签名</string>
     <string name="confirm_phone">请确认手机号</string>

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

@@ -209,7 +209,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
        int id =  v.getId();
         if (id == R.id.wages_date){
             DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH);
-            picker.setRange(2016, CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")));
+            picker.setRange(CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy"))-2, CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")));
             picker.setSelectedItem(
                     Calendar.getInstance().get(Calendar.YEAR),
                     Calendar.getInstance().get(Calendar.MONTH) + 1);
@@ -228,6 +228,12 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                 ToastMessage(getString(R.string.common_notlinknet));
                 return;
            }
+            codeTimeOut = false;
+            mWagesCodeBtn.setVisibility(View.GONE);
+            seconds_tv.setVisibility(View.VISIBLE);
+            isRun = true;
+            startRun();
+
  HttpClient httpClient = new HttpClient.Builder(CommonUtil.getAppBaseUrl(ct)).isDebug(true).build(true);
 //            HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
@@ -242,12 +248,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                     if (!JSONUtil.validate(o.toString()) || o == null) return;
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
                         Toast.makeText(ct,getString(R.string.msg_send_success),Toast.LENGTH_LONG).show();
-                        codeTimeOut = false;
-                        mWagesCodeBtn.setVisibility(View.GONE);
-                        seconds_tv.setVisibility(View.VISIBLE);
 //                        mWagesCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
-                        isRun = true;
-                        startRun();
                     }
 
                 }

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

@@ -309,7 +309,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             doErrorMsgHandle();
         }else if (v.getId() == R.id.wage_date_tv){
             DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH);
-            picker.setRange(2016, CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")));
+            picker.setRange(CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy"))-2, CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")));
             picker.setSelectedItem(
                     Calendar.getInstance().get(Calendar.YEAR),
                     Calendar.getInstance().get(Calendar.MONTH) + 1);