Procházet zdrojové kódy

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

Bitliker před 9 roky
rodič
revize
f7ae990513

+ 1 - 0
WeiChat/src/main/AndroidManifest.xml

@@ -426,6 +426,7 @@
         <activity android:name=".ui.message.SubscriptionActivity" />
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.erp.activity.crm.ClientActivity" />
+        <activity android:name=".ApplySubscribeActivity"/>
         <activity
             android:name=".ui.erp.activity.oa.SigninActivity"
             android:label=""

+ 198 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -0,0 +1,198 @@
+package com.xzjmyk.pm.activity;
+
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.andreabaccega.widget.FormEditText;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Created by RaoMeng on 2016/9/19.
+ */
+public class ApplySubscribeActivity extends BaseActivity {
+    private final static int APPLY_SUBSCRIPTION = 33;
+    private final static int GET_AS_ID = 34;
+    private final static int SUBMIT_SUBSCRIPTION = 35;
+
+    private FormEditText mSubscribeNameEt, mDataEt, mStatusEt, mSubscribePersonEt, mPostEt, mBranchEt, mReasonEt;
+    private int mAsId;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_apply_subscribe);
+        getSupportActionBar().setTitle("申请订阅");
+
+        initView();
+        initEvent();
+    }
+
+    private Handler mHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case GET_AS_ID:
+                    String resultStr = msg.getData().getString("result");
+                    try {
+                        JSONObject resultJsonObject = new JSONObject(resultStr);
+                        if (resultJsonObject != null && resultJsonObject.getBoolean("success")) {
+                            mAsId = resultJsonObject.getInt("id");
+                            Log.d("apply_subscribe_id",mAsId+"");
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    break;
+                case APPLY_SUBSCRIPTION:
+                    String saveResult = msg.getData().getString("result");
+                    Log.d("apply_subscribe_save", saveResult + "");
+                    Crouton.makeText(ApplySubscribeActivity.this,"申请保存成功",Style.CONFIRM).show();
+                    try {
+                        JSONObject saveObject = new JSONObject(saveResult);
+                        if (saveObject != null && saveObject.getBoolean("success")){
+                            sendSubmitRequest();
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    break;
+                case SUBMIT_SUBSCRIPTION:
+                    progressDialog.dismiss();
+                    String submitResult = msg.getData().getString("result");
+                    Log.d("apply_subscrive_submit",submitResult);
+                    Crouton.makeText(ApplySubscribeActivity.this,"申请提交成功",Style.CONFIRM).show();
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    ToastMessage(msg.getData().getString("result"));
+                    break;
+            }
+        }
+    };
+
+    private void initView() {
+        mSubscribeNameEt = (FormEditText) findViewById(R.id.apply_subscribe_name_et);
+        mDataEt = (FormEditText) findViewById(R.id.apply_subscribe_data_et);
+        mStatusEt = (FormEditText) findViewById(R.id.apply_subscribe_status_et);
+        mSubscribePersonEt = (FormEditText) findViewById(R.id.apply_subscribe_person_et);
+        mPostEt = (FormEditText) findViewById(R.id.apply_subscribe_post_et);
+        mBranchEt = (FormEditText) findViewById(R.id.apply_subscribe_branch_et);
+        mReasonEt = (FormEditText) findViewById(R.id.apply_subscribe_reason_et);
+
+        CommonUtil.getCommonId(this,"SUBSAPPLY_SEQ",mHandler,GET_AS_ID);
+    }
+
+    private void initEvent() {
+
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_apply_subscribe, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.subscribe_apply:
+//                Crouton.makeText(this, "提交成功", Style.CONFIRM).show();
+                progressDialog.show();
+                CodeUtil.getInstance().getCode(ApplySubscribeActivity.this,
+                        "SubsApply", new CodeUtil.OnCodeLinstener() {
+                            @Override
+                            public void callBack(String code) {
+                                sendApplyRequest(APPLY_SUBSCRIPTION, code);
+                            }
+                        });
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * 提交保存
+     */
+    private void sendSubmitRequest() {
+        String submitUrl = Constants.getAppBaseUrl(ct) + "/common/submitCommon.action";
+        Map<String,Object> params = new HashMap<>();
+        params.put("caller","SubsApply");
+        params.put("id",mAsId);
+
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, submitUrl, params, mHandler, headers, SUBMIT_SUBSCRIPTION, null, null, "post");
+    }
+
+    /**
+     * 申请保存
+     * @param what
+     * @param code
+     */
+    private void sendApplyRequest(int what, String code) {
+        String formStore = "";
+        if (mSubscribeNameEt.testValidity() && mDataEt.testValidity()
+                && mStatusEt.testValidity() && mSubscribePersonEt.testValidity()
+                && mPostEt.testValidity() && mBranchEt.testValidity()){
+            formStore =
+                    "{\n" +
+                            "\"id_\":" + mAsId
+                            + ",\n" +
+                            "\"code_\":\"" + code
+                            + "\",\n" +
+                            "\"name_\":\"" + ""
+                            + "\",\n" +
+                            "\"date_\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd")
+                            + "\",\n" +
+                            "\"status_\":\"" +""
+                            + "\",\n" +
+                            "\"statuscode_\":\"" +"ENTERING"
+                            + "\",\n" +
+                            "\"empcode_\":\"" + ""
+                            + "\",\n" +
+                            "\"empname_\":\"" + CommonUtil.getSharedPreferences(ct, "erp_username")
+                            + "\",\n" +
+                            "\"empdep_\":\"" + ""
+                            + "\",\n" +
+                            "\"num_id_\":\"" + ""
+                            + "\",\n" +
+                            "\"num_title_\":\"" + ""
+                            + "\",\n" +
+                            "\"reason_\":\"" + " "
+                            + "\"\n" +
+                            "}";
+        }else {
+            return;
+        }
+
+        String url = Constants.getAppBaseUrl(ct) + "/common/saveCommon.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("formStore", formStore);
+        params.put("caller", "SubsApply");
+
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+}

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SubcribeManageActivity.java

@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created by PROD on 2016/9/5.
+ * Created by RaoMeng on 2016/9/5.
  */
 public class SubcribeManageActivity extends BaseActivity{
     private TabPageIndicator mTabPageIndicator;
@@ -32,7 +32,7 @@ public class SubcribeManageActivity extends BaseActivity{
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subscribe_manage);
-        getSupportActionBar().setTitle("订阅");
+        getSupportActionBar().setTitle("订阅管理");
 
         mTabPageIndicator = (TabPageIndicator) findViewById(R.id.subscribe_manage_tab);
         mUnderlinePageIndicator = (UnderlinePageIndicator) findViewById(R.id.subscribe_manage_undertab);

+ 13 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java

@@ -1,9 +1,13 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
+import android.content.Intent;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.xzjmyk.pm.activity.ApplySubscribeActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.AllSubscriptionAdapter;
 import com.xzjmyk.pm.activity.adapter.AllSubscriptionNumbersAdapter;
@@ -81,6 +85,15 @@ public class SubscriptionAllFragment extends BaseFragment {
                 }, 1000);
             }
         });
+
+        mPullToRefreshListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent();
+                intent.setClass(getActivity(), ApplySubscribeActivity.class);
+                startActivity(intent);
+            }
+        });
     }
 
     @Override

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/NoSlideViewpager.java

@@ -6,7 +6,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 
 /**
- * Created by PROD on 2016/9/5.
+ * Created by RaoMeng on 2016/9/5.
  */
 public class NoSlideViewpager extends ViewPager {
     private boolean noSlide = true;

+ 9 - 8
WeiChat/src/main/res/layout/activity_apply_subscribe.xml

@@ -4,6 +4,7 @@
     xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
     <RelativeLayout
         android:id="@+id/ry_business_no"
@@ -13,7 +14,7 @@
 
         <TextView
             android:id="@+id/apply_subscribe_order_tv"
-            style="@style/form_relative_left_text"
+            style="@style/form_relative_left_text2"
             android:text="采购单分析"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
@@ -24,7 +25,7 @@
             android:text="*"
             android:textColor="@color/red" />
         <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/apply_subscribe_order_et"
+            android:id="@+id/apply_subscribe_name_et"
             style="@style/form_relative_right_text"
             android:hint="请输入"
             editTextFormExample:testType="nocheck"/>
@@ -40,7 +41,7 @@
 
         <TextView
             android:id="@+id/apply_subscribe_data_tv"
-            style="@style/form_relative_left_text"
+            style="@style/form_relative_left_text2"
             android:text="单据日期"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
@@ -85,7 +86,7 @@
 
         <TextView
             android:id="@+id/apply_subscribe_status_tv"
-            style="@style/form_relative_left_text"
+            style="@style/form_relative_left_text2"
             android:text="单据状态"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
@@ -110,7 +111,7 @@
 
         <TextView
             android:id="@+id/apply_subscribe_person_tv"
-            style="@style/form_relative_left_text"
+            style="@style/form_relative_left_text2"
             android:text="申请人"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
@@ -173,7 +174,7 @@
 
         <TextView
             android:id="@+id/apply_subscribe_post_tv"
-            style="@style/form_relative_left_text"
+            style="@style/form_relative_left_text2"
             android:text="申请人岗位"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
@@ -203,7 +204,7 @@
 
         <TextView
             android:id="@+id/apply_subscribe_branch_tv"
-            style="@style/form_relative_left_text"
+            style="@style/form_relative_left_text2"
             android:text="申请部门"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
@@ -227,7 +228,7 @@
         android:background="@color/item_color2">
 
         <TextView
-            style="@style/form_relative_left_text"
+            style="@style/form_relative_left_text2"
             android:text="申请原因"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />

+ 11 - 0
WeiChat/src/main/res/menu/menu_apply_subscribe.xml

@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+
+    <item
+        android:id="@+id/subscribe_apply"
+        android:title="提交"
+        app:showAsAction="ifRoom" />
+
+</menu>

+ 9 - 0
WeiChat/src/main/res/values/styles.xml

@@ -443,6 +443,15 @@
         <item name="android:textColor">@color/text_main</item>
         <item name="android:textSize">@dimen/text_main</item>
     </style>
+    <style name="form_relative_left_text2">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">12dp</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:gravity">right</item>
+        <item name="android:textColor">@color/text_main</item>
+        <item name="android:textSize">@dimen/text_main</item>
+    </style>
 
     <style name="app_comm_list_line_gray">
         <item name="android:layout_width">match_parent</item>