3月1号提交

app/build.gradle

@@ -16,8 +16,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
 //        versionCode 1
-        versionCode 370
-        versionName "3.7.0"
+        versionCode 372
+        versionName "3.7.2"
 //        versionName "开发版本"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
@@ -108,6 +108,7 @@ android {
 //        checkReleaseBuilds false
 //        abortOnError false
 //    }
+
 }
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
@@ -219,9 +220,10 @@ dependencies {
     //    implementation 'com.umeng.sdk:push:4.1.0'
 
     /*友盟统计推送相关*/
-    implementation 'com.umeng.umsdk:analytics:8.0.0'
-    implementation 'com.umeng.umsdk:common:2.0.0'
-    implementation 'com.umeng.umsdk:push:5.0.2'
+
+    /*implementation 'com.umeng.umsdk:analytics:8.0.0'
+        implementation 'com.umeng.umsdk:common:2.0.0'
+        implementation 'com.umeng.umsdk:push:5.0.2'*/
     implementation project(':xbanner')
 
     /*EventBus*/
@@ -235,6 +237,29 @@ dependencies {
     implementation files('libs/ShareSDK-Wechat-3.8.1.jar')
     implementation files('libs/ShareSDK-Wechat-Core-3.8.1.jar')
     implementation files('libs/ShareSDK-Wechat-Moments-3.8.1.jar')
+
+    /*implementation files('libs/umeng-common-9.4.0.jar')
+        implementation files('libs/umeng-push-6.3.3.jar')
+        implementation files('libs/accs_sdk_taobao-3.4.2.7-umeng.jar')
+        implementation files('libs/accs_sdk_aranger-1.0.6.jar')
+        implementation(name: 'umeng-asms-armeabi-v1.2.3', ext: 'aar')*/
+
+    //
+    implementation files('libs/umeng-agoo-accs-3.4.2.7.1.jar')
+    implementation files('libs/umeng-agoo_aranger-1.0.6.jar')
+    implementation files('libs/umeng-agoo_networksdk-3.5.8.4.jar')
+    implementation files('libs/umeng-alicloud-httpdns-1.3.2.3.1.jar')
+    implementation files('libs/umeng-alicloud-utils-2.0.0.jar')
+    implementation files('libs/umeng-alicloud_beacon-1.0.5.jar')
+    implementation files('libs/umeng-common-9.4.4.jar')
+    //implementation files('libs/umeng-utdid-1.5.2.3.jar')
+   // implementation files('libs/utdid4all-1.5.2.1-proguard.jar')
+
+    implementation(name: 'umeng-abtest-v1.0.0', ext: 'aar')
+    implementation(name: 'umeng-agoo_tnet4android-3.1.14.10.1', ext: 'aar')
+    implementation(name: 'umeng-asms-armeabi-v1.4.1', ext: 'aar')
+    implementation(name: 'umeng-push-6.4.7', ext: 'aar')
+
 }
 //MobSDK {
 //    appKey "2822d6f98b11e"

app/huawei/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":367,"versionName":"3.6.7","enabled":true,"outputFile":"app-huawei-release.apk","fullName":"huaweiRelease","baseName":"huawei-release"},"path":"app-huawei-release.apk","properties":{}}]

app/oppo/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":367,"versionName":"3.6.7","enabled":true,"outputFile":"app-oppo-release.apk","fullName":"oppoRelease","baseName":"oppo-release"},"path":"app-oppo-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -57,9 +57,17 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:name">
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
+
+
+
         <!--百度地图-->
         <!-- AK鉴权 -->
         <!-- meta-data需要写在application中 -->
+
+
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="35pZiDIyqVLUkKTn4ccY2qz1j3mHKnd0" />  <!-- http://lbsyun.baidu.com/apiconsole/key -->

app/src/main/java/com/youpu/base/BaseActivity.java

@@ -79,7 +79,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         setContentView(getLayout());
 //        注意绑定要在绑定试图之后写
         mUnbinder = ButterKnife.bind(this);
-        PushAgent.getInstance(mContext).onAppStart();//统计应用启动数据
+   //     PushAgent.getInstance(mContext).onAppStart();//统计应用启动数据
         setOrientation();
        /* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {//5.0 全透明状态栏
             View decorView = getWindow().getDecorView();

app/src/main/java/com/youpu/base/BaseApplication.java

@@ -83,15 +83,15 @@ public class BaseApplication extends MultiDexApplication {
 
 
         //友盟统计推送初始化
-        UMConfigure.setLogEnabled(true);//日志
+      //  UMConfigure.setLogEnabled(true);//日志
 //        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "6397de6a4aa24f51076828513f7ce40f");
 //        UMConfigure.init(this, "5bcd2bfab465f507f90004af", "Up", UMConfigure.DEVICE_TYPE_PHONE, "6397de6a4aa24f51076828513f7ce40f");
 //        // PushSDK初始化(如使用推送SDK，必须调用此方法)
 //        initUpush();
-        UMConfigure.init(this, "5bcd2bfab465f507f90004af", "Up", UMConfigure.DEVICE_TYPE_PHONE,
-                "6397de6a4aa24f51076828513f7ce40f");
+  /*      UMConfigure.init(this, "5bcd2bfab465f507f90004af", "Up", UMConfigure.DEVICE_TYPE_PHONE,
+                "6397de6a4aa24f51076828513f7ce40f");*/
         //PushSDK初始化(如使用推送SDK，必须调用此方法)
-        initUpush();
+       // initUpush();
     }
 
     private void initUpush() {

app/src/main/java/com/youpu/google/activity/CaptureActivity.java

@@ -51,6 +51,7 @@ import java.util.Vector;
  *
  * @author Ryan.Tang
  */
+@SuppressWarnings("all")
 public class CaptureActivity extends AppCompatActivity implements Callback {
 
     private static final int REQUEST_CODE_SCAN_GALLERY = 100;
@@ -169,7 +170,6 @@ public class CaptureActivity extends AppCompatActivity implements Callback {
             }
         });
     }
-
     /**
      * 扫描二维码图片的方法
      * @param uri
@@ -181,7 +181,6 @@ public class CaptureActivity extends AppCompatActivity implements Callback {
         }
         Hashtable<DecodeHintType, String> hints = new Hashtable<>();
         hints.put(DecodeHintType.CHARACTER_SET, "UTF8"); //设置二维码内容的编码
-
         scanBitmap = BitmapUtil.decodeUri(this, uri, 500, 500);
         RGBLuminanceSource source = new RGBLuminanceSource(scanBitmap);
         BinaryBitmap bitmap1 = new BinaryBitmap(new HybridBinarizer(source));
@@ -211,7 +210,6 @@ public class CaptureActivity extends AppCompatActivity implements Callback {
         }
         decodeFormats = null;
         characterSet = null;
-
         playBeep = true;
         AudioManager audioService = (AudioManager) getSystemService(AUDIO_SERVICE);
         if (audioService.getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {

app/src/main/java/com/youpu/model/entity/HomeTopDataEntity.java

@@ -20,6 +20,15 @@ public class HomeTopDataEntity {
     private DataBean data;
     private String message;
 
+    @Override
+    public String toString() {
+        return "HomeTopDataEntity{" +
+                "code='" + code + '\'' +
+                ", data=" + data +
+                ", message='" + message + '\'' +
+                '}';
+    }
+
     public String getCode() {
         return code;
     }
@@ -57,6 +66,18 @@ public class HomeTopDataEntity {
         private List<BannerListBean> bannerList;
         private List<InfoListBean> infoList;
         private List<SelectProject2Bean> selectProject2;
+
+        @Override
+        public String toString() {
+            return "DataBean{" +
+                    "numberList=" + numberList +
+                    ", bannerList=" + bannerList +
+                    ", infoList=" + infoList +
+                    ", selectProject2=" + selectProject2 +
+                    ", selectProject1=" + selectProject1 +
+                    '}';
+        }
+
         private List<SelectProject1Bean> selectProject1;
 
         public NumberListBean getNumberList() {
@@ -109,6 +130,17 @@ public class HomeTopDataEntity {
 
             private String brands;
             private String projects;
+
+            @Override
+            public String toString() {
+                return "NumberListBean{" +
+                        "brands='" + brands + '\'' +
+                        ", projects='" + projects + '\'' +
+                        ", companys='" + companys + '\'' +
+                        ", agents='" + agents + '\'' +
+                        '}';
+            }
+
             private String companys;
             private String agents;
 
@@ -158,6 +190,16 @@ public class HomeTopDataEntity {
             private String title;
             private String url;
 
+            @Override
+            public String toString() {
+                return "BannerListBean{" +
+                        "img_path='" + img_path + '\'' +
+                        ", id=" + id +
+                        ", title='" + title + '\'' +
+                        ", url='" + url + '\'' +
+                        '}';
+            }
+
             public String getImg_path() {
                 return img_path;
             }
@@ -235,6 +277,19 @@ public class HomeTopDataEntity {
             private int projectId;
             private String pictures;
 
+            @Override
+            public String toString() {
+                return "SelectProject2Bean{" +
+                        "address='" + address + '\'' +
+                        ", price='" + price + '\'' +
+                        ", price_u='" + price_u + '\'' +
+                        ", houseType='" + houseType + '\'' +
+                        ", project_name='" + project_name + '\'' +
+                        ", projectId=" + projectId +
+                        ", pictures='" + pictures + '\'' +
+                        '}';
+            }
+
             public String getPrice_u() {
                 return price_u;
             }
@@ -308,6 +363,20 @@ public class HomeTopDataEntity {
             private String houseType;
             private String project_name;
             private int projectId;
+
+            @Override
+            public String toString() {
+                return "SelectProject1Bean{" +
+                        "address='" + address + '\'' +
+                        ", price='" + price + '\'' +
+                        ", price_u='" + price_u + '\'' +
+                        ", houseType='" + houseType + '\'' +
+                        ", project_name='" + project_name + '\'' +
+                        ", projectId=" + projectId +
+                        ", pictures='" + pictures + '\'' +
+                        '}';
+            }
+
             private String pictures;
 
             public String getPrice_u() {

app/src/main/java/com/youpu/model/entity/MapSeekHouseEntity.java

@@ -18,6 +18,16 @@ public class MapSeekHouseEntity {
 
     private String code;
     private String message;
+
+    @Override
+    public String toString() {
+        return "MapSeekHouseEntity{" +
+                "code='" + code + '\'' +
+                ", message='" + message + '\'' +
+                ", projectList=" + projectList +
+                '}';
+    }
+
     private List<ProjectListBean> projectList;
 
     public String getCode() {
@@ -59,6 +69,19 @@ public class MapSeekHouseEntity {
         private String projectType;
         private String projectName;
         private String projectId;
+
+        @Override
+        public String toString() {
+            return "ProjectListBean{" +
+                    "lng='" + lng + '\'' +
+                    ", houseType='" + houseType + '\'' +
+                    ", projectType='" + projectType + '\'' +
+                    ", projectName='" + projectName + '\'' +
+                    ", projectId='" + projectId + '\'' +
+                    ", lat='" + lat + '\'' +
+                    '}';
+        }
+
         private String lat;
 
         public String getLng() {

app/src/main/java/com/youpu/view/activity/BrandDetailsActivity.java

@@ -1,5 +1,4 @@
 package com.youpu.view.activity;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -21,7 +20,6 @@ import com.youpu.adapter.BrandDetailsUserAdapter;
 import com.youpu.api.Constants;
 import com.youpu.base.BaseActivity;
 import com.youpu.model.entity.BrandDetailsEntity;
-import com.youpu.model.entity.BrandUserEntity;
 import com.youpu.presenter.impl.BrandDetailsAPresenterImpl;
 import com.youpu.presenter.inter.IBrandDetailsAPresenter;
 import com.youpu.util.StatusBarUtil2;
@@ -141,8 +139,6 @@ public class BrandDetailsActivity extends BaseActivity implements View.OnClickLi
         if (url.size() == 0) {
             url.add(Constants.DEFAULT_PHOTO);
         }
-
-
         vp_details_img.setAdapter(brandDetailsPhotoAdapter);
         final int i = vp_details_img.getCurrentItem();
         vp_details_img.setCurrentItem(6000 * (i % url.size() + 1));//设置初始显示位置

app/src/main/java/com/youpu/view/activity/BrandManageAllActivity.java

@@ -10,7 +10,7 @@ import android.widget.TextView;
 import com.youpu.R;
 import com.youpu.base.BaseActivity;
 
-import org.android.spdy.Intenalcb;
+
 import org.w3c.dom.Text;
 
 import butterknife.BindView;

app/src/main/java/com/youpu/view/activity/BusinessManagerActivity.java

@@ -73,6 +73,8 @@ public class BusinessManagerActivity extends BaseActivity implements View.OnClic
         super.onCreate(savedInstanceState);
     }
 
+
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {

app/src/main/java/com/youpu/view/activity/MainActivity.java

@@ -8,6 +8,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.Uri;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Environment;
@@ -209,7 +210,7 @@ public class MainActivity extends BaseActivity implements IMainAView, View.OnCli
             getpermission();
         }
 
-
+        initPop();
     }
 
     /**
@@ -637,4 +638,42 @@ public class MainActivity extends BaseActivity implements IMainAView, View.OnCli
         super.onDestroy();
     }
 
+    AlertDialog dialog;
+    private void initPop() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(mContext, R.style.DialogTheme);
+        View view = View.inflate(mContext, R.layout.dialog_first_jr, null);
+        //将自定义的布局文件设置给dialog
+        builder.setView(view);
+
+        AlertDialog dialog = builder.create();
+        Button btn_dialog_first_know = view.findViewById(R.id.btn_dialog_first_know);
+
+        RelativeLayout rl_jr_close = view.findViewById(R.id.rl_jr_close);
+
+        rl_jr_close.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        btn_dialog_first_know.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+
+
+                Intent intent= new Intent();
+                intent.setAction("android.intent.action.VIEW");
+                Uri content_url = Uri.parse("https://a.app.qq.com/o/simple.jsp?pkgname=com.up.upcbmls");
+                intent.setData(content_url);
+                startActivity(intent);
+
+                dialog.dismiss();
+            }
+        });
+        dialog.setCancelable(false);//点击区域外不关闭
+        dialog.show();
+    }
+
 }

app/src/main/java/com/youpu/view/activity/SaleBgDetailsActivity.java

@@ -876,7 +876,7 @@ ivrType：1-固话；2-400电话*/
             bmp.compress(Bitmap.CompressFormat.JPEG, 100, out);
             Log.e("saveBitMap", "saveBitmap: 图片保存到" + Environment.getExternalStorageDirectory() + "/maipubao/" + bitmapName);
             QQFilePath = Environment.getExternalStorageDirectory() + "/maipubao/" + "mpbfx.jpg";
-            showShare();
+
             out.flush();
             out.close();
         } catch (FileNotFoundException e) {

app/src/main/java/com/youpu/wxapi/WXPayEntryActivity.java

@@ -4,20 +4,17 @@ package com.youpu.wxapi;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram.Resp;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.youpu.api.Constants;
 import com.youpu.base.BaseApplication;
-import com.youpu.view.activity.GoPayActivity;
 import com.youpu.view.activity.MyMemberActivity;
 
 public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {

app/src/main/res/layout/dialog_first_jr.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="248dp"
+        android:layout_height="242dp"
+        android:background="@mipmap/home_pop_youpu_img">
+        <!--我知道了-->
+        <Button
+            android:id="@+id/btn_dialog_first_know"
+            android:layout_width="202dp"
+            android:layout_height="36dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/shape_shoot_shop_commit_bg"
+            android:text="下载优铺商办"
+            android:textColor="@color/white"
+            android:textSize="13dp" />
+
+        <RelativeLayout
+            android:id="@+id/rl_jr_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:padding="8dp">
+
+            <ImageView
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:src="@mipmap/iv_close" />
+        </RelativeLayout>
+    </RelativeLayout>
+</LinearLayout>

app/vivo/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":367,"versionName":"3.6.7","enabled":true,"outputFile":"app-vivo-release.apk","fullName":"vivoRelease","baseName":"vivo-release"},"path":"app-vivo-release.apk","properties":{}}]

app/xiaomi/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":367,"versionName":"3.6.7","enabled":true,"outputFile":"app-xiaomi-release.apk","fullName":"xiaomiRelease","baseName":"xiaomi-release"},"path":"app-xiaomi-release.apk","properties":{}}]

app/yingyongbao/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":367,"versionName":"3.6.7","enabled":true,"outputFile":"app-yingyongbao-release.apk","fullName":"yingyongbaoRelease","baseName":"yingyongbao-release"},"path":"app-yingyongbao-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":372,"versionName":"3.7.2","enabled":true,"outputFile":"app-yingyongbao-release.apk","fullName":"yingyongbaoRelease","baseName":"yingyongbao-release"},"path":"app-yingyongbao-release.apk","properties":{}}]

build.gradle

@@ -5,9 +5,11 @@ buildscript {
     repositories {
         google()
         //阿里镜像
-        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
 //        jcenter()
         maven { url 'https://dl.bintray.com/umsdk/release' }
+
+        maven{ url'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven{ url'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
@@ -23,11 +25,14 @@ allprojects {
     repositories {
 //        jcenter()
         //阿里镜像
-        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         maven { url "https://jitpack.io" }
         mavenCentral()
         maven { url 'https://dl.bintray.com/umsdk/release' }
         google()
+
+
+        maven{ url'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven{ url'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
         // 添加下面的内容
         flatDir {
             dirs 'libs'

colortrackview/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 21