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

WeiChat/src/main/res/values-en/strings.xml

@@ -37,7 +37,7 @@
         <string name = "common_noinput"> not filled in </string>
         <string name = "common_camera"> take pictures </string>
         <string name = "common_photo"> select </string> from the album
-        <string name = "common_notlinknet"> The network is not connected </string>
+        <string name = "common_notlinknet"> The current network is not available, please try again later</string>
         <string name = "common_notice"> Warm Tips </string>
         <string name = "common_save_failed"> save failed </string>
         <string name = "common_save_success"> save successfully </string>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -38,7 +38,7 @@
     <string name="common_noinput">未填写</string>
     <string name="common_camera">拍照</string>
     <string name="common_photo">从相册选择</string>
-    <string name="common_notlinknet">网络未连接</string>
+    <string name="common_notlinknet">当前网络不可用，请稍后再试!</string>
     <string name="common_notice">温馨提示</string>
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -34,7 +34,7 @@
     <string name="common_agree">同意</string>
     <string name="common_disagree">不同意</string>
     <string name="common_changedealman">變更處理人</string>
-    <string name="common_notlinknet">網絡未連接</string>
+    <string name="common_notlinknet">當前網絡不可用，請稍後重試!</string>
     <string name="common_notice">溫馨提示</string>
     <string name="common_save_failed">保存失敗</string>
     <string name="common_save_success">保存成功</string>

WeiChat/src/main/res/values/strings.xml

@@ -581,7 +581,7 @@
     <string name="common_noinput">未填写</string>
     <string name="common_camera">拍照</string>
     <string name="common_photo">从相册选择</string>
-    <string name="common_notlinknet">网络未连接</string>
+    <string name="common_notlinknet">当前网络不可用，请稍后重试!</string>
     <string name="common_notice">温馨提示</string>
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>

app_core/common/src/main/assets/work_menu.json

@@ -239,6 +239,15 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_company_salary",
+        "menuIcon": "company_salary",
+        "menuActivity": "com.modular.appme.CheckWagesActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

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

@@ -1474,6 +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>
     <!--工作台菜单-->
 
 </resources>

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

@@ -1587,6 +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>
     <!--工作台菜单-->
 
 </resources>

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

@@ -1575,6 +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>
     <!--工作台菜单-->
 
 </resources>

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

@@ -1925,6 +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>
     <!--工作台菜单-->
 
 </resources>

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

@@ -73,10 +73,10 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
             super.handleMessage(msg);
             if (msg.what==1212) {
                 SecondT--;
-                seconds_tv.setText(SecondT+"");
+                seconds_tv.setText(SecondT+"\t秒后重新发送");
                 if (SecondT==0) {
                     codeTimeOut = true;
-                    seconds_tv.setVisibility(View.INVISIBLE);
+                    seconds_tv.setVisibility(View.GONE);
                     mWagesCodeBtn.setVisibility(View.VISIBLE);
                     isRun = false;
                     SecondT = 59;
@@ -241,7 +241,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
                         Toast.makeText(ct,"短信发送成功,请在一分钟内完成输入查询",Toast.LENGTH_LONG).show();
                         codeTimeOut = false;
-                        mWagesCodeBtn.setVisibility(View.INVISIBLE);
+                        mWagesCodeBtn.setVisibility(View.GONE);
                         seconds_tv.setVisibility(View.VISIBLE);
                         mWagesCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
                         isRun = true;

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

@@ -23,7 +23,6 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
@@ -32,7 +31,6 @@ import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
-import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
@@ -137,7 +135,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 else if (sl_result == 0 && haveData)
                     mBtnSignature.setVisibility(View.VISIBLE);
 
-
                 sl_id = dataObject.getString("sl_id");
                 if (!ListUtils.isEmpty(configsArray) && dataObject.size() > 0){
                     for (int i = 0; i < configsArray.size(); i++) {
@@ -233,7 +230,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         if (v.getId() == R.id.btn_signature){
             if (haveData && needSignature == 1)
                 showSiganWindow();
-            else if (haveData && needSignature == 0)
+            else if (haveData )
                 doNewSubmit(null,null);
             else
                 ToastMessage("暂无工资条数据");
@@ -354,7 +351,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         }));
     }
 
-    private void doNewSubmit(Bitmap pathBm, String plainpath) {
+    private void doNewSubmit(Bitmap pathBm, final String plainpath) {
         String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
         RequestParams params = new RequestParams();
         params.addBodyParameter("emcode", emcode);
@@ -362,14 +359,16 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         params.addBodyParameter("result","true");
         params.addQueryStringParameter("master", master);
         params.addBodyParameter("msg","");
-        params.addBodyParameter("img",new File(plainpath));
+        if (!StringUtil.isEmpty(plainpath))
+            params.addBodyParameter("img",new File(plainpath));
         final HttpUtils http = new HttpUtils();
         Log.i("urlparams",url+params+"");
 
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
             @Override
             public void onStart() {
-                ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
+                if (!StringUtil.isEmpty(plainpath))
+                    ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
             }
             @Override
             public void onSuccess(ResponseInfo<String> responseInfo) {
@@ -412,7 +411,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 .add("emcode", emcode)
                 .add("sl_id",sl_id)
                 .add("result",true)
-                .add("img", ppp)
+//                .add("img", ppp)
                 .add("master", master)
                 .add("msg","")
                 .method(Method.POST)
@@ -421,6 +420,14 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             public void onResponse(Object o) {
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("salaryBack", o.toString()+"");
+                if (JSONUtil.validate(o.toString()) && JSON.parseObject(o.toString()).getBoolean("success")) {
+                    Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
+                    received_im.setVisibility(View.VISIBLE);
+                    mBtnSignature.setText("已收签");
+                    mBtnSignature.setEnabled(false);
+                    closePopupWindow();
+                }
+                progressDialog.dismiss();
             }
         }));
 

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

@@ -135,6 +135,8 @@
             android:maxLength="6"
             android:visibility="gone"
             android:layout_marginTop="5dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
             />
 
     </RelativeLayout>

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

@@ -29,6 +29,10 @@
             android:layout_marginLeft="10dp"
             />
     </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/item_line" />
     <TextView
         android:id="@+id/announcement"
         android:textSize="12sp"
@@ -38,7 +42,6 @@
         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" />
@@ -63,6 +66,7 @@
                     android:layout_height="match_parent"
                     android:padding="10dp"
                     android:background="@color/white"
+                    android:visibility="visible"
                     >
                 </com.core.widget.MyListView>
                 <ImageView
@@ -81,12 +85,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
                 android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone"
                 >
                 <ImageView
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:src="@drawable/wage_nodata"
                     />
+                <TextView
+                    android:padding="5dp"
+                    android:text="暂无工资信息"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/error_ll"