FANGLH 9 vuotta sitten
vanhempi
commit
fe6c3905b3

+ 3 - 3
WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="89"
-    android:versionName="5.7.5" >
+    android:versionCode="90"
+    android:versionName="5.7.6" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -765,7 +765,7 @@
 
         <activity
             android:name=".ui.message.Subscription2Activity"
-            android:label="@string/msg_subscribe" />
+            android:label="@string/subscribe_title" />
         <activity
             android:name=".ui.erp.activity.oa.MissionSetActivity"
             android:label="@string/activity_mission_set" />

+ 25 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DailydetailsActivity.java

@@ -38,6 +38,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.util.SystemUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import org.json.JSONException;
@@ -209,6 +210,30 @@ public class DailydetailsActivity extends BaseActivity {
 
             }
         });
+
+        wdd_summary.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                SystemUtil.copyText(getApplicationContext(), wdd_summary.getText().toString());
+                return true;
+            }
+        });
+
+        wdd_plan.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                SystemUtil.copyText(getApplicationContext(),wdd_plan.getText().toString());
+                return true;
+            }
+        });
+
+        wdd_experience.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                SystemUtil.copyText(getApplicationContext(),wdd_experience.getText().toString());
+                return true;
+            }
+        });
     }
 
 

+ 1 - 1
WeiChat/src/main/res/layout/activity_business_add.xml

@@ -310,7 +310,7 @@
                 <TextView
                     android:id="@+id/tv_date_businesslicense"
                     style="@style/form_relative_left_text"
-                    android:text="@string/enterprise_address"
+                    android:text="@string/Business_license_number"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 

+ 2 - 1
WeiChat/src/main/res/layout/process_header.xml

@@ -9,7 +9,8 @@
         android:id="@+id/back"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:padding="10dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:src="@drawable/back" />
 
     <LinearLayout

+ 2 - 1
WeiChat/src/main/res/values-en/strings.xml

@@ -596,7 +596,7 @@
         <string name = "work_customer"> Customer Relationship Management </string>
         <string name = "work_oa"> Administrative Office </string>
         <string name = "work_business_manage"> Business Management </string>
-        <string name = "work_business_mall"> Excellent Store </string>
+        <string name = "work_business_mall"> UsoftMall </string>
         
         <string name = "user_title"> me </string>
         <string name = "user_firend_cirle"> My Work Circle </string>
@@ -1086,4 +1086,5 @@
     <string name="location_failed">positioning failed</string>
     <string name="please_unput_yourP"> Please enter your question ... (within 400 words) </string>
     <string name="local_video">Local video</string>
+    <string name="Business_license_number">Business License No</string>
 </resources>

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

@@ -1206,4 +1206,5 @@
     <string name="location_failed">定位失败</string>
     <string name="please_unput_yourP">请输入您的问题...(400字以内)</string>
     <string name="local_video">本地视频</string>
+    <string name="Business_license_number">营业执照号</string>
 </resources>

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

@@ -1199,4 +1199,5 @@
     <string name="location_failed">定位失敗</string>
     <string name="please_unput_yourP">請輸入您的問題...(400字以內)</string>
     <string name="local_video">本地視頻</string>
+    <string name="Business_license_number">營業執照號</string>
 </resources>

+ 1 - 0
WeiChat/src/main/res/values/strings.xml

@@ -1555,4 +1555,5 @@
     <string name="set_language">切换语言</string>
     <string name="select_form_phoneablum">从手机相册选择</string>
     <string name="please_unput_yourP">请输入您的问题...(400字以内)</string>
+    <string name="Business_license_number">营业执照号</string>
 </resources>