Skip to content

Commit

Permalink
refine android ios and mac demo
Browse files Browse the repository at this point in the history
  • Loading branch information
gezhaoyou committed Jan 21, 2024
1 parent 51c3127 commit 2c621c8
Show file tree
Hide file tree
Showing 148 changed files with 129 additions and 137 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pixpark.PixDemo;
package com.pixpark.GPUPixelApp;

import android.content.Context;

Expand Down
8 changes: 4 additions & 4 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.pixpark.PixDemo">
package="com.pixpark.GPUPixelApp">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@drawable/ic_launcher"
android:supportsRtl="true"
android:theme="@style/Theme.GPUPixel">
<activity
android:name="com.pixpark.PixDemo.MainActivity"
android:name="com.pixpark.GPUPixelApp.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pixpark.PixDemo;
package com.pixpark.GPUPixelApp;

import static android.widget.Toast.LENGTH_LONG;

Expand All @@ -17,7 +17,7 @@
import android.widget.SeekBar;
import android.widget.Toast;

import com.pixpark.PixDemo.databinding.ActivityMainBinding;
import com.pixpark.GPUPixelApp.databinding.ActivityMainBinding;
import com.pixpark.gpupixel.GPUPixelFilter;
import com.pixpark.gpupixel.GPUPixelSourceCamera;
import com.pixpark.gpupixel.GPUPixelView;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions android/app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<TextView
android:id="@+id/mopi"
android:layout_width="40dp"
android:layout_width="100dp"
android:layout_height="30dp"
android:text="磨皮"
android:text="Skin Smooth"
android:textColor="@color/white"
android:layout_alignParentBottom="true"
android:layout_marginLeft="20dp"
Expand All @@ -35,9 +35,9 @@

<TextView
android:id="@+id/meibai"
android:layout_width="40dp"
android:layout_width="100dp"
android:layout_height="30dp"
android:text="美白"
android:text="Skin White"
android:textColor="@color/white"
android:layout_alignParentBottom="true"
android:layout_marginLeft="20dp"
Expand Down
5 changes: 0 additions & 5 deletions android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

This file was deleted.

This file was deleted.

Binary file removed android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed android/app/src/main/res/mipmap-ldpi/ic_launcher.png
Binary file not shown.
Binary file removed android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified android/app/src/main/res/playstore-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">PixDemo</string>
<string name="app_name">GPUPixelApp</string>
</resources>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pixpark.PixDemo;
package com.pixpark.GPUPixelApp;

import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
1FBB65702A75597800B43AC4 /* Face++LicenseHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "Face++LicenseHandler.m"; path = "Face++/Face++LicenseHandler.m"; sourceTree = "<group>"; };
8417C437267F5AF10074DDEF /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
8417C43B267F5B470074DDEF /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
84307E8C261F2CD9003EAC98 /* GPUPixelDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GPUPixelDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
84307E8C261F2CD9003EAC98 /* GPUPixelApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GPUPixelApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
84307E8F261F2CD9003EAC98 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
84307E90261F2CD9003EAC98 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
84307E92261F2CD9003EAC98 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -125,7 +125,7 @@
isa = PBXGroup;
children = (
8472448F2A60321E009D1488 /* GPUPixel.xcodeproj */,
84307E8E261F2CD9003EAC98 /* GPUPixelDemo */,
84307E8E261F2CD9003EAC98 /* GPUPixelApp */,
84307E8D261F2CD9003EAC98 /* Products */,
84EEBF41261F2DC5000AD4AE /* Frameworks */,
);
Expand All @@ -134,12 +134,12 @@
84307E8D261F2CD9003EAC98 /* Products */ = {
isa = PBXGroup;
children = (
84307E8C261F2CD9003EAC98 /* GPUPixelDemo.app */,
84307E8C261F2CD9003EAC98 /* GPUPixelApp.app */,
);
name = Products;
sourceTree = "<group>";
};
84307E8E261F2CD9003EAC98 /* GPUPixelDemo */ = {
84307E8E261F2CD9003EAC98 /* GPUPixelApp */ = {
isa = PBXGroup;
children = (
1FBB65732A7559B300B43AC4 /* Face++ */,
Expand All @@ -161,7 +161,7 @@
84307EA0261F2CDC003EAC98 /* Info.plist */,
84307EA1261F2CDC003EAC98 /* main.m */,
);
path = GPUPixelDemo;
path = GPUPixelApp;
sourceTree = "<group>";
};
847244902A60321E009D1488 /* Products */ = {
Expand All @@ -187,9 +187,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
84307E8B261F2CD9003EAC98 /* GPUPixelDemo */ = {
84307E8B261F2CD9003EAC98 /* GPUPixelApp */ = {
isa = PBXNativeTarget;
buildConfigurationList = 84307EBB261F2CDC003EAC98 /* Build configuration list for PBXNativeTarget "GPUPixelDemo" */;
buildConfigurationList = 84307EBB261F2CDC003EAC98 /* Build configuration list for PBXNativeTarget "GPUPixelApp" */;
buildPhases = (
84307E88261F2CD9003EAC98 /* Sources */,
84307E89261F2CD9003EAC98 /* Frameworks */,
Expand All @@ -201,9 +201,9 @@
dependencies = (
8472449A2A60324E009D1488 /* PBXTargetDependency */,
);
name = GPUPixelDemo;
name = GPUPixelApp;
productName = PixDemo;
productReference = 84307E8C261F2CD9003EAC98 /* GPUPixelDemo.app */;
productReference = 84307E8C261F2CD9003EAC98 /* GPUPixelApp.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -219,7 +219,7 @@
};
};
};
buildConfigurationList = 84307E87261F2CD9003EAC98 /* Build configuration list for PBXProject "GPUPixelDemo" */;
buildConfigurationList = 84307E87261F2CD9003EAC98 /* Build configuration list for PBXProject "GPUPixelApp" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand All @@ -238,7 +238,7 @@
);
projectRoot = "";
targets = (
84307E8B261F2CD9003EAC98 /* GPUPixelDemo */,
84307E8B261F2CD9003EAC98 /* GPUPixelApp */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -451,21 +451,22 @@
"DEBUG=1",
"$(inherited)",
);
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/GPUPixelDemo/Face++\"/**";
INFOPLIST_FILE = GPUPixelDemo/Info.plist;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/GPUPixelApp/Face++\"/**";
INFOPLIST_FILE = GPUPixelApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = GPUPixelApp;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/GPUPixelDemo/Face++/MegviiLicMgr-iOS-SDK",
"$(PROJECT_DIR)/GPUPixelDemo/Face++/MGFaceppSDK",
"$(PROJECT_DIR)/GPUPixelApp/Face++/MegviiLicMgr-iOS-SDK",
"$(PROJECT_DIR)/GPUPixelApp/Face++/MGFaceppSDK",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = com.pixpark.gpupixeldemo;
PRODUCT_BUNDLE_IDENTIFIER = com.pixpark.gpupixelapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_PNG_TEXT = NO;
Expand All @@ -487,22 +488,23 @@
DEVELOPMENT_TEAM = QFCE3TAQXQ;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/GPUPixelDemo/Face++\"/**";
INFOPLIST_FILE = GPUPixelDemo/Info.plist;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/GPUPixelApp/Face++\"/**";
INFOPLIST_FILE = GPUPixelApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = GPUPixelApp;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/GPUPixelDemo/Face++/MegviiLicMgr-iOS-SDK",
"$(PROJECT_DIR)/GPUPixelDemo/Face++/MGFaceppSDK",
"$(PROJECT_DIR)/GPUPixelApp/Face++/MegviiLicMgr-iOS-SDK",
"$(PROJECT_DIR)/GPUPixelApp/Face++/MGFaceppSDK",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.0.3;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.pixpark.gpupixeldemo;
PRODUCT_BUNDLE_IDENTIFIER = com.pixpark.gpupixelapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_PNG_TEXT = NO;
Expand All @@ -515,7 +517,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
84307E87261F2CD9003EAC98 /* Build configuration list for PBXProject "GPUPixelDemo" */ = {
84307E87261F2CD9003EAC98 /* Build configuration list for PBXProject "GPUPixelApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
84307EB9261F2CDC003EAC98 /* Debug */,
Expand All @@ -524,7 +526,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
84307EBB261F2CDC003EAC98 /* Build configuration list for PBXNativeTarget "GPUPixelDemo" */ = {
84307EBB261F2CDC003EAC98 /* Build configuration list for PBXNativeTarget "GPUPixelApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
84307EBC261F2CDC003EAC98 /* Debug */,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84307E8B261F2CD9003EAC98"
BuildableName = "GPUPixelDemo.app"
BlueprintName = "GPUPixelDemo"
ReferencedContainer = "container:GPUPixelDemo.xcodeproj">
BuildableName = "GPUPixelApp.app"
BlueprintName = "GPUPixelApp"
ReferencedContainer = "container:GPUPixelApp.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -45,9 +45,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84307E8B261F2CD9003EAC98"
BuildableName = "GPUPixelDemo.app"
BlueprintName = "GPUPixelDemo"
ReferencedContainer = "container:GPUPixelDemo.xcodeproj">
BuildableName = "GPUPixelApp.app"
BlueprintName = "GPUPixelApp"
ReferencedContainer = "container:GPUPixelApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -62,9 +62,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84307E8B261F2CD9003EAC98"
BuildableName = "GPUPixelDemo.app"
BlueprintName = "GPUPixelDemo"
ReferencedContainer = "container:GPUPixelDemo.xcodeproj">
BuildableName = "GPUPixelApp.app"
BlueprintName = "GPUPixelApp"
ReferencedContainer = "container:GPUPixelApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
File renamed without changes.
File renamed without changes.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>GPUPixel</string>
<string>GPUPixelApp</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 2c621c8

Please sign in to comment.