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

WeiChat/build.gradle

@@ -29,6 +29,10 @@ android {
         versionName rootProject.ext.android.versionName
         multiDexEnabled true
         signingConfig signingConfigs.config
+
+        // 默认是umeng的渠道
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
     }
 
     useLibrary 'org.apache.http.legacy'
@@ -52,16 +56,27 @@ android {
         }
     }
     productFlavors {  // Gradle 多渠道打包
-        xiaomi {}
+        wandoujia {}
         _360 {}
         baidu {}
-        wandoujia {}
+        xiaomi {}
+        tencent {}
+        taobao {}
     }
 
     productFlavors.all {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
-
+    //给apk添加对应的版本号：这里暂时注释但保留
+//    applicationVariants.all { variant ->
+//        variant.outputs.each { output ->
+//            def outputFile = output.outputFile
+//            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+//                def fileName = outputFile.name.replace(".apk", "-${defaultConfig.versionName}.apk")
+//                output.outputFile = new File(outputFile.parent, fileName)
+//            }
+//        }
+//    }
 }
 
 dependencies {

WeiChat/src/main/AndroidManifest.xml

@@ -126,7 +126,7 @@
         android:theme="@style/AppTheme">
         <meta-data
             android:name="UMENG_CHANNEL"
-            android:value="baidu" />
+            android:value="${UMENG_CHANNEL_VALUE}" />
         <!-- 启动页面 -->
         <activity android:name=".ui.SplashActivity">
             <intent-filter>

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

@@ -587,6 +587,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             if (StringUtils.isEmpty(model.getObject()) || !new JsonValidator().validate(model.getObject()))
                 return;
             tv_visit_steps.setText(JSON.parseObject(model.getObject()).getString("CU_NICHESTEP"));
+            tv_linksman_login.setText(StringUtils.isEmpty(JSON.parseObject(model.getObject()).getString("CU_TEL")) ? "" : JSON.parseObject(model.getObject()).getString("CU_TEL"));
 //            String address = model.getAddress();
 //            String name = model.getName();
 //            tv_customer_login.setText(name);

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

@@ -1298,9 +1298,9 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                         }
                     }
                 }else {
-//                    for (int i = 0; i < 3; i++) {
+                    for (int i = 0; i < 3; i++) {  //一次刷新不彻底，只能用三次。我也很无奈啊
                     doDetailsHandle();
-//                    }
+                    }
                 }
 
                 closePopupWindow();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -35,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.message.PersonalRegActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAMainActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -342,7 +343,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         } else {
 //            test_rl.setVisibility(View.VISIBLE);
             my_qr_code_rl.setVisibility(View.GONE);
-            picture_selector_rl.setVisibility(View.VISIBLE);
+            picture_selector_rl.setVisibility(View.GONE);
         }
 
         my_qr_code_rl.setOnClickListener(new View.OnClickListener() {
@@ -363,8 +364,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             @Override
             public void onClick(View v) {
 //                startActivity(new Intent(ct, PictureSelectorDemo.class));
-//                startActivity(new Intent(ct, PersonalRegActivity.class));
-                startActivity(new Intent(ct,TemperatureActivity.class));
+                startActivity(new Intent(ct, PersonalRegActivity.class));
+//                startActivity(new Intent(ct,TemperatureActivity.class));
 //                startActivity(new Intent(ct,ToastDemoActivity.class));
             }
         });

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-release_version=false
-#release_version=true
+#release_version=false
+release_version=true