更新扫描插件

wxr

2022-01-12 1b40f1180fa2f7b9e4f6ded651cf66699c7e5db7

更新扫描插件

 DLL/Scan/ScanSdk.dll

Binary files differ

 DLL/UMeng/UMSdkDroid.dll

Binary files differ

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -177,6 +177,12 @@
    <Reference Include="ys">
      <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
    </Reference>
    <Reference Include="UMSdkDroid">
      <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
    </Reference>
    <Reference Include="ScanSdk">
      <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MainActivity.cs" />
@@ -203,6 +209,8 @@
    <Compile Include="Other\HDLONUtils.cs" />
    <Compile Include="WebviewActivity.cs" />
    <Compile Include="AgreementActivity.cs" />
    <Compile Include="Zxing\CustomCaptureActivity.cs" />
    <Compile Include="Zxing\ScanActivity.cs" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\agconnect-services.json" />
@@ -469,6 +477,10 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </AndroidResource>
    <AndroidResource Include="Resources\layout\activity_webview.xml">
      <SubType></SubType>
      <Generator></Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\layout\activity_zxing_layout.xml">
      <SubType></SubType>
      <Generator></Generator>
    </AndroidResource>
@@ -1418,6 +1430,7 @@
  <ItemGroup />
  <ItemGroup>
    <Folder Include="libs\arm64-v8a\" />
    <Folder Include="Zxing\" />
  </ItemGroup>
  <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201071" android:versionName="1.5.2" package="com.hdl.onpro">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201121" android:versionName="1.5.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools">
    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
    <!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
    <!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->
    <!--<uses-permission android:name="android.permission.READ_PHONE_STATE"/>-->
    <!--<uses-permission android:name="android.permission.INTERNET"/>-->
    <!-- 乐橙可视对讲需要的权限 -->
    <!--<uses-permission android:name="android.permission.INTERNET" />-->
    <!--网络访问-->
@@ -83,6 +89,16 @@
    <uses-permission android:name="android.permission.READ_LOGS" />
    <!-- 极光推送结束 -->
    <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
        <!--/扫描二维码activity-->
        <!--<activity
            android:name="com.journeyapps.barcodescanner.CaptureActivity"
            android:screenOrientation="portrait"
            tools:replace="screenOrientation" />-->
        <!--CustomCaptureActivity-->
        <!--<activity
            android:name=".CustomCaptureActivity"
            android:screenOrientation="portrait"
            tools:replace="screenOrientation" />-->
        <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
        </provider>

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL-ON_Android/Resources/layout/activity_zxing_layout.xml

New file
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto/"
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <com.journeyapps.barcodescanner.DecoratedBarcodeView
        android:id="@+id/zxing_barcode_scanner"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:zxing_preview_scaling_strategy="centerCrop"
        app:zxing_use_texture_view="true"/>
</LinearLayout>

 HDL-ON_Android/Resources/layout/zxing_layout.xml

@@ -1,35 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
      android:orientation="vertical"
      android:layout_width="match_parent"
      android:layout_height="match_parent">
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:gravity="center">

      <GateWay.Droid.ZXingOverlayView
      android:layout_width="match_parent"
      android:layout_height="match_parent"/>
    <RelativeLayout
    android:layout_width="fill_parent"
    android:layout_height="50dp"
    android:layout_gravity="top"
    android:background="#99000000">
<!--
    <ImageButton
        android:id="@+id/capture_imageview_back"
        android:layout_width="42dp"
        android:layout_height="42dp"
        android:layout_centerVertical="true"
        android:background="@drawable/abc_ic_ab_back_material"/>
-->
    <TextView
        android:id="@+id/tv_zxing_scan"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
    <GateWay.Droid.ZXingOverlayView
        android:layout_width="match_parent"
        android:layout_height="1400dp"
        android:layout_centerInParent="true"
        android:textColor="#ffffffff"
        android:textSize="20sp"
        android:text="扫一扫"/>
        />

</RelativeLayout>
        <RelativeLayout
            android:layout_width="fill_parent"
            android:layout_height="50dp"
            android:layout_gravity="top"
            android:backgroundTint="#99000000">

            <TextView
                android:id="@+id/tv_zxing_scan"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_centerInParent="true"
                android:textColor="#ffffffff"
                android:textSize="20sp"
                android:text="扫一扫"/>

        </RelativeLayout>

  <TextView
      android:id="@+id/tv_zxing_back"
@@ -52,7 +49,6 @@
      android:paddingBottom="10dp"
      android:text="闪光灯"
      android:layout_alignParentRight ="true"
      android:layout_alignParentBottom="true"
        />
      android:layout_alignParentBottom="true"/>
</RelativeLayout>


 HDL-ON_Android/Scan.cs

@@ -6,65 +6,89 @@

namespace HDL_ON
{
    public class Scan
    public class Scan: Java.Lang.Object,HDL_ON_Android.ScanActivity.ScanResult
    {
        public Scan()
        {
        }

        public static string TipMsg = string.Empty;
        private static Scan ins;

        static MobileBarcodeScanner scanner;
        public static void OpenScan(Action<string> action)
        public static Scan Ins
        {
            string cancel = "取消";
            string flashText = "";
            string titleText = "二维码扫描";
            if (Language.CurrentLanguage != "Chinese")
            get
            {
                cancel = "Cancel";
                flashText = "";
                titleText = "Scan";
                if (ins == null)
                {
                    ins = new Scan();
                }
                return ins;
            }

        }

        public string TipMsg = string.Empty;

        Action<string> resultAction;
        static MobileBarcodeScanner scanner;


        public void OpenScan(Action<string> action)
        {
            resultAction = action;
            //string cancel = "取消";
            //string flashText = "";
            //string titleText = "二维码扫描";
            //if (Language.CurrentLanguage != "Chinese")
            //{
            //    cancel = "Cancel";
            //    flashText = "";
            //    titleText = "Scan";
            //}

            ((BaseActivity)Shared.Application.Activity).SetCamera(async (obj) =>
            {
                if (obj)
                if (obj)//权限是否打开
                {
                    if (scanner == null)
                    {
                        MobileBarcodeScanner.Initialize(Shared.Application.Activity.Application);
                        var mZXingCustomScanView = new ZXingCustomScanView(Shared.Application.Activity.Application);
                        mZXingCustomScanView.cancelTextView.Text = cancel;
                        mZXingCustomScanView.flashTextView.Text = flashText;
                        mZXingCustomScanView.titleTextView.Text = titleText;
                        var bOn = false;
                        scanner = new ZXing.Mobile.MobileBarcodeScanner()
                        {
                            UseCustomOverlay = true,
                            CustomOverlay = mZXingCustomScanView
                        };

                        mZXingCustomScanView.OnCancel += () =>
                        {
                        var intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.ScanActivity));
                        Shared.Application.Activity.StartActivity(intent);

                            scanner?.Cancel();
                        };
                        HDL_ON_Android.ScanActivity.InitDdd(this);

                        mZXingCustomScanView.OnTorch += () =>
                        {
                            bOn = !bOn;
                            scanner?.Torch(bOn);
                        };
                        //MobileBarcodeScanner.Initialize(Shared.Application.Activity.Application);
                        //var mZXingCustomScanView = new ZXingCustomScanView(Shared.Application.Activity.Application);
                        //mZXingCustomScanView.cancelTextView.Text = cancel;
                        //mZXingCustomScanView.flashTextView.Text = flashText;
                        //mZXingCustomScanView.titleTextView.Text = titleText;
                        //mZXingCustomScanView.SetMinimumWidth( 1800);
                        //var bOn = false;
                        //scanner = new ZXing.Mobile.MobileBarcodeScanner()
                        //{
                        //    UseCustomOverlay = true,
                        //    CustomOverlay = mZXingCustomScanView
                        //};
                        ////scanner.CustomOverlay.width
                        //mZXingCustomScanView.OnCancel += () =>
                        //{

                        //    scanner?.Cancel();
                        //};

                        //mZXingCustomScanView.OnTorch += () =>
                        //{
                        //    bOn = !bOn;
                        //    scanner?.Torch(bOn);
                        //};
                    }

                    var result = await scanner.Scan();

                    if (result != null)
                        action?.Invoke(result.Text);
                    else
                        action?.Invoke(null);

                    //var result = await scanner.Scan();
                    //if (result != null)
                    //    action?.Invoke(result.Text);
                    //else
                    //    action?.Invoke(null);
                }
                else
                {
@@ -149,5 +173,22 @@
        //        }
        //    });
        //}


        //static void initFromCameraParameters(Android.Graphics.Camera camera)
        //{
        //    //camera.SetLocation
        //}

        public void onResult(string result)
        {
            if (!string.IsNullOrEmpty( result))
                resultAction?.Invoke(result);
            else
                resultAction?.Invoke(null);
        }
    }



}

 HDL-ON_Android/SplashActivity.cs

@@ -28,6 +28,10 @@
                {
                    if (!OnAppConfig.Instance.FirstRunApp)
                    {
                        //初始化友盟sdk
                        Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
                        //初始化友盟sdk config
                        Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
                        ////打开baseActivity
                        Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);
                        StartActivityForResult(i, 1);
@@ -61,6 +65,10 @@
            }
            else
            {
                //初始化友盟sdk
                Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
                //初始化友盟sdk config
                Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android","");
                ////打开baseActivity
                Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);
                StartActivityForResult(i, 1);

 HDL-ON_Android/ZXingOverlayView.cs

@@ -7,7 +7,7 @@

namespace GateWay.Droid
{
    public class ZXingOverlayView: View
    public class ZXingOverlayView : View
    {
        float screenRate;
        float lineWidth;
@@ -50,7 +50,7 @@
            lineWidth = 2 * context.Resources.DisplayMetrics.Density;
            textSize = 16 * context.Resources.DisplayMetrics.Density;

    

        }

        //添加屏幕半透明填充色

 HDL-ON_Android/Zxing/CustomCaptureActivity.cs

New file
@@ -0,0 +1,102 @@

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

using Android.App;
using Android.Content;
using Android.Content.PM;
using Android.OS;
using Android.Runtime;
using Android.Support.V7.App;
using Android.Views;
using Android.Widget;
using Com.Journeyapps.Barcodescanner;

namespace HDL_ON_Android
{
    [Activity(Label = "CustomCaptureActivity", Theme = "@style/MyTheme1", ScreenOrientation = ScreenOrientation.Portrait)]
    public class CustomCaptureActivity : AppCompatActivity//Activity
    {

        /**
         * 条形码扫描管理器
         */
        private CaptureManager mCaptureManager;

        /**
         * 条形码扫描视图
         */
        private DecoratedBarcodeView mBarcodeView;


        protected override void OnCreate(Bundle savedInstanceState)
        {
            base.OnCreate(savedInstanceState);

            SetContentView(Resource.Layout.activity_zxing_layout);
            mBarcodeView = (DecoratedBarcodeView)FindViewById(Resource.Id.zxing_barcode_scanner);

            mCaptureManager = new CaptureManager(this, mBarcodeView);
            mCaptureManager.InitializeFromIntent(this.Intent, savedInstanceState);//getIntent(),
            mCaptureManager.Decode();
        }


        protected override void OnResume()
        {
            base.OnResume();
            mCaptureManager.OnResume();
        }


        protected override void OnPause()
        {
            base.OnPause();
            mCaptureManager.OnPause();
        }

        protected override void OnDestroy()
        {
            base.OnDestroy();
            mCaptureManager.OnDestroy();
        }

        protected override void OnSaveInstanceState(Bundle outState)
        {
            base.OnSaveInstanceState(outState);
            mCaptureManager.OnSaveInstanceState(outState);
        }


        /**
         * 权限处理
         */
        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults)
        {
            int[] rg = new int[grantResults.Length] ;
            foreach(var g in grantResults)
            {
                rg.Append((int)g);
            }
            mCaptureManager.OnRequestPermissionsResult(requestCode, permissions, rg);
        }
        //public override void OnRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults)
        //{
        //    mCaptureManager.onRequestPermissionsResult(requestCode, permissions, grantResults);
        //}

        /**
         * 按键处理
         */
        public override bool OnKeyDown([GeneratedEnum] Keycode keyCode, KeyEvent e)
        {
            //return base.OnKeyDown(keyCode, e);
            return mBarcodeView.OnKeyDown(keyCode, e) || base.OnKeyDown(keyCode, e);
        }
        //public boolean onKeyDown(int keyCode, KeyEvent event) {
        //    return mBarcodeView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
        //}
    }
}

 HDL-ON_Android/Zxing/ScanActivity.cs

New file
@@ -0,0 +1,82 @@

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

using Android.App;
using Android.Content;
using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using Com.Google.Zxing.Integration.Android;

namespace HDL_ON_Android
{
    [Activity(Label = "ScanActivity")]
    public class ScanActivity : Activity
    {
        protected override void OnCreate(Bundle savedInstanceState)
        {
            base.OnCreate(savedInstanceState);

            // Create your application here



            IntentIntegrator intentIntegrator = new IntentIntegrator(this);
            intentIntegrator.SetCaptureActivity(Java.Lang.Class.FromType(typeof(HDL_ON_Android.CustomCaptureActivity)));
            intentIntegrator.SetOrientationLocked(false);
            intentIntegrator.SetPrompt("");
            intentIntegrator.InitiateScan();

        }

        protected override void OnRestart()
        {
            base.OnRestart();
            Finish();
        }




        protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
        {
            // 获取解析结果
            IntentResult result = IntentIntegrator.ParseActivityResult(requestCode, (int)resultCode, data);
            if (result != null)
            {
                if (result.Contents != null)
                {
#if DEBUG
                    Console.WriteLine("二维码扫描结果:" + result.Contents);
#endif
                    if(scanResult != null)
                    {
                        scanResult.onResult(result.Contents);
                    }
                }
            }
            else
            {
                base.OnActivityResult(requestCode, resultCode, data);
            }
        }

        public static ScanResult scanResult;

        public static void InitDdd(ScanResult sr)
        {
            scanResult = sr;
        }

        public interface ScanResult
        {
            void onResult(string result);
        }
    }


}

 HDL-ON_iOS/Info.plist

@@ -100,9 +100,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.5.102101041</string>
    <string>1.5.102101121</string>
    <key>CFBundleVersion</key>
    <string>1.5.101041</string>
    <string>1.5.101121</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>

 HDL-ON_iOS/Scan.cs

@@ -8,13 +8,27 @@
    public class Scan
    {

        public static string TipMsg = "";
        public string TipMsg = "";
        public Scan()
        {
        }
        private static Scan ins;

        public static Scan Ins
        {
            get
            {
                if (ins == null)
                {
                    ins = new Scan();
                }
                return ins;
            }

        }

        static MobileBarcodeScanner scanner;
        public static async void OpenScan(Action<string> action)
        public async void OpenScan(Action<string> action)
        {
            string cancel = "取消";
            string flashText = "";

 HDL_ON/Entity/Function/Function.cs

@@ -170,6 +170,9 @@
                    case SPK.HvacFan:
                        iconPath = "electricalfan";
                        break;
                    case SPK.HvacFloorHeat:
                        iconPath = "floorHeatstandard";
                        break;
                    case SPK.ElectricTuyaFan2:
                        iconPath = "electricaltyqborgovyzytytz";
                        break;

 HDL_ON/Entity/Function/Scene.cs

@@ -515,7 +515,7 @@
            var cctState = status.Find((obj) => obj.key == FunctionAttributeKey.CCT);
            if(cctState != null)
            {
                sceneFunctionInfo += cctState.value + "%" + " ";
                sceneFunctionInfo += cctState.value + "K" + " ";
            }
            var rgbState = status.Find((obj) => obj.key == FunctionAttributeKey.RGB);
            if(rgbState!=null)

 HDL_ON/UI/BindingResidence/BindingResidencePage.cs

@@ -93,13 +93,13 @@
            {
                if (Language.CurrentLanguage == "Chinese")
                {
                    Scan.TipMsg = "您已拒绝App相机访问权限，这将导致您无法使用扫描二维码绑定我的家庭，但您可以通过加入其他用户的家庭，体验智能家居服务，如需启用绑定我的家庭服务，请前往手机系统设置打开相关权限";
                    Scan.Ins.TipMsg = "您已拒绝App相机访问权限，这将导致您无法使用扫描二维码绑定我的家庭，但您可以通过加入其他用户的家庭，体验智能家居服务，如需启用绑定我的家庭服务，请前往手机系统设置打开相关权限";
                }
                else
                {
                    Scan.TipMsg = "You have denied access to the app camera, which will make you unable to bind my family with the scanned QR code, but you can experience smart home services by joining other users' families. To enable the bind my family service, please go to the mobile phone system settings to open the relevant permissions";
                    Scan.Ins.TipMsg = "You have denied access to the app camera, which will make you unable to bind my family with the scanned QR code, but you can experience smart home services by joining other users' families. To enable the bind my family service, please go to the mobile phone system settings to open the relevant permissions";
                }
                Scan.OpenScan((scanString) =>
                Scan.Ins.OpenScan((scanString) =>
                {
                    //执行绑定住宅
                    this.DoBindResidence(scanString);
@@ -226,7 +226,7 @@

            btnRedo.MouseUpEventHandler += (sender, e) =>
            {
                Scan.OpenScan((scanString) =>
                Scan.Ins.OpenScan((scanString) =>
                {
                    frameBack.Close();
                    //执行绑定住宅

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs

@@ -468,7 +468,7 @@

                EventHandler<MouseEventArgs> skipEvent= (sender, e) =>
                {
                    var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
                    var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(ssf);
                    ssf.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -560,7 +560,7 @@

                EventHandler<MouseEventArgs> skipEvent = (sender, e) =>
                {
                    var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
                    var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(ssf);
                    ssf.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs

@@ -136,7 +136,7 @@
                textView.AddChidren(btnScan);
                btnScan.MouseUpEventHandler = (sender, e) =>
                {
                    Scan.OpenScan((scanString) =>
                    Scan.Ins.OpenScan((scanString) =>
                    {
                        editText.Text = scanString;
                    });

 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs

@@ -88,7 +88,7 @@
            textView.AddChidren(btnScan);
            btnScan.MouseUpEventHandler = (sender, e) =>
            {
                Scan.OpenScan((scanString) =>
                Scan.Ins.OpenScan((scanString) =>
                {
                    editText.Text = scanString;
                });

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs

@@ -85,7 +85,7 @@
        {
            btnScan.MouseUpEventHandler = (sender, e) =>
            {
                Scan.OpenScan((scanString) =>
                Scan.Ins.OpenScan((scanString) =>
                {
                    action(scanString);
                });

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs

@@ -560,7 +560,7 @@

            btnAddResidenceText.MouseUpEventHandler = (sender, e) =>
            {
                Scan.OpenScan((scanString) =>
                Scan.Ins.OpenScan((scanString) =>
                {
                    if (string.IsNullOrEmpty(scanString))
                    {

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferInputPage.cs

@@ -97,7 +97,7 @@
            bodyFrameLayout.AddChidren(btnQrcode);
            btnQrcode.ButtonClickEvent += (sender, e) =>
            {
                Scan.OpenScan((scanString) =>
                Scan.Ins.OpenScan((scanString) =>
                {
                    if (string.IsNullOrEmpty(scanString) == true)
                    {

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs

@@ -1012,6 +1012,13 @@
                        arcBar.IsClickable = false;
                        arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
                    }

                    if(device.GetAttrState(FunctionAttributeKey.Mode) == "dry")
                    {
                        arcBar.IsOffline = true;
                        arcBar.IsClickable = false;

                    }
                }

            });

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/.idea/compiler.xml

New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="CompilerConfiguration">

    <bytecodeTargetLevel target="1.8" />

  </component>

</project>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/.idea/gradle.xml

New file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="GradleMigrationSettings" migrationVersion="1" />

  <component name="GradleSettings">

    <option name="linkedExternalProjectsSettings">

      <GradleProjectSettings>

        <option name="testRunner" value="GRADLE" />

        <option name="distributionType" value="DEFAULT_WRAPPED" />

        <option name="externalProjectPath" value="$PROJECT_DIR$" />

        <option name="gradleJvm" value="#JAVA_HOME" />

        <option name="modules">

          <set>

            <option value="$PROJECT_DIR$" />

            <option value="$PROJECT_DIR$/app" />

          </set>

        </option>

        <option name="resolveModulePerSourceSet" value="false" />

      </GradleProjectSettings>

    </option>

  </component>

</project>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/.idea/jarRepositories.xml

New file
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="RemoteRepositoriesConfiguration">

    <remote-repository>

      <option name="id" value="central" />

      <option name="name" value="Maven Central repository" />

      <option name="url" value="https://repo1.maven.org/maven2" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="jboss.community" />

      <option name="name" value="JBoss Community repository" />

      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="MavenRepo" />

      <option name="name" value="MavenRepo" />

      <option name="url" value="https://repo.maven.apache.org/maven2/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven9" />

      <option name="name" value="maven9" />

      <option name="url" value="https://jitpack.io" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven10" />

      <option name="name" value="maven10" />

      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven8" />

      <option name="name" value="maven8" />

      <option name="url" value="https://maven.aliyun.com/repository/public" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven5" />

      <option name="name" value="maven5" />

      <option name="url" value="https://maven.aliyun.com/repository/public/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven6" />

      <option name="name" value="maven6" />

      <option name="url" value="https://maven.aliyun.com/repository/google" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven7" />

      <option name="name" value="maven7" />

      <option name="url" value="https://maven.aliyun.com/repository/jcenter" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven" />

      <option name="name" value="maven" />

      <option name="url" value="https://maven.aliyun.com/repository/central" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven4" />

      <option name="name" value="maven4" />

      <option name="url" value="https://maven.aliyun.com/repository/gradle-plugin" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven11" />

      <option name="name" value="maven11" />

      <option name="url" value="https://plugins.gradle.org/m2/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="Google" />

      <option name="name" value="Google" />

      <option name="url" value="https://dl.google.com/dl/android/maven2/" />

    </remote-repository>

  </component>

</project>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/.idea/misc.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="ExternalStorageConfigurationManager" enabled="true" />

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />

</project>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/.idea/vcs.xml

New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
  </component>
</project>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/build.gradle

New file
@@ -0,0 +1,58 @@
plugins {
    id 'com.android.application'
}

android {
    compileSdkVersion 31
    defaultConfig {
        applicationId "com.hdl.onproumengsdk"
        minSdkVersion 23
        targetSdkVersion 31
        versionCode 1
        versionName "1.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
        debug {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
    buildFeatures {
        viewBinding true
    }
}

dependencies {

    implementation 'androidx.appcompat:appcompat:1.3.1'
    implementation 'com.google.android.material:material:1.4.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
    implementation 'androidx.navigation:navigation-fragment:2.3.5'
    implementation 'androidx.navigation:navigation-ui:2.3.5'
    testImplementation 'junit:junit:4.+'
    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

    implementation fileTree(include:['*.jar'], dir:'libs')
    // 下面各SDK根据宿主App是否使用相关业务按需引入。
    // 友盟统计SDK
    implementation  'com.umeng.umsdk:common:9.4.4'// 必选
    implementation  'com.umeng.umsdk:asms:1.4.1'// 必选
    implementation 'com.umeng.umsdk:apm:1.5.2' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
    implementation  'com.umeng.umsdk:abtest:1.0.0'//使用U-App中ABTest能力，可选
}

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/proguard-rules.pro

New file
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
#   http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
#   public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/AndroidManifest.xml

New file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.hdl.onproumengsdk">

    <application
        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.OnproUmengSdk">
        <activity
            android:name=".MainActivity"
            android:exported="true"
            android:label="@string/app_name"
            android:theme="@style/Theme.OnproUmengSdk.NoActionBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

                <data android:scheme="um.61d565d9e0f9bb492bbc3d5a" />

            </intent-filter>
        </activity>
    </application>

</manifest>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/java/com/hdl/onproumengsdk/FirstFragment.java

New file
@@ -0,0 +1,47 @@
package com.hdl.onproumengsdk;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.navigation.fragment.NavHostFragment;

import com.hdl.onproumengsdk.databinding.FragmentFirstBinding;

public class FirstFragment extends Fragment {

    private FragmentFirstBinding binding;

    @Override
    public View onCreateView(
            LayoutInflater inflater, ViewGroup container,
            Bundle savedInstanceState
    ) {

        binding = FragmentFirstBinding.inflate(inflater, container, false);
        return binding.getRoot();

    }

    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);

        binding.buttonFirst.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
                NavHostFragment.findNavController(FirstFragment.this)
                        .navigate(R.id.action_FirstFragment_to_SecondFragment);
            }
        });
    }

    @Override
    public void onDestroyView() {
        super.onDestroyView();
        binding = null;
    }

}

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/java/com/hdl/onproumengsdk/MainActivity.java

New file
@@ -0,0 +1,76 @@
package com.hdl.onproumengsdk;

import android.os.Bundle;

import com.google.android.material.snackbar.Snackbar;

import androidx.appcompat.app.AppCompatActivity;

import android.view.View;

import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.navigation.ui.AppBarConfiguration;
import androidx.navigation.ui.NavigationUI;

import com.hdl.onproumengsdk.databinding.ActivityMainBinding;

import android.view.Menu;
import android.view.MenuItem;

public class MainActivity extends AppCompatActivity {

    private AppBarConfiguration appBarConfiguration;
    private ActivityMainBinding binding;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

        binding = ActivityMainBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());

        setSupportActionBar(binding.toolbar);

        NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
        appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build();
        NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);

        binding.fab.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                        .setAction("Action", null).show();
            }
        });
    }

    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        // Inflate the menu; this adds items to the action bar if it is present.
        getMenuInflater().inflate(R.menu.menu_main, menu);
        return true;
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        // Handle action bar item clicks here. The action bar will
        // automatically handle clicks on the Home/Up button, so long
        // as you specify a parent activity in AndroidManifest.xml.
        int id = item.getItemId();

        //noinspection SimplifiableIfStatement
        if (id == R.id.action_settings) {
            return true;
        }

        return super.onOptionsItemSelected(item);
    }

    @Override
    public boolean onSupportNavigateUp() {
        NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
        return NavigationUI.navigateUp(navController, appBarConfiguration)
                || super.onSupportNavigateUp();
    }
}

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/java/com/hdl/onproumengsdk/SecondFragment.java

New file
@@ -0,0 +1,47 @@
package com.hdl.onproumengsdk;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.navigation.fragment.NavHostFragment;

import com.hdl.onproumengsdk.databinding.FragmentSecondBinding;

public class SecondFragment extends Fragment {

    private FragmentSecondBinding binding;

    @Override
    public View onCreateView(
            LayoutInflater inflater, ViewGroup container,
            Bundle savedInstanceState
    ) {

        binding = FragmentSecondBinding.inflate(inflater, container, false);
        return binding.getRoot();

    }

    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);

        binding.buttonSecond.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
                NavHostFragment.findNavController(SecondFragment.this)
                        .navigate(R.id.action_SecondFragment_to_FirstFragment);
            }
        });
    }

    @Override
    public void onDestroyView() {
        super.onDestroyView();
        binding = null;
    }

}

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

New file
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="108dp"
    android:height="108dp"
    android:viewportWidth="108"
    android:viewportHeight="108">
    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
        <aapt:attr name="android:fillColor">
            <gradient
                android:endX="85.84757"
                android:endY="92.4963"
                android:startX="42.9492"
                android:startY="49.59793"
                android:type="linear">
                <item
                    android:color="#44000000"
                    android:offset="0.0" />
                <item
                    android:color="#00000000"
                    android:offset="1.0" />
            </gradient>
        </aapt:attr>
    </path>
    <path
        android:fillColor="#FFFFFF"
        android:fillType="nonZero"
        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
        android:strokeWidth="1"
        android:strokeColor="#00000000" />
</vector>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/drawable/ic_launcher_background.xml

New file
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="108dp"
    android:height="108dp"
    android:viewportWidth="108"
    android:viewportHeight="108">
    <path
        android:fillColor="#3DDC84"
        android:pathData="M0,0h108v108h-108z" />
    <path
        android:fillColor="#00000000"
        android:pathData="M9,0L9,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,0L19,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M29,0L29,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M39,0L39,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M49,0L49,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M59,0L59,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M69,0L69,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M79,0L79,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M89,0L89,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M99,0L99,108"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,9L108,9"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,19L108,19"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,29L108,29"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,39L108,39"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,49L108,49"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,59L108,59"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,69L108,69"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,79L108,79"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,89L108,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M0,99L108,99"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,29L89,29"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,39L89,39"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,49L89,49"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,59L89,59"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,69L89,69"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M19,79L89,79"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M29,19L29,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M39,19L39,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M49,19L49,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M59,19L59,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M69,19L69,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
    <path
        android:fillColor="#00000000"
        android:pathData="M79,19L79,89"
        android:strokeWidth="0.8"
        android:strokeColor="#33FFFFFF" />
</vector>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/layout/activity_main.xml

New file
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".MainActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:theme="@style/Theme.OnproUmengSdk.AppBarOverlay">

        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
            app:popupTheme="@style/Theme.OnproUmengSdk.PopupOverlay" />

    </com.google.android.material.appbar.AppBarLayout>

    <include layout="@layout/content_main" />

    <com.google.android.material.floatingactionbutton.FloatingActionButton
        android:id="@+id/fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|end"
        android:layout_marginEnd="@dimen/fab_margin"
        android:layout_marginBottom="16dp"
        app:srcCompat="@android:drawable/ic_dialog_email" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/layout/content_main.xml

New file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    app:layout_behavior="@string/appbar_scrolling_view_behavior">

    <fragment
        android:id="@+id/nav_host_fragment_content_main"
        android:name="androidx.navigation.fragment.NavHostFragment"
        android:layout_width="0dp"
        android:layout_height="0dp"
        app:defaultNavHost="true"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:navGraph="@navigation/nav_graph" />
</androidx.constraintlayout.widget.ConstraintLayout>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/layout/fragment_first.xml

New file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".FirstFragment">

    <TextView
        android:id="@+id/textview_first"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/hello_first_fragment"
        app:layout_constraintBottom_toTopOf="@id/button_first"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <Button
        android:id="@+id/button_first"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/next"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/textview_first" />
</androidx.constraintlayout.widget.ConstraintLayout>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/layout/fragment_second.xml

New file
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".SecondFragment">

    <TextView
        android:id="@+id/textview_second"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:layout_constraintBottom_toTopOf="@id/button_second"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <Button
        android:id="@+id/button_second"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/previous"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/textview_second" />
</androidx.constraintlayout.widget.ConstraintLayout>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/menu/menu_main.xml

New file
@@ -0,0 +1,10 @@
<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.hdl.onproumengsdk.MainActivity">
    <item
        android:id="@+id/action_settings"
        android:orderInCategory="100"
        android:title="@string/action_settings"
        app:showAsAction="never" />
</menu>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_background" />
    <foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_background" />
    <foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-hdpi/ic_launcher.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-mdpi/ic_launcher.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-xhdpi/ic_launcher.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/navigation/nav_graph.xml

New file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation 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"
    android:id="@+id/nav_graph"
    app:startDestination="@id/FirstFragment">

    <fragment
        android:id="@+id/FirstFragment"
        android:name="com.hdl.onproumengsdk.FirstFragment"
        android:label="@string/first_fragment_label"
        tools:layout="@layout/fragment_first">

        <action
            android:id="@+id/action_FirstFragment_to_SecondFragment"
            app:destination="@id/SecondFragment" />
    </fragment>
    <fragment
        android:id="@+id/SecondFragment"
        android:name="com.hdl.onproumengsdk.SecondFragment"
        android:label="@string/second_fragment_label"
        tools:layout="@layout/fragment_second">

        <action
            android:id="@+id/action_SecondFragment_to_FirstFragment"
            app:destination="@id/FirstFragment" />
    </fragment>
</navigation>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values-land/dimens.xml

New file
@@ -0,0 +1,3 @@
<resources>
    <dimen name="fab_margin">48dp</dimen>
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values-night/themes.xml

New file
@@ -0,0 +1,16 @@
<resources xmlns:tools="http://schemas.android.com/tools">
    <!-- Base application theme. -->
    <style name="Theme.OnproUmengSdk" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
        <!-- Primary brand color. -->
        <item name="colorPrimary">@color/purple_200</item>
        <item name="colorPrimaryVariant">@color/purple_700</item>
        <item name="colorOnPrimary">@color/black</item>
        <!-- Secondary brand color. -->
        <item name="colorSecondary">@color/teal_200</item>
        <item name="colorSecondaryVariant">@color/teal_200</item>
        <item name="colorOnSecondary">@color/black</item>
        <!-- Status bar color. -->
        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
        <!-- Customize your theme here. -->
    </style>
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values-w1240dp/dimens.xml

New file
@@ -0,0 +1,3 @@
<resources>
    <dimen name="fab_margin">200dp</dimen>
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values-w600dp/dimens.xml

New file
@@ -0,0 +1,3 @@
<resources>
    <dimen name="fab_margin">48dp</dimen>
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values/colors.xml

New file
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="purple_200">#FFBB86FC</color>
    <color name="purple_500">#FF6200EE</color>
    <color name="purple_700">#FF3700B3</color>
    <color name="teal_200">#FF03DAC5</color>
    <color name="teal_700">#FF018786</color>
    <color name="black">#FF000000</color>
    <color name="white">#FFFFFFFF</color>
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values/dimens.xml

New file
@@ -0,0 +1,3 @@
<resources>
    <dimen name="fab_margin">16dp</dimen>
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values/strings.xml

New file
@@ -0,0 +1,12 @@
<resources>
    <string name="app_name">OnproUmengSdk</string>
    <string name="action_settings">Settings</string>
    <!-- Strings used for fragments for navigation -->
    <string name="first_fragment_label">First Fragment</string>
    <string name="second_fragment_label">Second Fragment</string>
    <string name="next">Next</string>
    <string name="previous">Previous</string>

    <string name="hello_first_fragment">Hello first fragment</string>
    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/app/src/main/res/values/themes.xml

New file
@@ -0,0 +1,25 @@
<resources xmlns:tools="http://schemas.android.com/tools">
    <!-- Base application theme. -->
    <style name="Theme.OnproUmengSdk" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
        <!-- Primary brand color. -->
        <item name="colorPrimary">@color/purple_500</item>
        <item name="colorPrimaryVariant">@color/purple_700</item>
        <item name="colorOnPrimary">@color/white</item>
        <!-- Secondary brand color. -->
        <item name="colorSecondary">@color/teal_200</item>
        <item name="colorSecondaryVariant">@color/teal_700</item>
        <item name="colorOnSecondary">@color/black</item>
        <!-- Status bar color. -->
        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
        <!-- Customize your theme here. -->
    </style>

    <style name="Theme.OnproUmengSdk.NoActionBar">
        <item name="windowActionBar">false</item>
        <item name="windowNoTitle">true</item>
    </style>

    <style name="Theme.OnproUmengSdk.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />

    <style name="Theme.OnproUmengSdk.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/build.gradle

New file
@@ -0,0 +1,26 @@
buildscript {
    repositories {
        google()
        mavenCentral()
        maven {
            url "https://jitpack.io"
        }
    }
    dependencies {
        classpath "com.android.tools.build:gradle:4.2.2"
    }
}

allprojects {
    repositories {
        google()
        mavenCentral()
        maven { url "https://jitpack.io" }
        maven { url = uri("https://plugins.gradle.org/m2/") }

    }
}

task clean(type: Delete) {
    delete rootProject.buildDir
}

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/gradle.properties

New file
@@ -0,0 +1,19 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/gradle/wrapper/gradle-wrapper.jar

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/gradle/wrapper/gradle-wrapper.properties

New file
@@ -0,0 +1,6 @@
#Wed Sep 22 11:14:15 GMT+08:00 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/gradlew

New file
@@ -0,0 +1,185 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
##  Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
    ls=`ls -ld "$PRG"`
    link=`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '/.*' > /dev/null; then
        PRG="$link"
    else
        PRG=`dirname "$PRG"`"/$link"
    fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
    echo "$*"
}

die () {
    echo
    echo "$*"
    echo
    exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
  CYGWIN* )
    cygwin=true
    ;;
  Darwin* )
    darwin=true
    ;;
  MINGW* )
    msys=true
    ;;
  NONSTOP* )
    nonstop=true
    ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
    fi
else
    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
            MAX_FD="$MAX_FD_LIMIT"
        fi
        ulimit -n $MAX_FD
        if [ $? -ne 0 ] ; then
            warn "Could not set maximum file descriptor limit: $MAX_FD"
        fi
    else
        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
    fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
    for dir in $ROOTDIRSRAW ; do
        ROOTDIRS="$ROOTDIRS$SEP$dir"
        SEP="|"
    done
    OURCYGPATTERN="(^($ROOTDIRS))"
    # Add a user-defined pattern to the cygpath arguments
    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
    fi
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option

        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
        else
            eval `echo args$i`="\"$arg\""
        fi
        i=`expr $i + 1`
    done
    case $i in
        0) set -- ;;
        1) set -- "$args0" ;;
        2) set -- "$args0" "$args1" ;;
        3) set -- "$args0" "$args1" "$args2" ;;
        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
fi

# Escape application args
save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
}
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

exec "$JAVACMD" "$@"

 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/gradlew.bat

New file
@@ -0,0 +1,89 @@
@rem

@rem Copyright 2015 the original author or authors.

@rem

@rem Licensed under the Apache License, Version 2.0 (the "License");

@rem you may not use this file except in compliance with the License.

@rem You may obtain a copy of the License at

@rem

@rem      https://www.apache.org/licenses/LICENSE-2.0

@rem

@rem Unless required by applicable law or agreed to in writing, software

@rem distributed under the License is distributed on an "AS IS" BASIS,

@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@rem See the License for the specific language governing permissions and

@rem limitations under the License.

@rem



@if "%DEBUG%" == "" @echo off

@rem ##########################################################################

@rem

@rem  Gradle startup script for Windows

@rem

@rem ##########################################################################



@rem Set local scope for the variables with windows NT shell

if "%OS%"=="Windows_NT" setlocal



set DIRNAME=%~dp0

if "%DIRNAME%" == "" set DIRNAME=.

set APP_BASE_NAME=%~n0

set APP_HOME=%DIRNAME%



@rem Resolve any "." and ".." in APP_HOME to make it shorter.

for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi



@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"



@rem Find java.exe

if defined JAVA_HOME goto findJavaFromJavaHome



set JAVA_EXE=java.exe

%JAVA_EXE% -version >NUL 2>&1

if "%ERRORLEVEL%" == "0" goto execute



echo.

echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

echo.

echo Please set the JAVA_HOME variable in your environment to match the

echo location of your Java installation.



goto fail



:findJavaFromJavaHome

set JAVA_HOME=%JAVA_HOME:"=%

set JAVA_EXE=%JAVA_HOME%/bin/java.exe



if exist "%JAVA_EXE%" goto execute



echo.

echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

echo.

echo Please set the JAVA_HOME variable in your environment to match the

echo location of your Java installation.



goto fail



:execute

@rem Setup the command line



set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar





@rem Execute Gradle

"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*



:end

@rem End local scope for the variables with windows NT shell

if "%ERRORLEVEL%"=="0" goto mainEnd



:fail

rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

rem the _cmd.exe /c_ return code!

if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

exit /b 1



:mainEnd

if "%OS%"=="Windows_NT" endlocal



:omega


 ThirdPartyIntegration/OnproUmengSdk/OnproUmengSdk/settings.gradle

New file
@@ -0,0 +1,5 @@


rootProject.name = "OnproUmengSdk"
include ':app'


 ThirdPartyIntegration/OnproUmengSdk/__MACOSX/OnproUmengSdk/._.DS_Store

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/__MACOSX/OnproUmengSdk/app/._.DS_Store

Binary files differ

 ThirdPartyIntegration/OnproUmengSdk/__MACOSX/OnproUmengSdk/umengSdk/._.DS_Store

Binary files differ