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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 26 17:06:39 CST 2017
-debugName=272
+#Tue Dec 26 11:16:10 CST 2017
+debugName=243
 versionName=613
-debugCode=272
+debugCode=243
 versionCode=152

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

@@ -80,7 +80,10 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
     @Override
     public void onClick(View view) {
         int id = view.getId();
-
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            return;
+        }
         if (id == R.id.next1_btn){
             if (StringUtil.isEmpty(mPhoneEt.getText().toString())){
                 ToastMessage("请输入手机号");
@@ -173,12 +176,18 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void invalidateOptionsMenu() {
+        super.invalidateOptionsMenu();
+    }
+
     private void showStepView(int step){
        switch (step){
            case 1:
                mStep1Ll.setVisibility(View.VISIBLE);
                mStep2Ll.setVisibility(View.GONE);
                mStep3Ll.setVisibility(View.GONE);
+
                break;
            case 2:
                mStep1Ll.setVisibility(View.GONE);

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

@@ -159,6 +159,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                             }
                         }
                     }
+
+                    invalidateOptionsMenu();
                 }else{
                    showEnty();
                 }
@@ -228,12 +230,15 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.btn_signature){
-            if (haveData && needSignature == 1)
+            if (!haveData){
+                ToastMessage("工资数据为空，无法签字");
+                return;
+            }
+            if (needSignature == 1)
                 showSiganWindow();
-            else if (haveData )
-                doNewSubmit(null,null);
             else
-                ToastMessage("暂无工资条数据");
+                doSubmit();
+
         }else if (v.getId() == R.id.clear_im){
             pathView.clear();
         }else if (v.getId() == R.id.cancel_tv){
@@ -294,6 +299,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void searchWage() {
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            return;
+        }
         if (!ListUtils.isEmpty(kvModeList)) {
             kvModeList.clear();
             myAdapter.notifyDataSetChanged();
@@ -399,19 +408,15 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         });
     }
 
-    private void doSubmit(Bitmap pathBm,String plainpath) {
-        byte[] ppp = getBitmapByte(pathBm);
-        Log.i("fanglh",plainpath+","+pathBm+",ppp="+ppp);
-        clear_im.setImageBitmap(pathBm);
+    //不需要签名情况下的签收
+    private void doSubmit() {
 //        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()
                 .url("mobile/salary/salaryBack.action")
-                .header("img","img="+ppp)
                 .add("emcode", emcode)
                 .add("sl_id",sl_id)
-                .add("result",true)
-//                .add("img", ppp)
+                .add("result","true")
                 .add("master", master)
                 .add("msg","")
                 .method(Method.POST)