产城服务备份

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Nov 20 18:23:01 CST 2017
+#Mon Nov 20 18:51:09 CST 2017
 debugName=1
 versionName=618
-debugCode=43
+debugCode=45
 versionCode=118

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

@@ -270,7 +270,7 @@
       {
         "isLocalMenu": true,
         "menuName": "产城服务",
-        "menuIcon": "defaultpic",
+        "menuIcon": "ic_work_city_industry_service",
         "menuActivity": "com.modular.work.CityIndustryActivity",
         "menuUrl": "",
         "caller": "",

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

@@ -135,7 +135,7 @@
       {
         "isLocalMenu": true,
         "menuName": "产城服务",
-        "menuIcon": "defaultpic",
+        "menuIcon": "ic_work_city_industry_service",
         "menuActivity": "com.modular.work.CityIndustryActivity",
         "menuUrl": "",
         "caller": "",

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

@@ -45,7 +45,7 @@
       {
         "isLocalMenu": true,
         "menuName": "产城服务",
-        "menuIcon": "defaultpic",
+        "menuIcon": "ic_work_city_industry_service",
         "menuActivity": "com.modular.work.CityIndustryActivity",
         "menuUrl": "",
         "caller": "",

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -24,7 +24,6 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -597,10 +596,15 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                 if (mContext == null) return;
                 LogUtil.d("当前线程是：" + CommonUtil.isMainThread());
                 if (formid == 0) {
-                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
-                            .putExtra("caller", caller)
+                    startActivity(new Intent(mContext,
+                            CommonCityIndustryDetailsActivity.class)
+                            .putExtra("title", getSupportActionBar().getTitle().toString())
                             .putExtra("keyValue", va_id)
-                            .putExtra("status", "已提交"));
+                            .putExtra("serve_id", mServeId));
+//                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
+//                            .putExtra("caller", caller)
+//                            .putExtra("keyValue", va_id)
+//                            .putExtra("status", "已提交"));
                 } else {
                     startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)