12:36

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 03 19:22:12 CST 2018
-debugName=402
+#Thu Jan 04 12:31:57 CST 2018
+debugName=418
 versionName=624
-debugCode=402
+debugCode=418
 versionCode=163

app_core/common/src/main/res/layout/input_error_msg.xml

@@ -59,7 +59,7 @@
         android:orientation="horizontal">
 
         <Button
-            android:id="@+id/cancel_tv"
+            android:id="@+id/cancel_error_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="#999999"

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

@@ -1474,7 +1474,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">Payroll inquiry</string>
+    <string name="str_company_salary">Payroll</string>
     <!--工作台菜单-->
 
 </resources>

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

@@ -1587,7 +1587,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">企业工资条</string>
+    <string name="str_company_salary">工资条</string>
     <!--工作台菜单-->
 
 </resources>

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

@@ -1575,7 +1575,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">企業工資條</string>
+    <string name="str_company_salary">工資條</string>
     <!--工作台菜单-->
 
 </resources>

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

@@ -1925,7 +1925,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">企业工资条</string>
+    <string name="str_company_salary">工资条</string>
     <!--工作台菜单-->
 
 </resources>

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

@@ -95,6 +95,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private LinearLayout error_ll;
     private TextView error_tv;
     private boolean errorgone = false;
+    private LinearLayout wages_ll;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -108,6 +109,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
     private void showDatas(String result) {
         haveData = true;
+        wages_ll.setVisibility(View.VISIBLE);
         try {
             JSONObject salaryObject = JSON.parseObject(result).getJSONObject("salary");
             if (salaryObject != null){
@@ -122,23 +124,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     announcement_tv.setText("通知公告："+gonggao);
                 else if (gonggao == null)
                     announcement_tv.setVisibility(View.GONE);
-                Log.i("needSignature",needSignature+"");
-                needSignature = dataObject.getInteger("sl_signature");
-                Log.i("needSignature",needSignature+"");
-                if (needSignature != 1) mBtnSignature.setText("确认签收");
-                sl_result = dataObject.getInteger("sl_result");
-                sl_remark = dataObject.getString("sl_remark");
-                if (!StringUtil.isEmpty(sl_remark) && sl_result == -1){
-                    error_ll.setVisibility(View.VISIBLE);
-                    error_tv.setText(sl_remark);
-                }else {
-                    error_ll.setVisibility(View.GONE);
-                }
 
-                if (sl_result == 1 || sl_result == -1)
-                    mBtnSignature.setVisibility(View.GONE);
-                else if (sl_result == 0 && haveData)
-                    mBtnSignature.setVisibility(View.VISIBLE);
 
                 sl_id = dataObject.getString("sl_id");
                 if (!ListUtils.isEmpty(configsArray) && dataObject.size() > 0){
@@ -160,7 +146,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                             if (ListUtils.isEmpty(kvModeList))
                                 showEnty();
                             else {
+                                wages_ll.setVisibility(View.VISIBLE);
                                 noWageLl.setVisibility(View.GONE);
+                                showView(dataObject);
                             }
                         }
                     }
@@ -171,30 +159,62 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             }else{
                 showEnty();
             }
-            invalidateOptionsMenu();
        } catch (Exception e) {
             e.printStackTrace();
         }
 }
 
+    private void showView(JSONObject dataObject) {
+        needSignature = dataObject.getInteger("sl_signature");
+        if (needSignature != 1) mBtnSignature.setText("确认签收");
+
+        sl_result = dataObject.getInteger("sl_result");
+        sl_remark = dataObject.getString("sl_remark");
+
+        if (!StringUtil.isEmpty(sl_remark) && sl_result == -1){
+            error_ll.setVisibility(View.VISIBLE);
+            error_tv.setText(sl_remark);
+        }else {
+            error_ll.setVisibility(View.GONE);
+        }
+
+
+       if (sl_result == 0 && !ListUtils.isEmpty(kvModeList)
+               && StringUtil.isEmpty(sl_remark))
+            mBtnSignature.setVisibility(View.VISIBLE);
+        else
+            mBtnSignature.setVisibility(View.GONE);
+
+        if (sl_result == 1 & !ListUtils.isEmpty(kvModeList)
+                && StringUtil.isEmpty(sl_remark))
+            received_im.setVisibility(View.VISIBLE);
+        else
+            received_im.setVisibility(View.GONE);
+
+        invalidateOptionsMenu();
+    }
+
     private void showEnty() {
         haveData = false;
-        mWagesLv.setVisibility(View.GONE);
+        wages_ll.setVisibility(View.GONE);
         received_im.setVisibility(View.GONE);
         noWageLl.setVisibility(View.VISIBLE);
         mBtnSignature.setVisibility(View.GONE);
         announcement_tv.setVisibility(View.GONE);
+        error_ll.setVisibility(View.GONE);
         Log.i("getEmSalary","showEnty");
+        invalidateOptionsMenu();
     }
 
     private void initView() {
                 emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
-//        master = "uas_dev";
+
         getSupportActionBar().setTitle("工资查询");
 
         mWagesLv = (MyListView) findViewById(R.id.wages_lv);
+        wages_ll = (LinearLayout) findViewById(R.id.wages_ll);
         mBtnSignature = (Button) findViewById(R.id.btn_signature); mBtnSignature.setOnClickListener(this);
         kvModeList = new ArrayList<>();
         myAdapter = new WagesDetailsAdapter(this);
@@ -260,6 +280,11 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         else if (v.getId() == R.id.submit_btn){
             if (pathView.getTouched())
             {
+                if (!CommonUtil.isNetWorkConnected(ct)){
+                    ToastMessage(getString(R.string.common_notlinknet));
+                    return;
+                }
+
                 try {
                     pathView.save(plainpath,false,10);  //将图片路径保存到plainpath中，并获取Bimap对象
                     BitmapFactory.Options options = new BitmapFactory.Options();
@@ -299,7 +324,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 }
             });
             picker.show();
-        }else if (v.getId() == R.id.cancel_tv){
+        }else if (v.getId() == R.id.cancel_error_tv){
             popupWindow.dismiss();
         }
     }
@@ -363,6 +388,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     ToastMessage("报错成功");
                     error_ll.setVisibility(View.VISIBLE);
                     error_tv.setText(msg_et.getText().toString());
+                    sl_result = -1;
+                    invalidateOptionsMenu();
                     popupWindow.dismiss();
                 }
 
@@ -403,8 +430,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
-                    mBtnSignature.setText("已收签");
-                    mBtnSignature.setEnabled(false);
+                    mBtnSignature.setVisibility(View.GONE);
                     errorgone = true;
                     invalidateOptionsMenu();
                     closePopupWindow();
@@ -429,6 +455,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
     //不需要签名情况下的签收
     private void doNoSignatureSubmit() {
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            return;
+        }
 //        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).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()
@@ -446,8 +476,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 if (JSONUtil.validate(o.toString()) && o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
-                    mBtnSignature.setText("已收签");
-                    mBtnSignature.setEnabled(false);
+                    mBtnSignature.setVisibility(View.GONE);
                     errorgone = true;
                     invalidateOptionsMenu();
                     closePopupWindow();
@@ -542,7 +571,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         // 设置按钮的点击事件
         msg_et = (EditText) contentView.findViewById(R.id.msg_et);
         contentView.findViewById(R.id.sure_tv).setOnClickListener(this);
-        contentView.findViewById(R.id.cancel_tv).setOnClickListener(this);
+        contentView.findViewById(R.id.cancel_error_tv).setOnClickListener(this);
 
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int w_screen = dm.widthPixels;

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

@@ -109,7 +109,7 @@
             android:layout_marginRight="10dp"
             android:background="#2f95dd"
             android:visibility="visible"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="8dp"
             />
 
         <Button
@@ -123,7 +123,7 @@
             android:layout_marginRight="10dp"
             android:background="#DCDCDC"
             android:visibility="gone"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="8dp"
             />
 
 

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

@@ -71,6 +71,7 @@
                     android:layout_height="45dp"
                     android:background="@drawable/bg_bule_btn"
                     android:gravity="center"
+                    android:textColor="@color/white"
                     />
             </LinearLayout>
 
@@ -127,6 +128,7 @@
                     android:layout_height="45dp"
                     android:background="@drawable/bg_bule_btn"
                     android:gravity="center"
+                    android:textColor="@color/white"
                     />
             </LinearLayout>
 
@@ -193,6 +195,7 @@
                     android:layout_height="45dp"
                     android:background="@drawable/bg_bule_btn"
                     android:gravity="center"
+                    android:textColor="@color/white"
                     />
             </LinearLayout>
         </LinearLayout>

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

@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
+        android:padding="5dp"
         android:background="@color/bg_main"
         android:layout_gravity="center_horizontal">
 
@@ -47,10 +47,7 @@
         android:focusableInTouchMode="true"
         android:textColor="#2f95dd"
         />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="#FBFBFB" />
+
     <com.core.widget.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -65,20 +62,30 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
+               <LinearLayout
+                   android:id="@+id/wages_ll"
+                   android:layout_width="match_parent"
+                   android:layout_height="wrap_content"
+                   android:orientation="vertical">
+                   <View
+                       android:layout_width="match_parent"
+                       android:layout_height="10dp"
+                       android:background="#FBFBFB" />
+                   <com.core.widget.MyListView
+                       android:id="@+id/wages_lv"
+                       android:layout_width="match_parent"
+                       android:layout_height="match_parent"
+                       android:padding="10dp"
+                       android:background="@drawable/wagebg"
+                       android:visibility="visible"
+                       >
+                   </com.core.widget.MyListView>
 
-                <com.core.widget.MyListView
-                    android:id="@+id/wages_lv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:padding="10dp"
-                    android:background="@drawable/wagebg"
-                    android:visibility="visible"
-                    >
-                </com.core.widget.MyListView>
+               </LinearLayout>
                 <ImageView
                     android:id="@+id/received_im"
-                    android:layout_alignBottom="@+id/wages_lv"
-                    android:layout_alignRight="@+id/wages_lv"
+                    android:layout_alignBottom="@+id/wages_ll"
+                    android:layout_alignRight="@+id/wages_ll"
                     android:layout_width="80dp"
                     android:layout_height="80dp"
                     android:src="@drawable/received"