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

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -217,7 +217,12 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                         if (which == 0) {
                             takePhoto();
                         } else {
-                            selectPhoto();
+                            selectPhoto(); //TODO 新写一个可以一次选择多张照片的方法
+//                            Intent intent = new Intent(SendShuoshuoActivity.this,
+//                                    ImageBucketChooseActivity.class);
+//                            intent.putExtra(IntentConstants.EXTRA_CAN_ADD_IMAGE_SIZE,
+//                                    getAvailableSize());
+//                            startActivity(intent);
                         }
                         dialog.dismiss();
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java

@@ -377,20 +377,9 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 if (!fd_field.equals("null")){
                                     em_number = formdataArray.getJSONObject(0).getString(fd_field);
                                     Log.i("em_number",em_number);
-
                                 }
-
                             }
                             getapplypeomsg(em_number);
-
-                            //申请单据的审批，提交，录入状态获取
-//                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
-//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
-//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
-//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("fp_status"))){
-//                                real_status = formdataArray.getJSONObject(0).getString(fd_field);
-//                                SetComDocStatus(real_status);
-//                            }
                         }
                         mCommonDocMainMsgAdapter.setmFormconfigsBean(mFormconfigsBean);
                         main_msg_lv.setAdapter(mCommonDocMainMsgAdapter);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DailydetailsActivity.java

@@ -153,7 +153,7 @@ public class DailydetailsActivity extends BaseActivity {
                                     Intent intent = new Intent();
                                     intent.putExtra("delete_succeed","");
                                     setResult(DELETE_SUCCEED,intent);
-                                    DailydetailsActivity.this.finish();
+                                    finish();
                                 }
                             }
                         }
@@ -436,8 +436,8 @@ public class DailydetailsActivity extends BaseActivity {
         } else {
             experience_ll.setVisibility(View.GONE);
         }
-        if (!TextUtils.isEmpty(intent.getStringExtra("Donetask"))){
-            done_task_ll.setVisibility(View.VISIBLE);
+        if (!TextUtils.isEmpty(intent.getStringExtra("Donetask"))
+                && !"null".equals(intent.getStringExtra("Donetask"))){
             done_task_tv.setText(Html.fromHtml(intent.getStringExtra("Donetask")));
             donetask = intent.getStringExtra("Donetask");
         }else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyAddActivity.java

@@ -149,7 +149,7 @@ public class WorkDailyAddActivity extends BaseActivity {
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("GRAB_JOB_CONTENT", result);
                             if (!TextUtils.isEmpty(wd_finishedtask) || !TextUtils.isEmpty(wd_unfinishedtask)){
-                                ToastMessage("工作内容抓取成功");
+                                ToastMessage("尝试抓取工作内容");
                             }else {
                                 ToastMessage("无工作内容");
                             }
@@ -233,8 +233,8 @@ public class WorkDailyAddActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            startActivity(new Intent(activity, WorkDailyShowActivity.class));
-//            .putExtra("fromwhere","submitdaily"));
+            startActivity(new Intent(activity, WorkDailyShowActivity.class)
+                    .putExtra("fromwhere", "nosubmitdaily"));
         }
 
         if (item.getItemId() == android.R.id.home) {
@@ -249,7 +249,11 @@ public class WorkDailyAddActivity extends BaseActivity {
                         .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                               startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                                if (!TextUtils.isEmpty(resubmit) && "unsub_tosub".equals(resubmit)){
+                                    startActivity(new Intent(WorkDailyAddActivity.this,WorkDailyShowActivity.class));
+                                }else {
+                                    startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                                }
                                 finish();
                             }
                         }).show();
@@ -276,6 +280,11 @@ public class WorkDailyAddActivity extends BaseActivity {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                            if (!TextUtils.isEmpty(resubmit) && "unsub_tosub".equals(resubmit)){
+                                startActivity(new Intent(WorkDailyAddActivity.this,WorkDailyShowActivity.class));
+                            }else {
+                                startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                            }
                             finish();
                         }
                     }).show();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyShowActivity.java

@@ -123,7 +123,7 @@ public class WorkDailyShowActivity extends BaseActivity {
         });
         mPullToRefreshListView.setMode(PullToRefreshBase.Mode.BOTH);
 
-        //长按item弹出删除未提交对话框
+        //长按item弹出未提交单据删除对话框
        /* mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
@@ -259,29 +259,22 @@ public class WorkDailyShowActivity extends BaseActivity {
             putDownInput();
             final  Intent intent = getIntent();
             if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere"))
-                    && ((intent.getStringExtra("fromwhere").equals("submitdaily") ||
-                    intent.getStringExtra("fromwhere").equals("dodaily")) ||
-                    intent.getStringExtra("fromwhere").equals("delete_succeed"))){
-                startActivity(new Intent(activity,OAActivity.class));
+                    && intent.getStringExtra("fromwhere").equals("nosubmitdaily")){
                 finish();
             }else {
+                startActivity(new Intent(activity, OAActivity.class));
                 finish();
             }
-        }else{
-            return super.onOptionsItemSelected(item);
-
-        }return  true;
+        }return true;
     }
     @Override
     public void onBackPressed() {
         final  Intent intent = getIntent();
-        if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere")) &&
-              (intent.getStringExtra("fromwhere").equals("submitdaily") ||
-                    intent.getStringExtra("fromwhere").equals("dodaily")||
-                    intent.getStringExtra("fromwhere").equals("delete_succeed"))){
-                startActivity(new Intent(activity,OAActivity.class));
-                finish();
+        if (!TextUtils.isEmpty(intent.getStringExtra("fromwhere"))
+                && intent.getStringExtra("fromwhere").equals("nosubmitdaily")){
+            finish();
         }else {
+            startActivity(new Intent(activity, OAActivity.class));
             finish();
         }
         super.onBackPressed();

WeiChat/src/main/res/layout/activity_location_search.xml

@@ -40,7 +40,47 @@
         android:layout_height="0dp"
         android:layout_weight="3"
         android:clickable="false" />
-
+    <LinearLayout
+        android:id="@+id/qzone_map_ll"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/hidden_location_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:padding="5dp"
+            android:text="不显示位置"
+            android:textSize="@dimen/text_main"
+            android:textColor="@color/titleBlue"
+            android:visibility="visible"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_marginTop="8dp"
+            android:background="@color/light_gray"
+            android:visibility="visible"/>
+        <TextView
+            android:id="@+id/location_city_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:padding="5dp"
+            android:text=""
+            android:textSize="@dimen/text_main"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_marginTop="8dp"
+            android:background="@color/light_gray"
+            />
+    </LinearLayout>
     <ListView
         android:id="@+id/listview"
         android:layout_width="match_parent"