19:46

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Dec 27 17:48:26 CST 2017
-debugName=297
+#Tue Jan 02 14:19:10 CST 2018
+debugName=306
 versionName=613
-debugCode=297
+debugCode=306
 versionCode=152

app_core/common/src/main/java/com/core/utils/time/wheel/OASigninPicker.java

@@ -9,6 +9,9 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.data.DateFormatUtil;
+import com.core.utils.CommonUtil;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -42,7 +45,7 @@ public class OASigninPicker extends WheelPicker {
     public OASigninPicker(Activity activity) {
         super(activity);
         textSize = 16;//年月日时分，比较宽，设置字体小一点才能显示完整
-        for (int i = 2015; i <= 2017; i++) {
+        for (int i = CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")) - 2; i <= CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")); i++) {
             years.add(String.valueOf(i));
         }
         for (int i = 1; i <= 12; i++) {

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

@@ -180,6 +180,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
 
         mTel.setText(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"user_phone"));
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
+//        master = "uas_dev";
         emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
 

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

@@ -151,6 +151,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                 .add("phone",mPhoneEt.getText().toString())
                 .add("em_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .add("master",CommonUtil.getSharedPreferences(ct, "erp_master"))
+//                .add("master","uas_dev")
                 .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {

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

@@ -184,6 +184,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
+//        master = "uas_dev";
         getSupportActionBar().setTitle("工资查询");
 
         mWagesLv = (MyListView) findViewById(R.id.wages_lv);